[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 11:26:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cb36280b1294b30ed2b0807bdbae44a7af46a713
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 23 12:20:21 2010 +0000
2010-07-23 Pavel Feldman <pfeldman at chromium.org>
Not reviewed: rolling out r63963.
* bindings/v8/ScriptProfile.cpp:
(WebCore::ScriptProfile::title):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::getProfile):
* inspector/front-end/InjectedScriptAccess.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63964 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f4f6ba..b8f2997 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+ Not reviewed: rolling out r63963.
+
+ * bindings/v8/ScriptProfile.cpp:
+ (WebCore::ScriptProfile::title):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::getProfile):
+ * inspector/front-end/InjectedScriptAccess.js:
+
+2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+
Reviewed by Yury Semikhatsky.
Chromium DevTools: migrate from utility context-based injected
diff --git a/WebCore/bindings/v8/ScriptProfile.cpp b/WebCore/bindings/v8/ScriptProfile.cpp
index 3b71d5f..beafea1 100644
--- a/WebCore/bindings/v8/ScriptProfile.cpp
+++ b/WebCore/bindings/v8/ScriptProfile.cpp
@@ -40,7 +40,6 @@ namespace WebCore {
String ScriptProfile::title() const
{
- v8::HandleScope scope;
return toWebCoreString(m_profile->GetTitle());
}
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 91ba186..f742df0 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -79,7 +79,6 @@
#include "ScriptObject.h"
#include "ScriptProfile.h"
#include "ScriptProfiler.h"
-#include "ScriptScope.h"
#include "ScriptSourceCode.h"
#include "ScriptString.h"
#include "SecurityOrigin.h"
@@ -1561,14 +1560,12 @@ void InspectorController::getProfile(long callId, unsigned uid)
if (!m_frontend)
return;
ProfilesMap::iterator it = m_profiles.find(uid);
- if (it != m_profiles.end()) {
+ if (it != m_profiles.end())
#if USE(JSC)
m_frontend->didGetProfile(callId, toJS(m_frontend->scriptState(), it->second.get()));
#else
- ScriptScope scope(m_frontend->scriptState());
m_frontend->didGetProfile(callId, toV8(it->second.get()));
#endif
- }
}
ScriptObject InspectorController::createProfileHeader(const ScriptProfile& profile)
diff --git a/WebCore/inspector/front-end/InjectedScriptAccess.js b/WebCore/inspector/front-end/InjectedScriptAccess.js
index 5950421..0e4cc2e 100644
--- a/WebCore/inspector/front-end/InjectedScriptAccess.js
+++ b/WebCore/inspector/front-end/InjectedScriptAccess.js
@@ -35,11 +35,7 @@ function InjectedScriptAccess(injectedScriptId) {
InjectedScriptAccess.get = function(injectedScriptId)
{
- if (typeof injectedScriptId === "number")
- return new InjectedScriptAccess(injectedScriptId);
-
- console.error("Access to injected script with no id");
- console.trace();
+ return new InjectedScriptAccess(injectedScriptId);
}
InjectedScriptAccess.getDefault = function()
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b85305e..8d2c0d0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,19 @@
2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+ Not reviewed: rolling out r63963.
+
+ * src/ToolsAgent.h:
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::WebDevToolsAgentImpl::dispatchOnInjectedScript):
+ * src/WebDevToolsAgentImpl.h:
+ * src/js/DevToolsHostStub.js:
+ (.window.dispatchOnInjectedScript):
+ * src/js/InspectorControllerImpl.js:
+ (devtools.InspectorBackendImpl):
+ (devtools.InspectorBackendImpl.prototype.dispatchOnInjectedScript):
+
+2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+
Reviewed by Reviewed by Yury Semikhatsky.
Chromium DevTools: migrate from utility context-based injected
diff --git a/WebKit/chromium/src/ToolsAgent.h b/WebKit/chromium/src/ToolsAgent.h
index c9a15d5..d878aea 100644
--- a/WebKit/chromium/src/ToolsAgent.h
+++ b/WebKit/chromium/src/ToolsAgent.h
@@ -41,6 +41,11 @@ namespace WebKit {
/* Dispatches given function on the InspectorController object */ \
METHOD2(dispatchOnInspectorController, int /* call_id */, \
String /* message */) \
+ \
+ /* Dispatches given function on the InjectedScript object */ \
+ METHOD5(dispatchOnInjectedScript, int /* call_id */, \
+ int /* injected_script_id */, String /* function_name */, \
+ String /* json_args */, bool /* async */)
DEFINE_RPC_CLASS(ToolsAgent, TOOLS_AGENT_STRUCT)
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 3d79e0c..6238dd2 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -316,6 +316,16 @@ void WebDevToolsAgentImpl::dispatchOnInspectorController(int callId, const Strin
m_toolsAgentDelegateStub->didDispatchOn(callId, "", exception);
}
+void WebDevToolsAgentImpl::dispatchOnInjectedScript(int callId, int injectedScriptId, const String& functionName, const String& jsonArgs, bool async)
+{
+ inspectorController()->inspectorBackend()->dispatchOnInjectedScript(
+ callId,
+ injectedScriptId,
+ functionName,
+ jsonArgs,
+ async);
+}
+
void WebDevToolsAgentImpl::dispatchMessageFromFrontend(const WebDevToolsMessageData& data)
{
if (ToolsAgentDispatch::dispatch(this, data))
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.h b/WebKit/chromium/src/WebDevToolsAgentImpl.h
index 1bb71a3..beb5cfa 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.h
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.h
@@ -73,6 +73,7 @@ public:
// ToolsAgent implementation.
virtual void dispatchOnInspectorController(int callId, const WebCore::String& message);
+ virtual void dispatchOnInjectedScript(int callId, int injectedScriptId, const WebCore::String& functionName, const WebCore::String& jsonArgs, bool async);
// WebDevToolsAgentPrivate implementation.
virtual void didClearWindowObject(WebFrameImpl* frame);
diff --git a/WebKit/chromium/src/js/DevToolsHostStub.js b/WebKit/chromium/src/js/DevToolsHostStub.js
index 52b28bb..a2f356f 100644
--- a/WebKit/chromium/src/js/DevToolsHostStub.js
+++ b/WebKit/chromium/src/js/DevToolsHostStub.js
@@ -37,6 +37,7 @@ if (!window["RemoteDebuggerCommandExecutor"]) {
window["RemoteDebuggerCommandExecutor"] = {};
window["RemoteProfilerAgent"] = {};
window["RemoteToolsAgent"] = {
+ dispatchOnInjectedScript: function() {},
dispatchOnInspectorController: function() {}
};
}
diff --git a/WebKit/chromium/src/js/InspectorControllerImpl.js b/WebKit/chromium/src/js/InspectorControllerImpl.js
index bed009e..30edd9e 100644
--- a/WebKit/chromium/src/js/InspectorControllerImpl.js
+++ b/WebKit/chromium/src/js/InspectorControllerImpl.js
@@ -49,7 +49,6 @@ devtools.InspectorBackendImpl = function()
this.installInspectorControllerDelegate_("disableResourceTracking");
this.installInspectorControllerDelegate_("disableSearchingForNode");
this.installInspectorControllerDelegate_("disableTimeline");
- this.installInspectorControllerDelegate_("dispatchOnInjectedScript");
this.installInspectorControllerDelegate_("enableMonitoringXHR");
this.installInspectorControllerDelegate_("enableResourceTracking");
this.installInspectorControllerDelegate_("enableSearchingForNode");
@@ -127,6 +126,18 @@ devtools.InspectorBackendImpl.prototype.pause = function()
/**
+ * @override
+ */
+devtools.InspectorBackendImpl.prototype.dispatchOnInjectedScript = function(callId, injectedScriptId, methodName, argsString, async)
+{
+ // Encode injectedScriptId into callId
+ if (typeof injectedScriptId !== "number")
+ injectedScriptId = 0;
+ RemoteToolsAgent.dispatchOnInjectedScript(callId, injectedScriptId, methodName, argsString, async);
+};
+
+
+/**
* Installs delegating handler into the inspector controller.
* @param {string} methodName Method to install delegating handler for.
*/
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list