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

[eae]

Title: [109178] branches/subpixellayout/Source

Revision

109178

Author

e...@chromium.org

Date

2012-02-28 17:40:13 -0800 (Tue, 28 Feb 2012)

Log Message

qt build fixes for branch post r109122.

Modified Paths

branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp
branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
branches/subpixellayout/Source/WebKit/qt/Api/qwebpage.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp (109177 => 109178)

--- branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp	2012-02-29 01:39:15 UTC (rev 109177)
+++ branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp	2012-02-29 01:40:13 UTC (rev 109178)
@@ -138,7 +138,7 @@
     ASSERT(o);
     Path path;
 
-    Vector<LayoutRect> rects;
+    Vector<IntRect> rects;
     o->addFocusRingRects(rects, /* acc. offset */ ownerFrameToMainFrameOffset(o));
 
     // The basic idea is to allow up to three different boxes in order to highlight

Modified: branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (109177 => 109178)

--- branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp	2012-02-29 01:39:15 UTC (rev 109177)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp	2012-02-29 01:40:13 UTC (rev 109178)
@@ -844,7 +844,7 @@
  * RenderTheme handles drawing focus on widgets which 
  * need it. It is still handled here for links.
  */
-void GraphicsContext::drawFocusRing(const Vector<FractionalLayoutRect>& rects, int width, int offset, const Color& color)
+void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int offset, const Color& color)
 {
     if (paintingDisabled() || !color.isValid())
         return;
@@ -857,7 +857,7 @@
     int radius = (width - 1) / 2;
     QPainterPath path;
     for (unsigned i = 0; i < rectCount; ++i) {
-        QRect rect = QRect(enclosingIntRect(rects[i])).adjusted(-offset - radius, -offset - radius, offset + radius, offset + radius);
+        QRect rect = QRect(rects[i]).adjusted(-offset - radius, -offset - radius, offset + radius, offset + radius);
         // This is not the most efficient way to add a rect to a path, but if we don't create the tmpPath,
         // we will end up with ugly lines in between rows of text on anchors with multiple lines.
         QPainterPath tmpPath;

Modified: branches/subpixellayout/Source/WebKit/qt/Api/qwebpage.cpp (109177 => 109178)

--- branches/subpixellayout/Source/WebKit/qt/Api/qwebpage.cpp	2012-02-29 01:39:15 UTC (rev 109177)
+++ branches/subpixellayout/Source/WebKit/qt/Api/qwebpage.cpp	2012-02-29 01:40:13 UTC (rev 109178)
@@ -1386,7 +1386,7 @@
                 // We can't access absoluteCaretBounds() while the view needs to layout.
                 return QVariant();
             }
-            return QVariant(view->contentsToWindow(frame->selection()->pixelSnappedAbsoluteCaretBounds()));
+            return QVariant(view->contentsToWindow(frame->selection()->absoluteCaretBounds()));
         }
         case Qt::ImFont: {
             if (renderTextControl) {

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