Title: [99755] trunk/Source/WebCore
- Revision
- 99755
- Author
- ander...@apple.com
- Date
- 2011-11-09 13:18:44 -0800 (Wed, 09 Nov 2011)
Log Message
Use contentsToRootView/rootViewToContents when converting between frame coordinate systems
https://bugs.webkit.org/show_bug.cgi?id=71947
Reviewed by Sam Weinig.
This gets rid of a few calls to contentsToWindow and windowToContents.
* inspector/DOMNodeHighlighter.cpp:
* page/DragController.cpp:
(WebCore::DragController::startDrag):
(WebCore::DragController::doSystemDrag):
* page/EventHandler.cpp:
(WebCore::EventHandler::hitTestResultAtPoint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99754 => 99755)
--- trunk/Source/WebCore/ChangeLog 2011-11-09 21:09:37 UTC (rev 99754)
+++ trunk/Source/WebCore/ChangeLog 2011-11-09 21:18:44 UTC (rev 99755)
@@ -1,3 +1,19 @@
+2011-11-09 Anders Carlsson <ander...@apple.com>
+
+ Use contentsToRootView/rootViewToContents when converting between frame coordinate systems
+ https://bugs.webkit.org/show_bug.cgi?id=71947
+
+ Reviewed by Sam Weinig.
+
+ This gets rid of a few calls to contentsToWindow and windowToContents.
+
+ * inspector/DOMNodeHighlighter.cpp:
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+ (WebCore::DragController::doSystemDrag):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::hitTestResultAtPoint):
+
2011-11-09 Mark Hahnenberg <mhahnenb...@apple.com>
De-virtualize JSObject::getOwnPropertyDescriptor
Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp (99754 => 99755)
--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2011-11-09 21:09:37 UTC (rev 99754)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2011-11-09 21:18:44 UTC (rev 99755)
@@ -144,7 +144,7 @@
inline LayoutSize frameToMainFrameOffset(Frame* frame)
{
- LayoutPoint mainFramePoint = frame->page()->mainFrame()->view()->windowToContents(frame->view()->contentsToWindow(LayoutPoint()));
+ LayoutPoint mainFramePoint = frame->page()->mainFrame()->view()->rootViewToContents(frame->view()->contentsToRootView(LayoutPoint()));
return toLayoutSize(mainFramePoint);
}
Modified: trunk/Source/WebCore/page/DragController.cpp (99754 => 99755)
--- trunk/Source/WebCore/page/DragController.cpp 2011-11-09 21:09:37 UTC (rev 99754)
+++ trunk/Source/WebCore/page/DragController.cpp 2011-11-09 21:18:44 UTC (rev 99755)
@@ -782,7 +782,7 @@
if (!dragImage) {
IntRect imageRect = hitTestResult.imageRect();
- imageRect.setLocation(m_page->mainFrame()->view()->windowToContents(src->view()->contentsToWindow(imageRect.location())));
+ imageRect.setLocation(m_page->mainFrame()->view()->rootViewToContents(src->view()->contentsToRootView(imageRect.location())));
doImageDrag(element, dragOrigin, hitTestResult.imageRect(), clipboard, src, m_dragOffset);
} else
// DHTML defined drag image
@@ -874,8 +874,8 @@
// Protect this frame and view, as a load may occur mid drag and attempt to unload this frame
RefPtr<Frame> frameProtector = m_page->mainFrame();
RefPtr<FrameView> viewProtector = frameProtector->view();
- m_client->startDrag(image, viewProtector->windowToContents(frame->view()->contentsToWindow(dragLoc)),
- viewProtector->windowToContents(frame->view()->contentsToWindow(eventPos)), clipboard, frameProtector.get(), forLink);
+ m_client->startDrag(image, viewProtector->rootViewToContents(frame->view()->contentsToRootView(dragLoc)),
+ viewProtector->rootViewToContents(frame->view()->contentsToRootView(eventPos)), clipboard, frameProtector.get(), forLink);
cleanupAfterSystemDrag();
}
Modified: trunk/Source/WebCore/page/EventHandler.cpp (99754 => 99755)
--- trunk/Source/WebCore/page/EventHandler.cpp 2011-11-09 21:09:37 UTC (rev 99754)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2011-11-09 21:18:44 UTC (rev 99755)
@@ -975,8 +975,7 @@
FrameView* resultView = resultFrame->view();
FrameView* mainView = mainFrame->view();
if (resultView && mainView) {
- LayoutPoint windowPoint = resultView->contentsToWindow(result.point());
- LayoutPoint mainFramePoint = mainView->windowToContents(windowPoint);
+ LayoutPoint mainFramePoint = mainView->rootViewToContents(resultView->contentsToRootView(result.point()));
result = mainFrame->eventHandler()->hitTestResultAtPoint(mainFramePoint, allowShadowContent, ignoreClipping, testScrollbars, hitType, padding);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
