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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 11:52:24 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 51f69abdde5f94b7cb397675743c902b852bd64e
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 07:25:45 2010 +0000

    2010-08-10  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Fix Chromium compilation.
    
            * src/WebDevToolsAgentImpl.cpp:
            (WebKit::WebDevToolsAgentImpl::frontendLoaded):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a9bb69b..0bc76e4 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-10  Yury Semikhatsky  <yurys at chromium.org>
+
+        Unreviewed. Fix Chromium compilation.
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::frontendLoaded):
+
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
         Speculative chromium build fix V.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 2708e8c..ae15357 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -50,7 +50,6 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptDebugServer.h"
-#include "ScriptObject.h"
 #include "ScriptState.h"
 #include "ScriptValue.h"
 #include "V8Binding.h"
@@ -84,7 +83,6 @@ using WebCore::ResourceError;
 using WebCore::ResourceRequest;
 using WebCore::ResourceResponse;
 using WebCore::SafeAllocation;
-using WebCore::ScriptObject;
 using WebCore::ScriptState;
 using WebCore::ScriptValue;
 using WTF::String;
@@ -265,11 +263,8 @@ void WebDevToolsAgentImpl::detach()
 
 void WebDevToolsAgentImpl::frontendLoaded()
 {
-    v8::HandleScope scope;
-    ScriptState* state = ScriptState::forContext(
-        v8::Local<v8::Context>::New(m_utilityContext));
     InspectorController* ic = inspectorController();
-    ic->connectFrontend(ScriptObject(state, m_utilityContext->Global()));
+    ic->connectFrontend();
     m_client->runtimeFeatureStateChanged(kFrontendConnectedFeatureName, true);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list