Changeset 110761 in webkit

Timestamp:

Mar 14, 2012 3:02:00 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Implement proper sub-pixel support in RenderFileUploadControl
​https://bugs.webkit.org/show_bug.cgi?id=80881

Reviewed by Dimitri Glazkov.

Correcting improper usage of LayoutUnits when interacting with the graphics context
and platform code. Specifically:

• pixel snapping the clip rect and paint offsets before sending values to the graphics context in paintObject.
• using on-screen (pixel snapped) values to pass off to platform code to determine the max length of the filename to be drawn.

No new tests. No change in behavior.

• rendering/RenderFileUploadControl.cpp:

(WebCore::nodeWidth):
(WebCore::RenderFileUploadControl::maxFilenameWidth):
(WebCore::RenderFileUploadControl::paintObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFileUploadControl.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-14  Levi Weintraub  <leviw@chromium.org>
+
+        Implement proper sub-pixel support in RenderFileUploadControl
+        https://bugs.webkit.org/show_bug.cgi?id=80881
+
+        Reviewed by Dimitri Glazkov.
+
+        Correcting improper usage of LayoutUnits when interacting with the graphics context
+        and platform code. Specifically:
+        - pixel snapping the clip rect and paint offsets before sending values to the
+          graphics context in paintObject.
+        - using on-screen (pixel snapped) values to pass off to platform code to determine
+          the max length of the filename to be drawn.
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderFileUploadControl.cpp:
+        (WebCore::nodeWidth):
+        (WebCore::RenderFileUploadControl::maxFilenameWidth):
+        (WebCore::RenderFileUploadControl::paintObject):
+
 2012-03-14  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

@@ -92 +92 @@
 static int nodeWidth(Node* node)
 {
-    return node ? node->renderBox()->width() : zeroLayoutUnit;
+    return node ? node->renderBox()->pixelSnappedWidth() : 0;
 }
 
@@ -98 +98 @@
 {
     HTMLInputElement* input = static_cast<HTMLInputElement*>(node());
-    return max(0, contentWidth() - nodeWidth(uploadButton()) - afterButtonSpacing
+    return max(0, contentBoxRect().pixelSnappedWidth() - nodeWidth(uploadButton()) - afterButtonSpacing
         - (input->icon() ? iconWidth + iconFilenameSpacing : 0));
 }
@@ -110 +110 @@
     GraphicsContextStateSaver stateSaver(*paintInfo.context, false);
     if (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseChildBlockBackgrounds) {
-        LayoutRect clipRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(),
+        IntRect clipRect = pixelSnappedIntRect(paintOffset.x() + borderLeft(), paintOffset.y() + borderTop(),
                          width() - borderLeft() - borderRight(), height() - borderBottom() - borderTop() + buttonShadowHeight);
         if (clipRect.isEmpty())
@@ -148 +148 @@
         
         // Draw the filename
-        paintInfo.context->drawBidiText(font, textRun, LayoutPoint(textX, textY));
+        paintInfo.context->drawBidiText(font, textRun, IntPoint(roundToInt(textX), roundToInt(textY)));
         
         if (input->icon()) {
@@ -160 +160 @@
 
             // Draw the file icon
-            input->icon()->paint(paintInfo.context, LayoutRect(iconX, iconY, iconWidth, iconHeight));
+            input->icon()->paint(paintInfo.context, IntRect(roundToInt(iconX), roundToInt(iconY), iconWidth, iconHeight));
         }
     }