Changeset 99303 in webkit

Timestamp:

Nov 4, 2011 11:27:35 AM (12 years ago)

Author:

leviw@chromium.org

Message:

Correct usage of LayoutUnits in RenderImage and SVGImage
​https://bugs.webkit.org/show_bug.cgi?id=71525

Reviewed by Darin Adler.

Correcting incorrect usage of LayoutUnits for image sizes that should be integers and fixing overloaded functions that
should be using LayoutUnits.

No new tests -- no change in behavior.

• rendering/RenderImage.cpp:

(WebCore::RenderImage::imageDimensionsChanged):
(WebCore::RenderImage::paintIntoRect):
(WebCore::RenderImage::nodeAtPoint):
(WebCore::RenderImage::computeReplacedLogicalWidth):

• rendering/RenderImage.h:
• svg/graphics/SVGImage.cpp:

(WebCore::SVGImageChromeClient::invalidateContentsAndWindow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderImage.cpp (modified) (5 diffs)
• rendering/RenderImage.h (modified) (2 diffs)
• svg/graphics/SVGImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-04  Levi Weintraub  <leviw@chromium.org>
+
+        Correct usage of LayoutUnits in RenderImage and SVGImage
+        https://bugs.webkit.org/show_bug.cgi?id=71525
+
+        Reviewed by Darin Adler.
+
+        Correcting incorrect usage of LayoutUnits for image sizes that should be integers and fixing overloaded functions that
+        should be using LayoutUnits.
+
+        No new tests -- no change in behavior.
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageDimensionsChanged):
+        (WebCore::RenderImage::paintIntoRect):
+        (WebCore::RenderImage::nodeAtPoint):
+        (WebCore::RenderImage::computeReplacedLogicalWidth):
+        * rendering/RenderImage.h:
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImageChromeClient::invalidateContentsAndWindow):
+
 2011-11-04  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -213 +213 @@
 
     if (shouldRepaint) {
-        IntRect repaintRect;
+        LayoutRect repaintRect;
         if (rect) {
             // The image changed rect is in source image coordinates (pre-zooming),
@@ -395 +395 @@
 }
 
-void RenderImage::paintIntoRect(GraphicsContext* context, const IntRect& rect)
+void RenderImage::paintIntoRect(GraphicsContext* context, const LayoutRect& rect)
 {
     if (!m_imageResource->hasImage() || m_imageResource->errorOccurred() || rect.width() <= 0 || rect.height() <= 0)
@@ -455 +455 @@
     if (tempResult.innerNode() && node()) {
         if (HTMLMapElement* map = imageMap()) {
-            IntRect contentBox = contentBoxRect();
+            LayoutRect contentBox = contentBoxRect();
             float scaleFactor = 1 / style()->effectiveZoom();
             LayoutPoint mapLocation(pointInContainer.x() - accumulatedOffset.x() - this->x() - contentBox.x(), pointInContainer.y() - accumulatedOffset.y() - this->y() - contentBox.y());
@@ -496 +496 @@
     bool hasRelativeHeight = contentRenderer ? contentRenderer->style()->height().isPercent() : m_imageResource->imageHasRelativeHeight();
 
-    LayoutSize containerSize;
+    IntSize containerSize;
     if (hasRelativeWidth || hasRelativeHeight) {
         // Propagate the containing block size to the image resource, otherwhise we can't compute our own intrinsic size, if it's relative.
@@ -502 +502 @@
         if (containingBlock->isBox()) {
             RenderBox* box = toRenderBox(containingBlock);
-            containerSize = LayoutSize(box->availableWidth(), box->availableHeight()); // Already contains zooming information.
+            containerSize = IntSize(box->availableWidth(), box->availableHeight()); // Already contains zooming information.
         }
     } else {

trunk/Source/WebCore/rendering/RenderImage.h

@@ -63 +63 @@
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);
 
-    virtual void paintIntoRect(GraphicsContext*, const IntRect&);
+    virtual void paintIntoRect(GraphicsContext*, const LayoutRect&);
     virtual void paint(PaintInfo&, const LayoutPoint&);
 
@@ -78 +78 @@
     virtual bool isRenderImage() const { return true; }
 
-    virtual void paintReplaced(PaintInfo&, const IntPoint&);
+    virtual void paintReplaced(PaintInfo&, const LayoutPoint&);
 
     virtual bool backgroundIsObscured() const;

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -74 +74 @@
     }
 
-    virtual void invalidateContentsAndWindow(const LayoutRect& r, bool)
+    virtual void invalidateContentsAndWindow(const IntRect& r, bool)
     {
         if (m_image && m_image->imageObserver())