[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:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f0680c7d1a7bbfc8259f8d3f8def3d1f169d1bcf
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 23 12:12:00 2010 +0000
2010-07-23 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Chromium DevTools: migrate from utility context-based injected
script dispatch to upstream schema.
https://bugs.webkit.org/show_bug.cgi?id=42883
* bindings/v8/ScriptProfile.cpp:
(WebCore::ScriptProfile::title):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::getProfile):
* inspector/front-end/InjectedScriptAccess.js:
(InjectedScriptAccess.get if):
(InjectedScriptAccess):
2010-07-23 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Reviewed by Yury Semikhatsky.
Chromium DevTools: migrate from utility context-based injected
script dispatch to upstream schema.
https://bugs.webkit.org/show_bug.cgi?id=42883
* src/ToolsAgent.h:
* src/WebDevToolsAgentImpl.cpp:
* src/WebDevToolsAgentImpl.h:
* src/js/DevToolsHostStub.js:
* src/js/InspectorControllerImpl.js:
(devtools.InspectorBackendImpl):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46b090c..0f4f6ba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Chromium DevTools: migrate from utility context-based injected
+ script dispatch to upstream schema.
+
+ https://bugs.webkit.org/show_bug.cgi?id=42883
+
+ * bindings/v8/ScriptProfile.cpp:
+ (WebCore::ScriptProfile::title):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::getProfile):
+ * inspector/front-end/InjectedScriptAccess.js:
+ (InjectedScriptAccess.get if):
+ (InjectedScriptAccess):
+
2010-07-23 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/bindings/v8/ScriptProfile.cpp b/WebCore/bindings/v8/ScriptProfile.cpp
index beafea1..3b71d5f 100644
--- a/WebCore/bindings/v8/ScriptProfile.cpp
+++ b/WebCore/bindings/v8/ScriptProfile.cpp
@@ -40,6 +40,7 @@ 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 f742df0..91ba186 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -79,6 +79,7 @@
#include "ScriptObject.h"
#include "ScriptProfile.h"
#include "ScriptProfiler.h"
+#include "ScriptScope.h"
#include "ScriptSourceCode.h"
#include "ScriptString.h"
#include "SecurityOrigin.h"
@@ -1560,12 +1561,14 @@ 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 0e4cc2e..5950421 100644
--- a/WebCore/inspector/front-end/InjectedScriptAccess.js
+++ b/WebCore/inspector/front-end/InjectedScriptAccess.js
@@ -35,7 +35,11 @@ function InjectedScriptAccess(injectedScriptId) {
InjectedScriptAccess.get = function(injectedScriptId)
{
- return new InjectedScriptAccess(injectedScriptId);
+ if (typeof injectedScriptId === "number")
+ return new InjectedScriptAccess(injectedScriptId);
+
+ console.error("Access to injected script with no id");
+ console.trace();
}
InjectedScriptAccess.getDefault = function()
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 92db31f..b85305e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-23 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Reviewed by Yury Semikhatsky.
+
+ Chromium DevTools: migrate from utility context-based injected
+ script dispatch to upstream schema.
+
+ https://bugs.webkit.org/show_bug.cgi?id=42883
+
+ * src/ToolsAgent.h:
+ * src/WebDevToolsAgentImpl.cpp:
+ * src/WebDevToolsAgentImpl.h:
+ * src/js/DevToolsHostStub.js:
+ * src/js/InspectorControllerImpl.js:
+ (devtools.InspectorBackendImpl):
+
2010-07-23 Kent Tamura <tkent at chromium.org>
Reviewed by Shinichiro Hamaji.
diff --git a/WebKit/chromium/src/ToolsAgent.h b/WebKit/chromium/src/ToolsAgent.h
index d878aea..c9a15d5 100644
--- a/WebKit/chromium/src/ToolsAgent.h
+++ b/WebKit/chromium/src/ToolsAgent.h
@@ -41,11 +41,6 @@ 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 6238dd2..3d79e0c 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -316,16 +316,6 @@ 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 beb5cfa..1bb71a3 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.h
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.h
@@ -73,7 +73,6 @@ 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 a2f356f..52b28bb 100644
--- a/WebKit/chromium/src/js/DevToolsHostStub.js
+++ b/WebKit/chromium/src/js/DevToolsHostStub.js
@@ -37,7 +37,6 @@ 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 30edd9e..bed009e 100644
--- a/WebKit/chromium/src/js/InspectorControllerImpl.js
+++ b/WebKit/chromium/src/js/InspectorControllerImpl.js
@@ -49,6 +49,7 @@ devtools.InspectorBackendImpl = function()
this.installInspectorControllerDelegate_("disableResourceTracking");
this.installInspectorControllerDelegate_("disableSearchingForNode");
this.installInspectorControllerDelegate_("disableTimeline");
+ this.installInspectorControllerDelegate_("dispatchOnInjectedScript");
this.installInspectorControllerDelegate_("enableMonitoringXHR");
this.installInspectorControllerDelegate_("enableResourceTracking");
this.installInspectorControllerDelegate_("enableSearchingForNode");
@@ -126,18 +127,6 @@ 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