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

[yurys at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e9f6f1ff308105cc4b4a3560e548ed6e86f08a7a
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 12:16:59 2010 +0000

    2010-08-16  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: remove utility context related code from debugger agent
            https://bugs.webkit.org/show_bug.cgi?id=44049
    
            * src/DebuggerAgentManager.cpp:
            (WebKit::DebuggerAgentManager::onV8DebugMessage):
            (WebKit::DebuggerAgentManager::pauseScript):
            * src/DebuggerAgentManager.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index fe4bd44..8c61067 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-16  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: remove utility context related code from debugger agent
+        https://bugs.webkit.org/show_bug.cgi?id=44049
+
+        * src/DebuggerAgentManager.cpp:
+        (WebKit::DebuggerAgentManager::onV8DebugMessage):
+        (WebKit::DebuggerAgentManager::pauseScript):
+        * src/DebuggerAgentManager.h:
+
 2010-08-16  Yuta Kitamura  <yutak at chromium.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKit/chromium/src/DebuggerAgentManager.cpp b/WebKit/chromium/src/DebuggerAgentManager.cpp
index 1df7172..dfc186c 100644
--- a/WebKit/chromium/src/DebuggerAgentManager.cpp
+++ b/WebKit/chromium/src/DebuggerAgentManager.cpp
@@ -50,10 +50,6 @@ bool DebuggerAgentManager::s_inHostDispatchHandler = false;
 
 DebuggerAgentManager::DeferrersMap DebuggerAgentManager::s_pageDeferrers;
 
-bool DebuggerAgentManager::s_inUtilityContext = false;
-
-bool DebuggerAgentManager::s_debugBreakDelayed = false;
-
 bool DebuggerAgentManager::s_exposeV8DebuggerProtocol = false;
 
 namespace {
@@ -208,28 +204,20 @@ void DebuggerAgentManager::onV8DebugMessage(const v8::Debug::Message& message)
         return;
     }
 
-    if (s_inUtilityContext && message.GetEvent() == v8::Break) {
-        // This may happen when two tabs are being debugged in the same process.
-        // Suppose that first debugger is pauesed on an exception. It will run
-        // nested MessageLoop which may process Break request from the second
-        // debugger.
-        s_debugBreakDelayed = true;
-    } else {
-        // If the context is from one of the inpected tabs or injected extension
-        // scripts it must have hostId in the data field.
-        int hostId = WebCore::V8Proxy::contextDebugId(context);
-        if (hostId != -1) {
-            DebuggerAgentImpl* agent = debuggerAgentForHostId(hostId);
-            if (agent) {
-                if (agent->autoContinueOnException()
-                    && message.GetEvent() == v8::Exception) {
-                    sendContinueCommandToV8();
-                    return;
-                }
-
-                agent->debuggerOutput(out);
+    // If the context is from one of the inpected tabs or injected extension
+    // scripts it must have hostId in the data field.
+    int hostId = WebCore::V8Proxy::contextDebugId(context);
+    if (hostId != -1) {
+        DebuggerAgentImpl* agent = debuggerAgentForHostId(hostId);
+        if (agent) {
+            if (agent->autoContinueOnException()
+                && message.GetEvent() == v8::Exception) {
+                sendContinueCommandToV8();
                 return;
             }
+
+            agent->debuggerOutput(out);
+            return;
         }
     }
 
@@ -242,10 +230,7 @@ void DebuggerAgentManager::onV8DebugMessage(const v8::Debug::Message& message)
 
 void DebuggerAgentManager::pauseScript()
 {
-    if (s_inUtilityContext)
-        s_debugBreakDelayed = true;
-    else
-        v8::Debug::DebugBreak();
+    v8::Debug::DebugBreak();
 }
 
 void DebuggerAgentManager::executeDebuggerCommand(const WTF::String& command, int callerId)
diff --git a/WebKit/chromium/src/DebuggerAgentManager.h b/WebKit/chromium/src/DebuggerAgentManager.h
index 300cada..66bd714 100644
--- a/WebKit/chromium/src/DebuggerAgentManager.h
+++ b/WebKit/chromium/src/DebuggerAgentManager.h
@@ -80,23 +80,6 @@ public:
 
     static void onNavigate();
 
-    class UtilityContextScope : public Noncopyable {
-    public:
-        UtilityContextScope()
-        {
-            ASSERT(!s_inUtilityContext);
-            s_inUtilityContext = true;
-        }
-        ~UtilityContextScope()
-        {
-            if (s_debugBreakDelayed) {
-              v8::Debug::DebugBreak();
-              s_debugBreakDelayed = false;
-            }
-            s_inUtilityContext = false;
-        }
-    };
-
 private:
     DebuggerAgentManager();
     ~DebuggerAgentManager();
@@ -118,8 +101,6 @@ private:
     typedef HashMap<WebViewImpl*, WebCore::PageGroupLoadDeferrer*> DeferrersMap;
     static DeferrersMap s_pageDeferrers;
 
-    static bool s_inUtilityContext;
-    static bool s_debugBreakDelayed;
     static bool s_exposeV8DebuggerProtocol;
 };
 

-- 
WebKit Debian packaging