Make `getComputedStyle` return the correct style for collapsed <img> elements.

third_party/WebKit/Source/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 316 matching lines @@
         document().devicePixelRatio(), sourceSize(*source),
         source->fastGetAttribute(srcsetAttr), &document());
     if (candidate.isEmpty())
       continue;
     m_source = source;
     return candidate;
   }
   return ImageCandidate();
 }
 
-bool HTMLImageElement::layoutObjectIsNeeded(const ComputedStyle& style) {
-  return m_layoutDisposition != LayoutDisposition::Collapsed &&
-         HTMLElement::layoutObjectIsNeeded(style);
-}
-
 LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style) {
   const ContentData* contentData = style.contentData();
   if (contentData && contentData->isImage()) {
     const StyleImage* contentImage = toImageContentData(contentData)->image();
     bool errorOccurred = contentImage && contentImage->cachedImage() &&
                          contentImage->cachedImage()->errorOccurred();
     if (!errorOccurred)
       return LayoutObject::createObject(this, style);
   }
 
   switch (m_layoutDisposition) {
     case LayoutDisposition::FallbackContent:
       return new LayoutBlockFlow(this);
     case LayoutDisposition::PrimaryContent: {
       LayoutImage* image = new LayoutImage(this);
       image->setImageResource(LayoutImageResource::create());
       image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
       return image;
     }
     case LayoutDisposition::Collapsed:  // Falls through.
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 void HTMLImageElement::attachLayoutTree(const AttachContext& context) {
   HTMLElement::attachLayoutTree(context);
-
   if (layoutObject() && layoutObject()->isImage()) {
     LayoutImage* layoutImage = toLayoutImage(layoutObject());
     LayoutImageResource* layoutImageResource = layoutImage->imageResource();
     if (m_isFallbackImage) {
       float deviceScaleFactor = blink::deviceScaleFactor(layoutImage->frame());
       std::pair<Image*, float> brokenImageAndImageScaleFactor =
           ImageResourceContent::brokenImage(deviceScaleFactor);
       ImageResourceContent* newImageResource =
           ImageResourceContent::create(brokenImageAndImageScaleFactor.first);
       layoutImage->imageResource()->setImageResource(newImageResource);
@@ skipping 465 matching lines @@
       imageLoader().image()->resourceError().shouldCollapseInitiator();
   setLayoutDisposition(resourceErrorIndicatesElementShouldBeCollapsed
                            ? LayoutDisposition::Collapsed
                            : LayoutDisposition::FallbackContent);
 }
 
 void HTMLImageElement::ensurePrimaryContent() {
   setLayoutDisposition(LayoutDisposition::PrimaryContent);
 }
 
+bool HTMLImageElement::isCollapsed() const {
+  return m_layoutDisposition == LayoutDisposition::Collapsed;
+}
+
 void HTMLImageElement::setLayoutDisposition(LayoutDisposition layoutDisposition,
                                             bool forceReattach) {
   if (m_layoutDisposition == layoutDisposition && !forceReattach)
     return;
 
   m_layoutDisposition = layoutDisposition;
 
   // This can happen inside of attachLayoutTree() in the middle of a recalcStyle
   // so we need to reattach synchronously here.
   if (document().inStyleRecalc()) {
@@ skipping 55 matching lines @@
 void HTMLImageElement::associateWith(HTMLFormElement* form) {
   if (form && form->isConnected()) {
     m_form = form;
     m_formWasSetByParser = true;
     m_form->associate(*this);
     m_form->didAssociateByParser();
   }
 };
 
 }  // namespace blink