From e458d70a0d18538346f41b503114c9ebe6b2ce12 Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 15 Jul 2010 12:03:35 +0100
Subject: Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
---
 WebCore/bindings/v8/ScriptDebugServer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'WebCore/bindings/v8/ScriptDebugServer.cpp')

diff --git a/WebCore/bindings/v8/ScriptDebugServer.cpp b/WebCore/bindings/v8/ScriptDebugServer.cpp
index 8553ee5..138237b 100644
--- a/WebCore/bindings/v8/ScriptDebugServer.cpp
+++ b/WebCore/bindings/v8/ScriptDebugServer.cpp
@@ -356,6 +356,10 @@ void ScriptDebugServer::handleV8DebugEvent(const v8::Debug::EventDetails& eventD
                     if (!stackTrace->GetFrameCount())
                         return;
                 }
+
+                // Don't allow nested breaks.
+                if (m_pausedPage)
+                    return;
                 m_executionState.set(eventDetails.GetExecutionState());
                 m_pausedPage = frame->page();
                 ScriptState* currentCallFrameState = mainWorldScriptState(frame);
-- 
cgit v1.1