Title: [97688] trunk/Source/WebCore
- Revision
- 97688
- Author
- [email protected]
- Date
- 2011-10-17 18:10:08 -0700 (Mon, 17 Oct 2011)
Log Message
Unreviewed, rolling out r97641.
http://trac.webkit.org/changeset/97641
https://bugs.webkit.org/show_bug.cgi?id=70288
"This change may have broken mouse/hit-test coordinate tests."
(Requested by jeffm7 on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-17
* platform/Widget.cpp:
(WebCore::Widget::convertFromContainingWindow):
(WebCore::Widget::convertToContainingWindow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97687 => 97688)
--- trunk/Source/WebCore/ChangeLog 2011-10-18 01:07:27 UTC (rev 97687)
+++ trunk/Source/WebCore/ChangeLog 2011-10-18 01:10:08 UTC (rev 97688)
@@ -1,3 +1,16 @@
+2011-10-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r97641.
+ http://trac.webkit.org/changeset/97641
+ https://bugs.webkit.org/show_bug.cgi?id=70288
+
+ "This change may have broken mouse/hit-test coordinate tests."
+ (Requested by jeffm7 on #webkit).
+
+ * platform/Widget.cpp:
+ (WebCore::Widget::convertFromContainingWindow):
+ (WebCore::Widget::convertToContainingWindow):
+
2011-10-17 Andreas Kling <[email protected]>
CSSParser: Remove unused variable 'propertyComponents'
Modified: trunk/Source/WebCore/platform/Widget.cpp (97687 => 97688)
--- trunk/Source/WebCore/platform/Widget.cpp 2011-10-18 01:07:27 UTC (rev 97687)
+++ trunk/Source/WebCore/platform/Widget.cpp 2011-10-18 01:10:08 UTC (rev 97688)
@@ -107,22 +107,38 @@
IntRect Widget::convertFromContainingWindow(const IntRect& windowRect) const
{
- return convertFromRootView(convertFromContainingWindowToRoot(this, windowRect));
+ if (const ScrollView* parentScrollView = parent()) {
+ IntRect parentRect = parentScrollView->convertFromContainingWindow(windowRect);
+ return convertFromContainingView(parentRect);
+ }
+ return convertFromContainingWindowToRoot(this, windowRect);
}
IntRect Widget::convertToContainingWindow(const IntRect& localRect) const
{
- return convertFromRootToContainingWindow(this, convertToRootView(localRect));
+ if (const ScrollView* parentScrollView = parent()) {
+ IntRect parentRect = convertToContainingView(localRect);
+ return parentScrollView->convertToContainingWindow(parentRect);
+ }
+ return convertFromRootToContainingWindow(this, localRect);
}
IntPoint Widget::convertFromContainingWindow(const IntPoint& windowPoint) const
{
- return convertFromRootView(convertFromContainingWindowToRoot(this, windowPoint));
+ if (const ScrollView* parentScrollView = parent()) {
+ IntPoint parentPoint = parentScrollView->convertFromContainingWindow(windowPoint);
+ return convertFromContainingView(parentPoint);
+ }
+ return convertFromContainingWindowToRoot(this, windowPoint);
}
IntPoint Widget::convertToContainingWindow(const IntPoint& localPoint) const
{
- return convertFromRootToContainingWindow(this, convertToRootView(localPoint));
+ if (const ScrollView* parentScrollView = parent()) {
+ IntPoint parentPoint = convertToContainingView(localPoint);
+ return parentScrollView->convertToContainingWindow(parentPoint);
+ }
+ return convertFromRootToContainingWindow(this, localPoint);
}
#if !PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
