[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0c1b3b1045f78a4a5f9a0e261fc8e1866e6d5fb7
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 09:37:58 2010 +0000

    2010-08-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium DevTools: Support runtime property name/value pairs
            instead of feature names as navigation state.
            https://bugs.webkit.org/show_bug.cgi?id=44054
    
            * public/WebDevToolsAgent.h:
            * public/WebDevToolsAgentClient.h:
            (WebKit::WebDevToolsAgentClient::runtimePropertyChanged):
            * src/WebDevToolsAgentImpl.cpp:
            (WebKit::WebDevToolsAgentImpl::setRuntimeProperty):
            (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
            * src/WebDevToolsAgentImpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0aee58e..b718ae0 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-17  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium DevTools: Support runtime property name/value pairs
+        instead of feature names as navigation state.
+        https://bugs.webkit.org/show_bug.cgi?id=44054
+
+        * public/WebDevToolsAgent.h:
+        * public/WebDevToolsAgentClient.h:
+        (WebKit::WebDevToolsAgentClient::runtimePropertyChanged):
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::setRuntimeProperty):
+        (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
+        * src/WebDevToolsAgentImpl.h:
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/chromium/public/WebDevToolsAgent.h b/WebKit/chromium/public/WebDevToolsAgent.h
index b74b585..a355a0f 100644
--- a/WebKit/chromium/public/WebDevToolsAgent.h
+++ b/WebKit/chromium/public/WebDevToolsAgent.h
@@ -60,6 +60,7 @@ public:
     virtual void inspectElementAt(const WebPoint&) = 0;
 
     virtual void setRuntimeFeatureEnabled(const WebString& feature, bool enabled) = 0;
+    virtual void setRuntimeProperty(const WebString& name, const WebString& value) = 0;
 
     // Exposed for LayoutTestController.
     virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
diff --git a/WebKit/chromium/public/WebDevToolsAgentClient.h b/WebKit/chromium/public/WebDevToolsAgentClient.h
index ec013ac..386bd08 100644
--- a/WebKit/chromium/public/WebDevToolsAgentClient.h
+++ b/WebKit/chromium/public/WebDevToolsAgentClient.h
@@ -51,7 +51,7 @@ public:
     virtual int hostIdentifier() { return -1; }
 
     // Notifies host upon runtime feature being enabled/disabled.
-    virtual void runtimeFeatureStateChanged(const WebString& feature, bool enabled) { }
+    virtual void runtimePropertyChanged(const WebString& name, const WebString& value) { }
 
     virtual WebCString injectedScriptSource() { return WebCString(); }
     virtual WebCString debuggerScriptSource() { return WebCString(); }
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 9895271..f4b1a86 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -237,7 +237,7 @@ void WebDevToolsAgentImpl::detach()
 void WebDevToolsAgentImpl::frontendLoaded()
 {
     inspectorController()->connectFrontend();
-    m_client->runtimeFeatureStateChanged(kFrontendConnectedFeatureName, true);
+    m_client->runtimePropertyChanged(kFrontendConnectedFeatureName, "true");
 }
 
 void WebDevToolsAgentImpl::didNavigate()
@@ -268,17 +268,22 @@ void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point)
 
 void WebDevToolsAgentImpl::setRuntimeFeatureEnabled(const WebString& feature, bool enabled)
 {
-    if (feature == kApuAgentFeatureName)
-        setApuAgentEnabled(enabled);
-    else if (feature == kTimelineFeatureName)
-        setTimelineProfilingEnabled(enabled);
-    else if (feature == kResourceTrackingFeatureName) {
+    setRuntimeProperty(feature, enabled ? String("true") : String("false"));
+}
+
+void WebDevToolsAgentImpl::setRuntimeProperty(const WebString& name, const WebString& value)
+{
+    if (name == kApuAgentFeatureName)
+        setApuAgentEnabled(value == "true");
+    else if (name == kTimelineFeatureName)
+        setTimelineProfilingEnabled(value == "true");
+    else if (name == kResourceTrackingFeatureName) {
         InspectorController* ic = inspectorController();
-        if (enabled)
+        if (value == "true")
           ic->enableResourceTracking(false /* not sticky */, false /* no reload */);
         else
           ic->disableResourceTracking(false /* not sticky */);
-    } else if (feature == kFrontendConnectedFeatureName && enabled && !inspectorController()->hasFrontend())
+    } else if (name == kFrontendConnectedFeatureName && value == "true" && !inspectorController()->hasFrontend())
         frontendLoaded();
 }
 
@@ -303,9 +308,9 @@ void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)
           ic->disableResourceTracking(false);
       m_resourceTrackingWasEnabled = false;
     }
-    m_client->runtimeFeatureStateChanged(
+    m_client->runtimePropertyChanged(
         kApuAgentFeatureName,
-        enabled);
+        enabled ? String("true") : String("false"));
 }
 
 WebCore::InspectorController* WebDevToolsAgentImpl::inspectorController()
@@ -419,22 +424,22 @@ bool WebDevToolsAgentImpl::sendMessageToFrontend(const WTF::String& message)
 
 void WebDevToolsAgentImpl::resourceTrackingWasEnabled()
 {
-    m_client->runtimeFeatureStateChanged(kResourceTrackingFeatureName, true);
+    m_client->runtimePropertyChanged(kResourceTrackingFeatureName, "true");
 }
 
 void WebDevToolsAgentImpl::resourceTrackingWasDisabled()
 {
-    m_client->runtimeFeatureStateChanged(kResourceTrackingFeatureName, false);
+    m_client->runtimePropertyChanged(kResourceTrackingFeatureName, "false");
 }
 
 void WebDevToolsAgentImpl::timelineProfilerWasStarted()
 {
-    m_client->runtimeFeatureStateChanged(kTimelineFeatureName, true);
+    m_client->runtimePropertyChanged(kTimelineFeatureName, "true");
 }
 
 void WebDevToolsAgentImpl::timelineProfilerWasStopped()
 {
-    m_client->runtimeFeatureStateChanged(kTimelineFeatureName, false);
+    m_client->runtimePropertyChanged(kTimelineFeatureName, "false");
 }
 
 void WebDevToolsAgentImpl::evaluateInWebInspector(long callId, const WebString& script)
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.h b/WebKit/chromium/src/WebDevToolsAgentImpl.h
index a0d2647..73b8a1e 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.h
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.h
@@ -77,6 +77,7 @@ public:
     virtual void inspectElementAt(const WebPoint& point);
     virtual void evaluateInWebInspector(long callId, const WebString& script);
     virtual void setRuntimeFeatureEnabled(const WebString& feature, bool enabled);
+    virtual void setRuntimeProperty(const WebString& name, const WebString& value);
     virtual void setTimelineProfilingEnabled(bool enable);
 
     virtual void identifierForInitialRequest(unsigned long, WebFrame*, const WebURLRequest&);

-- 
WebKit Debian packaging