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

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4a7336ee84c7ceb76b7e50780cf7a354551becb0
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 15:20:05 2010 +0000

    2010-12-07  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: avoid initializing Context on when creating attaching listener to ScriptDebugServer
            https://bugs.webkit.org/show_bug.cgi?id=50627
    
            * bindings/v8/ScriptDebugServer.cpp:
            (WebCore::ScriptDebugServer::addListener): don't try to collect already parsed scripts if context has
            not been initialized yet.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b6cbeb..a52fe1f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-07  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: avoid initializing Context on when creating attaching listener to ScriptDebugServer
+        https://bugs.webkit.org/show_bug.cgi?id=50627
+
+        * bindings/v8/ScriptDebugServer.cpp:
+        (WebCore::ScriptDebugServer::addListener): don't try to collect already parsed scripts if context has
+        not been initialized yet.
+
 2010-12-07  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed. Rolling out r73421, because it made transitions/color-transition-all.html flakey.
diff --git a/WebCore/bindings/v8/ScriptDebugServer.cpp b/WebCore/bindings/v8/ScriptDebugServer.cpp
index 7a8dbf7..9dfca55 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.cpp
+++ b/WebCore/bindings/v8/ScriptDebugServer.cpp
@@ -113,8 +113,10 @@ void ScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
     }
     m_listenersMap.set(page, listener);
 
-    v8::Local<v8::Context> context = proxy->mainWorldContext();
-
+    V8DOMWindowShell* shell = proxy->windowShell();
+    if (!shell->isContextInitialized())
+        return;
+    v8::Handle<v8::Context> context = shell->context();
     v8::Handle<v8::Function> getScriptsFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.get()->Get(v8::String::New("getScripts")));
     v8::Handle<v8::Value> argv[] = { context->GetData() };
     v8::Handle<v8::Value> value = getScriptsFunction->Call(m_debuggerScript.get(), 1, argv);

-- 
WebKit Debian packaging