Changeset 107272 in webkit

Timestamp:

Feb 9, 2012, 12:11:48 PM (15 years ago)

Author:

eae@chromium.org

Message:

Fix usage of LayoutUnit in GestureTapHighlighter and update QT port to use explicit subpixel to platform types conversion.

Location:

branches/subpixellayout/Source

Files:

• WebCore/Target.pri (modified) (1 diff)
• WebCore/page/GestureTapHighlighter.cpp (modified) (2 diffs)
• WebKit/qt/Api/qwebelement.cpp (modified) (1 diff)

branches/subpixellayout/Source/WebCore/Target.pri

@@ -2778 +2778 @@
     platform/graphics/qt/FontQt.cpp \
     platform/graphics/qt/FontPlatformDataQt.cpp \
-    platform/graphics/qt/FixedPointQt.cpp \
-    platform/graphics/qt/FixedRectQt.cpp \
-    platform/graphics/qt/FixedSizeQt.cpp \
     platform/graphics/qt/FloatPointQt.cpp \
     platform/graphics/qt/FloatRectQt.cpp \

branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp

@@ -56 +56 @@
     Frame* mainFrame = containingFrame->page()->mainFrame();
 
-    LayoutPoint mainFramePoint = mainFrame->view()->rootViewToContents(containingFrame->view()->contentsToRootView(LayoutPoint()));
+    LayoutPoint mainFramePoint = mainFrame->view()->rootViewToContents(containingFrame->view()->contentsToRootView(IntPoint()));
     return mainFramePoint;
 }
@@ -96 +96 @@
 inline void shiftXEdgesToContainIfStrikes(LayoutRect& rect, const LayoutRect& other)
 {
-    int leftSide = rect.x();
-    int rightSide = rect.maxX();
+    LayoutUnit leftSide = rect.x();
+    LayoutUnit rightSide = rect.maxX();
 
     if (!other.isEmpty() && strikes(rect, other)) {

branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp

@@ -552 +552 @@
     if (!m_element)
         return QRect();
-    return m_element->getRect();
+    return FloatRect(m_element->getRect());
 }