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

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

Issue 1118963002: Revert of DevTools: remove dependency of most agents on InspectorPageAgent (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/inspector/InspectorInputAgent.h ('k') | Source/core/inspector/InspectorLayerTreeAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorInputAgent.cpp
diff --git a/Source/core/inspector/InspectorInputAgent.cpp b/Source/core/inspector/InspectorInputAgent.cpp
index ead818019b8f27f94441f62ba5801d78f95a4075..f093b8d0cfdab84e555d88481a5c4fb97dcc2e15 100644
--- a/Source/core/inspector/InspectorInputAgent.cpp
+++ b/Source/core/inspector/InspectorInputAgent.cpp
@@ -33,6 +33,7 @@
#include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h"
+#include "core/inspector/InspectorPageAgent.h"
#include "core/page/Chrome.h"
#include "core/page/EventHandler.h"
#include "core/page/Page.h"
@@ -86,9 +87,9 @@
namespace blink {
-InspectorInputAgent::InspectorInputAgent(LocalFrame* inspectedFrame)
+InspectorInputAgent::InspectorInputAgent(InspectorPageAgent* pageAgent)
: InspectorBaseAgent<InspectorInputAgent, InspectorFrontend::Input>("Input")
- , m_inspectedFrame(inspectedFrame)
+ , m_pageAgent(pageAgent)
{
}
@@ -172,18 +173,18 @@
// Some platforms may have flipped coordinate systems, but the given coordinates
// assume the origin is in the top-left of the window. Convert.
IntPoint convertedPoint, globalPoint;
- ConvertInspectorPoint(m_inspectedFrame, IntPoint(x, y), &convertedPoint, &globalPoint);
+ ConvertInspectorPoint(m_pageAgent->inspectedFrame(), IntPoint(x, y), &convertedPoint, &globalPoint);
SyntheticInspectorTouchPoint point(id++, convertedState, globalPoint, convertedPoint, radiusX, radiusY, rotationAngle, force);
event.append(point);
}
- m_inspectedFrame->eventHandler().handleTouchEvent(event);
+ m_pageAgent->inspectedFrame()->eventHandler().handleTouchEvent(event);
}
DEFINE_TRACE(InspectorInputAgent)
{
- visitor->trace(m_inspectedFrame);
+ visitor->trace(m_pageAgent);
InspectorBaseAgent::trace(visitor);
}
« no previous file with comments | « Source/core/inspector/InspectorInputAgent.h ('k') | Source/core/inspector/InspectorLayerTreeAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698