Title: [107272] branches/subpixellayout/Source
- Revision
- 107272
- Author
- [email protected]
- Date
- 2012-02-09 12:11:48 -0800 (Thu, 09 Feb 2012)
Log Message
Fix usage of LayoutUnit in GestureTapHighlighter and update QT port to use explicit subpixel to platform types conversion.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/Target.pri (107271 => 107272)
--- branches/subpixellayout/Source/WebCore/Target.pri 2012-02-09 20:11:06 UTC (rev 107271)
+++ branches/subpixellayout/Source/WebCore/Target.pri 2012-02-09 20:11:48 UTC (rev 107272)
@@ -2777,9 +2777,6 @@
platform/graphics/qt/ColorQt.cpp \
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 \
platform/graphics/qt/GradientQt.cpp \
Modified: branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp (107271 => 107272)
--- branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp 2012-02-09 20:11:06 UTC (rev 107271)
+++ branches/subpixellayout/Source/WebCore/page/GestureTapHighlighter.cpp 2012-02-09 20:11:48 UTC (rev 107272)
@@ -55,7 +55,7 @@
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;
}
@@ -95,8 +95,8 @@
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)) {
leftSide = std::min(leftSide, other.x());
Modified: branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp (107271 => 107272)
--- branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp 2012-02-09 20:11:06 UTC (rev 107271)
+++ branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp 2012-02-09 20:11:48 UTC (rev 107272)
@@ -551,7 +551,7 @@
{
if (!m_element)
return QRect();
- return m_element->getRect();
+ return FloatRect(m_element->getRect());
}
/*!
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
