Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: Source/core/inspector/InspectorInputAgent.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Android/Mac fixes Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorInputAgent.cpp
diff --git a/Source/core/inspector/InspectorInputAgent.cpp b/Source/core/inspector/InspectorInputAgent.cpp
index 831c04941f9f9408099e77cb4581305feaf7279a..03b0a8b79e90678b4ea14c3e3bbb7ee74e6e6c5f 100644
--- a/Source/core/inspector/InspectorInputAgent.cpp
+++ b/Source/core/inspector/InspectorInputAgent.cpp
@@ -81,7 +81,8 @@ public:
void ConvertInspectorPoint(WebCore::Page* page, const WebCore::IntPoint& point, WebCore::IntPoint* convertedPoint, WebCore::IntPoint* globalPoint)
{
- *convertedPoint = page->mainFrame()->view()->convertToContainingWindow(point);
+ // FIXME: Completely broken with OOPI.
+ *convertedPoint = toLocalFrame(page->mainFrame())->view()->convertToContainingWindow(point);
*globalPoint = page->chrome().rootViewToScreen(WebCore::IntRect(point, WebCore::IntSize(0, 0))).location();
}
@@ -267,7 +268,7 @@ void InspectorInputAgent::dispatchTouchEvent(ErrorString* error, const String& t
event.append(point);
}
- m_page->mainFrame()->eventHandler().handleTouchEvent(event);
+ toLocalFrame(m_page->mainFrame())->eventHandler().handleTouchEvent(event);
}
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698