[webkit-changes] [110508] branches/subpixellayout/Source

[eae]

Title: [110508] branches/subpixellayout/Source

Revision

110508

Author

e...@chromium.org

Date

2012-03-12 17:09:56 -0700 (Mon, 12 Mar 2012)

Log Message

Qt build fixes for branch.

Modified Paths

• branches/subpixellayout/Source/WebCore/platform/qt/RenderThemeQt.cpp
• branches/subpixellayout/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/platform/qt/RenderThemeQt.cpp (110507 => 110508)

--- branches/subpixellayout/Source/WebCore/platform/qt/RenderThemeQt.cpp	2012-03-13 00:09:18 UTC (rev 110507)
+++ branches/subpixellayout/Source/WebCore/platform/qt/RenderThemeQt.cpp	2012-03-13 00:09:56 UTC (rev 110508)
@@ -434,7 +434,7 @@
 IntRect RenderThemeQt::convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const
 {
     // Compute an offset between the part renderer and the input renderer.
-    IntSize offsetFromInputRenderer = -(partRenderer->offsetFromAncestorContainer(inputRenderer));
+    IntSize offsetFromInputRenderer = -expandedIntSize(partRenderer->offsetFromAncestorContainer(inputRenderer));
     // Move the rect into partRenderer's coords.
     partRect.move(offsetFromInputRenderer);
     // Account for the local drawing offset.
@@ -453,7 +453,7 @@
     if (!input->renderer()->isBox())
         return false;
     RenderBox* inputRenderBox = toRenderBox(input->renderer());
-    IntRect inputContentBox = inputRenderBox->contentBoxRect();
+    IntRect inputContentBox = pixelSnappedIntRect(inputRenderBox->contentBoxRect());
 
     // Make sure the scaled button stays square and will fit in its parent's box.
     int cancelButtonSize = qMin(inputContentBox.width(), qMin(inputContentBox.height(), r.height()));

Modified: branches/subpixellayout/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp (110507 => 110508)

--- branches/subpixellayout/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp	2012-03-13 00:09:18 UTC (rev 110507)
+++ branches/subpixellayout/Source/WebKit/qt/WebCoreSupport/RenderThemeQStyle.cpp	2012-03-13 00:09:56 UTC (rev 110508)
@@ -499,7 +499,7 @@
         return 0;
 
     QStyleOptionProgressBarV2 option;
-    option.rect.setSize(renderProgress->size());
+    option.rect.setSize(expandedIntSize(renderProgress->size()));
     // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed,
     // we simulate one square animating across the progress bar.
     return (option.rect.width() / qStyle()->pixelMetric(QStyle::PM_ProgressBarChunkWidth, &option)) * animationRepeatIntervalForProgressBar(renderProgress);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes