diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
| commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
| tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/inspector/InjectedScriptHost.cpp | |
| parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
| parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
| download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 | |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/inspector/InjectedScriptHost.cpp')
| -rw-r--r-- | WebCore/inspector/InjectedScriptHost.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/WebCore/inspector/InjectedScriptHost.cpp b/WebCore/inspector/InjectedScriptHost.cpp index e8a9fee..37512be 100644 --- a/WebCore/inspector/InjectedScriptHost.cpp +++ b/WebCore/inspector/InjectedScriptHost.cpp @@ -42,9 +42,9 @@ #include "InspectorClient.h" #include "InspectorController.h" #include "InspectorDOMAgent.h" -#include "InspectorFrontend.h" #include "InspectorResource.h" #include "Pasteboard.h" +#include "RemoteInspectorFrontend.h" #if ENABLE(JAVASCRIPT_DEBUGGER) #include "ScriptDebugServer.h" @@ -98,7 +98,7 @@ Node* InjectedScriptHost::nodeForId(long nodeId) long InjectedScriptHost::pushNodePathToFrontend(Node* node, bool withChildren, bool selectInUI) { - InspectorFrontend* frontend = inspectorFrontend(); + RemoteInspectorFrontend* frontend = remoteFrontend(); InspectorDOMAgent* domAgent = inspectorDOMAgent(); if (!domAgent || !frontend) return 0; @@ -142,12 +142,6 @@ void InjectedScriptHost::selectDOMStorage(Storage* storage) } #endif -void InjectedScriptHost::reportDidDispatchOnInjectedScript(long callId, SerializedScriptValue* result, bool isException) -{ - if (InspectorFrontend* frontend = inspectorFrontend()) - frontend->didDispatchOnInjectedScript(callId, result, isException); -} - InjectedScript InjectedScriptHost::injectedScriptForId(long id) { return m_idToInjectedScript.get(id); @@ -178,11 +172,11 @@ InspectorDOMAgent* InjectedScriptHost::inspectorDOMAgent() return m_inspectorController->domAgent(); } -InspectorFrontend* InjectedScriptHost::inspectorFrontend() +RemoteInspectorFrontend* InjectedScriptHost::remoteFrontend() { if (!m_inspectorController) return 0; - return m_inspectorController->m_frontend.get(); + return m_inspectorController->m_remoteFrontend.get(); } pair<long, ScriptObject> InjectedScriptHost::injectScript(const String& source, ScriptState* scriptState) |