[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:44:21 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 24acded4c793342f68d18c3a40d2cbd7c8aa1a98
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 13:30:17 2010 +0000

    2010-08-05  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium DevTools: [REGRESSION] Frame navigation is not handled in devtools.
    
            https://bugs.webkit.org/show_bug.cgi?id=43556
    
            * src/WebDevToolsAgentImpl.cpp:
            (WebKit::):
            (WebKit::WebDevToolsAgentImpl::detach):
            (WebKit::WebDevToolsAgentImpl::frontendLoaded):
            (WebKit::WebDevToolsAgentImpl::setRuntimeFeatureEnabled):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 02620ec..21a6315 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-05  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium DevTools: [REGRESSION] Frame navigation is not handled in devtools.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43556
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::):
+        (WebKit::WebDevToolsAgentImpl::detach):
+        (WebKit::WebDevToolsAgentImpl::frontendLoaded):
+        (WebKit::WebDevToolsAgentImpl::setRuntimeFeatureEnabled):
+
 2010-08-05  John Gregg  <johnnyg at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index f95a2a5..159fe58 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -102,6 +102,7 @@ void InspectorBackendWeakReferenceCallback(v8::Persistent<v8::Value> object, voi
     object.Dispose();
 }
 
+static const char kFrontendConnectedFeatureName[] = "frontend-connected";
 static const char kResourceTrackingFeatureName[] = "resource-tracking";
 static const char kTimelineFeatureName[] = "timeline-profiler";
 static const char kApuAgentFeatureName[] = "apu-agent";
@@ -269,6 +270,7 @@ void WebDevToolsAgentImpl::frontendLoaded()
         v8::Local<v8::Context>::New(m_utilityContext));
     InspectorController* ic = inspectorController();
     ic->connectFrontend(ScriptObject(state, m_utilityContext->Global()));
+    m_client->runtimeFeatureStateChanged(kFrontendConnectedFeatureName, true);
 }
 
 void WebDevToolsAgentImpl::didNavigate()
@@ -309,7 +311,8 @@ void WebDevToolsAgentImpl::setRuntimeFeatureEnabled(const WebString& feature, bo
           ic->enableResourceTracking(false /* not sticky */, false /* no reload */);
         else
           ic->disableResourceTracking(false /* not sticky */);
-    }
+    } else if (feature == kFrontendConnectedFeatureName && enabled)
+        frontendLoaded();
 }
 
 void WebDevToolsAgentImpl::compileUtilityScripts()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list