Changeset 167637 in webkit

Timestamp:

Apr 21, 2014 5:15:35 PM (10 years ago)

Author:

Alan Bujtas

Message:

REGRESSION (r166784): Gradient at background of iCloud login page doesn’t go all the way to the bottom
​https://bugs.webkit.org/show_bug.cgi?id=131924

Computing tile dimension for contain/cover requires higher precision than what LayoutUnit has. Switching to floats.

Reviewed by Simon Fraser.

Source/WebCore:
Test: fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision.html

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::calculateFillTileSize):

LayoutTests:

• fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision-expected.html: Added.
• fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision-expected.html (added)
• LayoutTests/fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-21  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r166784): Gradient at background of iCloud login page doesn’t go all the way to the bottom
+        https://bugs.webkit.org/show_bug.cgi?id=131924
+
+        Computing tile dimension for contain/cover requires higher precision than what LayoutUnit has. Switching to floats.
+
+        Reviewed by Simon Fraser.
+
+        * fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision-expected.html: Added.
+        * fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision.html: Added.
+
 2014-04-21  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r166784): Gradient at background of iCloud login page doesn’t go all the way to the bottom
+        https://bugs.webkit.org/show_bug.cgi?id=131924
+
+        Computing tile dimension for contain/cover requires higher precision than what LayoutUnit has. Switching to floats.
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/backgrounds/hidpi-background-image-contain-cover-scale-needs-more-precision.html
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::calculateFillTileSize):
+
 2014-04-21  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -978 +978 @@
         case Contain:
         case Cover: {
-            float horizontalScaleFactor = imageIntrinsicSize.width() ? (positioningAreaSize.width() / imageIntrinsicSize.width()).toFloat() : 1;
-            float verticalScaleFactor = imageIntrinsicSize.height() ? (positioningAreaSize.height() / imageIntrinsicSize.height()).toFloat() : 1;
+            // Scale computation needs higher precision than what LayoutUnit can offer.
+            FloatSize localImageIntrinsicSize = imageIntrinsicSize;
+            FloatSize localPositioningAreaSize = positioningAreaSize;
+
+            float horizontalScaleFactor = localImageIntrinsicSize.width() ? (localPositioningAreaSize.width() / localImageIntrinsicSize.width()) : 1;
+            float verticalScaleFactor = localImageIntrinsicSize.height() ? (localPositioningAreaSize.height() / localImageIntrinsicSize.height()) : 1;
             float scaleFactor = type == Contain ? std::min(horizontalScaleFactor, verticalScaleFactor) : std::max(horizontalScaleFactor, verticalScaleFactor);
             float deviceScaleFactor = document().deviceScaleFactor();
-            return LayoutSize(std::max<LayoutUnit>(1 / deviceScaleFactor, imageIntrinsicSize.width() * scaleFactor),
-                std::max<LayoutUnit>(1 / deviceScaleFactor, imageIntrinsicSize.height() * scaleFactor));
+            return LayoutSize(std::max<LayoutUnit>(1 / deviceScaleFactor, localImageIntrinsicSize.width() * scaleFactor),
+                std::max<LayoutUnit>(1 / deviceScaleFactor, localImageIntrinsicSize.height() * scaleFactor));
        }
     }