[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 12:19:53 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5707f8a1f67ee413ff5e9ff3022aebde24e668ed
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 19 14:47:59 2010 +0000
2010-08-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Chromium DevTools: There is no need in resource-based InjectedScript.js source.
Now that we populate front-end after its onload handler, we don't need
to install injected script early. Exposing injected script source on the WebCore
level here.
https://bugs.webkit.org/show_bug.cgi?id=44029
* inspector/InjectedScriptHost.h:
(WebCore::InjectedScriptHost::injectedScriptSource):
2010-08-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Chromium DevTools: There is no need in resource-based InjectedScript.js source.
Now that we populate front-end after its onload handler, I don't think we need
to install injected script early.
https://bugs.webkit.org/show_bug.cgi?id=44029
* public/WebDevToolsAgentClient.h:
* src/WebDevToolsAgentImpl.cpp:
(WebKit::):
(WebKit::WebDevToolsAgentImpl::attach):
(WebKit::WebDevToolsAgentImpl::frontendLoaded):
2010-08-19 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
Chromium DevTools: There is no need in resource-based InjectedScript.js source.
Now that we populate front-end after its onload handler, we don't need
to install injected script early. Exposing injected script source on the WebCore
level here.
https://bugs.webkit.org/show_bug.cgi?id=44029
* DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
(DRTDevToolsAgent::runtimePropertyChanged):
(DRTDevToolsAgent::delayedFrontendLoaded):
(DRTDevToolsAgent::frontendLoaded):
* DumpRenderTree/chromium/DRTDevToolsAgent.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ee18fc1..5a71146 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Chromium DevTools: There is no need in resource-based InjectedScript.js source.
+ Now that we populate front-end after its onload handler, we don't need
+ to install injected script early. Exposing injected script source on the WebCore
+ level here.
+ https://bugs.webkit.org/show_bug.cgi?id=44029
+
+ * inspector/InjectedScriptHost.h:
+ (WebCore::InjectedScriptHost::injectedScriptSource):
+
2010-08-18 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Steve Block.
diff --git a/WebCore/inspector/InjectedScriptHost.h b/WebCore/inspector/InjectedScriptHost.h
index 997f340..a670db0 100644
--- a/WebCore/inspector/InjectedScriptHost.h
+++ b/WebCore/inspector/InjectedScriptHost.h
@@ -58,6 +58,7 @@ public:
~InjectedScriptHost();
+ String injectedScriptSource() { return m_injectedScriptSource; }
void setInjectedScriptSource(const String& source) { m_injectedScriptSource = source; }
InspectorController* inspectorController() { return m_inspectorController; }
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 62e7e98..93479f4 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,21 @@
Reviewed by Yury Semikhatsky.
+ Chromium DevTools: There is no need in resource-based InjectedScript.js source.
+ Now that we populate front-end after its onload handler, I don't think we need
+ to install injected script early.
+ https://bugs.webkit.org/show_bug.cgi?id=44029
+
+ * public/WebDevToolsAgentClient.h:
+ * src/WebDevToolsAgentImpl.cpp:
+ (WebKit::):
+ (WebKit::WebDevToolsAgentImpl::attach):
+ (WebKit::WebDevToolsAgentImpl::frontendLoaded):
+
+2010-08-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
Chromium DevTools: remove setRuntimeFeatureEnabled API method that
is no longer used.
https://bugs.webkit.org/show_bug.cgi?id=44237
diff --git a/WebKit/chromium/public/WebDevToolsAgentClient.h b/WebKit/chromium/public/WebDevToolsAgentClient.h
index 386bd08..087ac0b 100644
--- a/WebKit/chromium/public/WebDevToolsAgentClient.h
+++ b/WebKit/chromium/public/WebDevToolsAgentClient.h
@@ -53,7 +53,6 @@ public:
// Notifies host upon runtime feature being enabled/disabled.
virtual void runtimePropertyChanged(const WebString& name, const WebString& value) { }
- virtual WebCString injectedScriptSource() { return WebCString(); }
virtual WebCString debuggerScriptSource() { return WebCString(); }
class WebKitClientMessageLoop {
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index edf354e..fbb06f8 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -206,19 +206,6 @@ void WebDevToolsAgentImpl::attach()
WebCString debuggerScriptJs = m_client->debuggerScriptSource();
WebCore::ScriptDebugServer::shared().setDebuggerScriptSource(
WTF::String(debuggerScriptJs.data(), debuggerScriptJs.length()));
-
- // TODO(yurys): the source should have already been pushed by the frontend.
- WebCString injectedScriptJs = m_client->injectedScriptSource();
- String injectedScriptSource = String::fromUTF8(injectedScriptJs.data(), injectedScriptJs.length());
- const char* varDefinition = "var injectedScriptConstructor = ";
- int pos = injectedScriptSource.find(varDefinition);
- if (pos == -1) {
- ASSERT_NOT_REACHED();
- return;
- }
- pos += String(varDefinition).length();
- injectedScriptSource = injectedScriptSource.substring(pos);
- inspectorController()->injectedScriptHost()->setInjectedScriptSource(injectedScriptSource);
m_attached = true;
}
@@ -237,7 +224,8 @@ void WebDevToolsAgentImpl::detach()
void WebDevToolsAgentImpl::frontendLoaded()
{
inspectorController()->connectFrontend();
- m_client->runtimePropertyChanged(kFrontendConnectedFeatureName, "true");
+ // We know that by this time injected script has already been pushed to the backend.
+ m_client->runtimePropertyChanged(kFrontendConnectedFeatureName, inspectorController()->injectedScriptHost()->injectedScriptSource());
}
void WebDevToolsAgentImpl::didNavigate()
@@ -278,8 +266,10 @@ void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebSt
ic->enableResourceTracking(false /* not sticky */, false /* no reload */);
else
ic->disableResourceTracking(false /* not sticky */);
- } else if (name == kFrontendConnectedFeatureName && value == "true" && !inspectorController()->hasFrontend())
+ } else if (name == kFrontendConnectedFeatureName && !inspectorController()->hasFrontend()) {
+ inspectorController()->injectedScriptHost()->setInjectedScriptSource(value);
frontendLoaded();
+ }
}
void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bb67bb5..e3adb12 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-19 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Chromium DevTools: There is no need in resource-based InjectedScript.js source.
+ Now that we populate front-end after its onload handler, we don't need
+ to install injected script early. Exposing injected script source on the WebCore
+ level here.
+ https://bugs.webkit.org/show_bug.cgi?id=44029
+
+ * DumpRenderTree/chromium/DRTDevToolsAgent.cpp:
+ (DRTDevToolsAgent::runtimePropertyChanged):
+ (DRTDevToolsAgent::delayedFrontendLoaded):
+ (DRTDevToolsAgent::frontendLoaded):
+ * DumpRenderTree/chromium/DRTDevToolsAgent.h:
+
2010-08-19 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
index 4736676..7918acb 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.cpp
@@ -74,9 +74,9 @@ void DRTDevToolsAgent::forceRepaint()
{
}
-void DRTDevToolsAgent::runtimeFeatureStateChanged(const WebKit::WebString& feature, bool enabled)
+void DRTDevToolsAgent::runtimePropertyChanged(const WebKit::WebString& name, const WebKit::WebString& value)
{
- // FIXME: implement this.
+ // FIXME: Implement.
}
WebCString DRTDevToolsAgent::injectedScriptSource()
@@ -104,6 +104,14 @@ void DRTDevToolsAgent::call(const DRTDevToolsCallArgs &args)
m_drtDevToolsClient->allMessagesProcessed();
}
+void DRTDevToolsAgent::delayedFrontendLoaded()
+{
+ WebDevToolsAgent* agent = webDevToolsAgent();
+ if (agent)
+ agent->frontendLoaded();
+}
+
+
WebDevToolsAgent* DRTDevToolsAgent::webDevToolsAgent()
{
if (!m_webView)
@@ -130,9 +138,8 @@ void DRTDevToolsAgent::detach()
}
void DRTDevToolsAgent::frontendLoaded() {
- WebDevToolsAgent* agent = webDevToolsAgent();
- if (agent)
- agent->frontendLoaded();
+ webkit_support::PostTaskFromHere(
+ m_callMethodFactory.NewRunnableMethod(&DRTDevToolsAgent::delayedFrontendLoaded));
}
bool DRTDevToolsAgent::setTimelineProfilingEnabled(bool enabled)
diff --git a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
index 899a23f..b89a3c7 100644
--- a/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
+++ b/WebKitTools/DumpRenderTree/chromium/DRTDevToolsAgent.h
@@ -33,12 +33,14 @@
#include "base/task.h" // FIXME: remove this
#include "public/WebDevToolsAgentClient.h"
+#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
namespace WebKit {
class WebCString;
class WebDevToolsAgent;
+class WebString;
class WebView;
struct WebDevToolsMessageData;
@@ -60,7 +62,7 @@ public:
virtual void sendMessageToInspectorFrontend(const WebKit::WebString&);
virtual int hostIdentifier() { return m_routingID; }
virtual void forceRepaint();
- virtual void runtimeFeatureStateChanged(const WebKit::WebString& feature, bool enabled);
+ virtual void runtimePropertyChanged(const WebKit::WebString& name, const WebKit::WebString& value);
virtual WebKit::WebCString injectedScriptSource();
virtual WebKit::WebCString debuggerScriptSource();
@@ -75,6 +77,7 @@ public:
private:
void call(const DRTDevToolsCallArgs&);
+ void delayedFrontendLoaded();
static void dispatchMessageLoop();
WebKit::WebDevToolsAgent* webDevToolsAgent();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list