Avoid using ImageResource->imageSize() to get the marker size

third_party/WebKit/Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * 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 47 matching lines @@
 }
 
 LayoutListMarker* LayoutListMarker::createAnonymous(LayoutListItem* item)
 {
     Document& document = item->document();
     LayoutListMarker* layoutObject = new LayoutListMarker(item);
     layoutObject->setDocumentForAnonymous(&document);
     return layoutObject;
 }
 
+IntSize LayoutListMarker::imageBulletSize() const
+{
+    ASSERT(isImage());
+
+    // FIXME: This is a somewhat arbitrary default width. Generated images for markers really won't
+    // become particularly useful until we support the CSS3 marker pseudoclass to allow control over
+    // the width and height of the marker box.
+    int bulletWidth = style()->fontMetrics().ascent() / 2;
+    IntSize defaultBulletSize(bulletWidth, bulletWidth);
+    return calculateImageIntrinsicDimensions(m_image.get(), defaultBulletSize, DoNotScaleByEffectiveZoom);
+}
+
 void LayoutListMarker::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)
 {
     if (style() && (newStyle.listStylePosition() != style()->listStylePosition() || newStyle.listStyleType() != style()->listStyleType()))
         setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::StyleChange);
 
     LayoutBox::styleWillChange(diff, newStyle);
 }
 
 void LayoutListMarker::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
@@ skipping 40 matching lines @@
     ListMarkerPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void LayoutListMarker::layout()
 {
     ASSERT(needsLayout());
     LayoutAnalyzer::Scope analyzer(*this);
 
     if (isImage()) {
         updateMarginsAndContent();
-        setWidth(m_image->imageSize(this, style()->effectiveZoom()).width());
-        setHeight(m_image->imageSize(this, style()->effectiveZoom()).height());
+        LayoutSize imageSize(imageBulletSize());
+        setWidth(imageSize.width());
+        setHeight(imageSize.height());
     } else {
         setLogicalWidth(minPreferredLogicalWidth());
         setLogicalHeight(style()->fontMetrics().height());
     }
 
     setMarginStart(0);
     setMarginEnd(0);
 
     Length startMargin = style()->marginStart();
     Length endMargin = style()->marginEnd();
     if (startMargin.isFixed())
         setMarginStart(startMargin.value());
     if (endMargin.isFixed())
         setMarginEnd(endMargin.value());
 
     clearNeedsLayout();
 }
 
 void LayoutListMarker::imageChanged(WrappedImagePtr o, const IntRect*)
 {
     // A list marker can't have a background or border image, so no need to call the base class method.
     if (o != m_image->data())
         return;
 
-    if (size() != m_image->imageSize(this, style()->effectiveZoom()) || m_image->errorOccurred())
+    LayoutSize imageSize = isImage() ? LayoutSize(imageBulletSize()) : LayoutSize();
+    if (size() != imageSize || m_image->errorOccurred())
         setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::ImageChanged);
     else
         setShouldDoFullPaintInvalidation();
 }
 
 void LayoutListMarker::updateMarginsAndContent()
 {
     updateContent();
     updateMargins();
 }
 
 void LayoutListMarker::updateContent()
 {
     // FIXME: This if-statement is just a performance optimization, but it's messy to use the preferredLogicalWidths dirty bit for this.
     // It's unclear if this is a premature optimization.
     if (!preferredLogicalWidthsDirty())
         return;
 
     m_text = "";
 
-    if (isImage()) {
-        // FIXME: This is a somewhat arbitrary width.  Generated images for markers really won't become particularly useful
-        // until we support the CSS3 marker pseudoclass to allow control over the width and height of the marker box.
-        int bulletWidth = style()->fontMetrics().ascent() / 2;
-        IntSize defaultBulletSize(bulletWidth, bulletWidth);
-        IntSize imageSize = calculateImageIntrinsicDimensions(m_image.get(), defaultBulletSize, DoNotScaleByEffectiveZoom);
-        m_image->setContainerSizeForLayoutObject(this, imageSize, style()->effectiveZoom());
+    if (isImage())
         return;
-    }
 
     switch (listStyleCategory()) {
     case ListStyleCategory::None:
         break;
     case ListStyleCategory::Symbol:
         m_text = ListMarkerText::text(style()->listStyleType(), 0); // value is ignored for these types
         break;
     case ListStyleCategory::Language:
         m_text = ListMarkerText::text(style()->listStyleType(), m_listItem->value());
         break;
@@ skipping 13 matching lines @@
     LayoutUnit suffixSpaceWidth = font.width(run);
     return itemWidth + suffixSpaceWidth;
 }
 
 void LayoutListMarker::computePreferredLogicalWidths()
 {
     ASSERT(preferredLogicalWidthsDirty());
     updateContent();
 
     if (isImage()) {
-        LayoutSize imageSize = m_image->imageSize(this, style()->effectiveZoom());
+        LayoutSize imageSize(imageBulletSize());
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = style()->isHorizontalWritingMode() ? imageSize.width() : imageSize.height();
         clearPreferredLogicalWidthsDirty();
         updateMargins();
         return;
     }
 
     const Font& font = style()->font();
 
     LayoutUnit logicalWidth = 0;
     switch (listStyleCategory()) {
@@ skipping 159 matching lines @@
     }
 }
 
 bool LayoutListMarker::isInside() const
 {
     return m_listItem->notInList() || style()->listStylePosition() == INSIDE;
 }
 
 IntRect LayoutListMarker::getRelativeMarkerRect() const
 {
-    if (isImage())
-        return IntRect(0, 0, m_image->imageSize(this, style()->effectiveZoom()).width(), m_image->imageSize(this, style()->effectiveZoom()).height());
+    if (isImage()) {
+        IntSize imageSize = imageBulletSize();
+        return IntRect(0, 0, imageSize.width(), imageSize.height());
+    }
 
     IntRect relativeRect;
     switch (listStyleCategory()) {
     case ListStyleCategory::None:
         return IntRect();
     case ListStyleCategory::Symbol: {
         // TODO(wkorman): Review and clean up/document the calculations below.
         // http://crbug.com/543193
         const FontMetrics& fontMetrics = style()->fontMetrics();
         int ascent = fontMetrics.ascent();
@@ skipping 48 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink