Collapse images disallowed by the Safe Browsing Subresource Filter.

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 75 matching lines @@
 };
 
 HTMLImageElement::HTMLImageElement(Document& document,
                                    HTMLFormElement* form,
                                    bool createdByParser)
     : HTMLElement(imgTag, document),
       ActiveScriptWrappable(this),
       m_imageLoader(HTMLImageLoader::create(this)),
       m_imageDevicePixelRatio(1.0f),
       m_source(nullptr),
+      m_contentType(ContentType::Primary),
       m_formWasSetByParser(false),
       m_elementCreatedByParser(createdByParser),
-      m_useFallbackContent(false),
       m_isFallbackImage(false),
       m_referrerPolicy(ReferrerPolicyDefault) {
   setHasCustomStyleCallbacks();
   if (form && form->isConnected()) {
     m_form = form;
     m_formWasSetByParser = true;
     m_form->associate(*this);
     m_form->didAssociateByParser();
   }
 }
@@ skipping 223 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_contentType != ContentType::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);
   }
 
-  if (m_useFallbackContent)
+  if (m_contentType == ContentType::Fallback)
     return new LayoutBlockFlow(this);
 
+  DCHECK_EQ(m_contentType, ContentType::Primary);
   LayoutImage* image = new LayoutImage(this);
   image->setImageResource(LayoutImageResource::create());
   image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
   return image;
 }
 
 void HTMLImageElement::attachLayoutTree(const AttachContext& context) {
   HTMLElement::attachLayoutTree(context);
 
   if (layoutObject() && layoutObject()->isImage()) {
@@ skipping 429 matching lines @@
   // sufficient, because a deferred image does have pending activity, does not
   // have a pending error, and does have a source URL, so if imageHasLoaded
   // was correct, imageStillLoading would become wrong.
   //
   // Instead of dealing with that, there's a separate check that the
   // ImageResource has non-null image data associated with it, which isn't
   // folded into imageHasLoaded above.
   if ((imageHasLoaded && imageHasImage) || imageStillLoading || imageIsDocument)
     ensurePrimaryContent();
   else
-    ensureFallbackContent();
+    ensureCollapsedOrFallbackContent();
 }
 
 const KURL& HTMLImageElement::sourceURL() const {
   return cachedImage()->response().url();
 }
 
 void HTMLImageElement::didAddUserAgentShadowRoot(ShadowRoot&) {
   HTMLImageFallbackHelper::createAltTextShadowTree(*this);
 }
 
 void HTMLImageElement::ensureFallbackForGeneratedContent() {
   setUseFallbackContent();
-  reattachFallbackContent();
+  reattachContent();
 }
 
-void HTMLImageElement::ensureFallbackContent() {
-  if (m_useFallbackContent || m_isFallbackImage)
-    return;
-  setUseFallbackContent();
-  reattachFallbackContent();
+void HTMLImageElement::ensureCollapsedOrFallbackContent() {
+  if (imageLoader().image() &&
+      imageLoader().image()->resourceError().shouldCollapseInitiator()) {
+    if (m_contentType != ContentType::Collapsed) {
+      m_contentType = ContentType::Collapsed;
+      reattachContent();
+    }
+  } else if (m_contentType != ContentType::Fallback) {
+    setUseFallbackContent();
+    reattachContent();
+  }
 }
 
 void HTMLImageElement::ensurePrimaryContent() {
-  if (!m_useFallbackContent)
+  if (m_contentType == ContentType::Primary)
     return;
-  m_useFallbackContent = false;
-  reattachFallbackContent();
+  m_contentType = ContentType::Primary;
+  reattachContent();
 }
 
-void HTMLImageElement::reattachFallbackContent() {
+void HTMLImageElement::reattachContent() {
   // This can happen inside of attachLayoutTree() in the middle of a recalcStyle
   // so we need to reattach synchronously here.
   if (document().inStyleRecalc())
     reattachLayoutTree();
   else
     lazyReattachIfAttached();
 }
 
 PassRefPtr<ComputedStyle> HTMLImageElement::customStyleForLayoutObject() {
-  RefPtr<ComputedStyle> newStyle = originalStyleForLayoutObject();
-
-  if (!m_useFallbackContent)
-    return newStyle;
-
-  RefPtr<ComputedStyle> style = ComputedStyle::clone(*newStyle);
-  return HTMLImageFallbackHelper::customStyleForAltText(*this, style);
+  if (m_contentType == ContentType::Primary ||
+      m_contentType == ContentType::Collapsed)

[Mike West, 2016/11/30 15:57:35]

Nit: {} for multi-line conditionals.

[engedy, 2016/11/30 17:37:39]

Done.

+    return originalStyleForLayoutObject();
+  return HTMLImageFallbackHelper::customStyleForAltText(
+      *this, ComputedStyle::clone(*originalStyleForLayoutObject()));
 }
 
 void HTMLImageElement::setUseFallbackContent() {
-  m_useFallbackContent = true;
+  m_contentType = ContentType::Fallback;
   if (document().inStyleRecalc())
     return;
   EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
   ensureUserAgentShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const {
   Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
   return image && image->currentFrameKnownToBeOpaque();
 }
@@ skipping 20 matching lines @@
   ImageResource* image = cachedImage();
   if (!image)
     return IntSize();
   LayoutSize lSize = image->imageSize(
       LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
   DCHECK(lSize.fraction().isZero());
   return IntSize(lSize.width().toInt(), lSize.height().toInt());
 }
 
 }  // namespace blink