Changeset 116435 in webkit

Timestamp:

May 8, 2012 10:51:29 AM (12 years ago)

Author:

hbono@chromium.org

Message:

[Chromium] Fix the position of an RTL resizer
​https://bugs.webkit.org/show_bug.cgi?id=80640

Reviewed by Tony Chang.

When rendering an RTL resizer, my r110073 renders it at the same position as the
one used for rendering a LTR resizer. Unfortunately, this code renders the RTL
resizer image at an incorrect position on Mac and Linux. This change uses the
correct formula to calculate the position of an RTL resizer.

Source/WebCore:

Test: platform/chromium/scrollbars/rtl-resizer-position.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::drawPlatformResizerImage):

LayoutTests:

• platform/chromium/platform/chromium/scrollbars: Added.
• platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.png: Added.
• platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.txt: Added.
• platform/chromium/scrollbars/rtl-resizer-position.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/platform/chromium/scrollbars (added)
• LayoutTests/platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.png (added)
• LayoutTests/platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.txt (added)
• LayoutTests/platform/chromium/scrollbars/rtl-resizer-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-08  Hironori Bono  <hbono@chromium.org>
+
+        [Chromium] Fix the position of an RTL resizer
+        https://bugs.webkit.org/show_bug.cgi?id=80640
+
+        Reviewed by Tony Chang.
+
+        When rendering an RTL resizer, my r110073 renders it at the same position as the
+        one used for rendering a LTR resizer. Unfortunately, this code renders the RTL
+        resizer image at an incorrect position on Mac and Linux. This change uses the
+        correct formula to calculate the position of an RTL resizer.
+
+        * platform/chromium/platform/chromium/scrollbars: Added.
+        * platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.png: Added.
+        * platform/chromium/platform/chromium/scrollbars/rtl-resizer-position-expected.txt: Added.
+        * platform/chromium/scrollbars/rtl-resizer-position.html: Added.
+
 2012-05-08  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Hironori Bono  <hbono@chromium.org>
+
+        [Chromium] Fix the position of an RTL resizer
+        https://bugs.webkit.org/show_bug.cgi?id=80640
+
+        Reviewed by Tony Chang.
+
+        When rendering an RTL resizer, my r110073 renders it at the same position as the
+        one used for rendering a LTR resizer. Unfortunately, this code renders the RTL
+        resizer image at an incorrect position on Mac and Linux. This change uses the
+        correct formula to calculate the position of an RTL resizer.
+
+        Test: platform/chromium/scrollbars/rtl-resizer-position.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::drawPlatformResizerImage):
+
 2012-05-08  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2652 +2652 @@
     }
 
-    IntRect imageRect(resizerCornerRect.maxXMaxYCorner() - cornerResizerSize, cornerResizerSize);
     if (renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) {
         context->save();
-        context->translate(imageRect.x(), imageRect.y());
-        imageRect.setX(0);
-        imageRect.setY(0);
+        context->translate(resizerCornerRect.x() + cornerResizerSize.width(), resizerCornerRect.y() + resizerCornerRect.height() - cornerResizerSize.height());
         context->scale(FloatSize(-1.0, 1.0));
-        context->drawImage(resizeCornerImage.get(), renderer()->style()->colorSpace(), imageRect);
+        context->drawImage(resizeCornerImage.get(), renderer()->style()->colorSpace(), IntRect(IntPoint(), cornerResizerSize));
         context->restore();
         return;
     }
+    IntRect imageRect(resizerCornerRect.maxXMaxYCorner() - cornerResizerSize, cornerResizerSize);
     context->drawImage(resizeCornerImage.get(), renderer()->style()->colorSpace(), imageRect);
 }