Changeset 106662 in webkit

Timestamp:

Feb 3, 2012 8:20:32 AM (12 years ago)

Author:

yurys@chromium.org

Message:

inspector/debugger/pause-in-inline-script.html asserts in chromium debug
​https://bugs.webkit.org/show_bug.cgi?id=77663

Source/WebCore:

Make ASSERT in MainResourceLoader not fail if debugger hits breakpoint
in the main resource inline script.

Reviewed by Pavel Feldman.

Test: inspector/debugger/pause-in-inline-script.html

• bindings/js/ScriptDebugServer.h:

(WebCore::ScriptDebugServer::isPaused):
(ScriptDebugServer):

• bindings/v8/ScriptDebugServer.h:

(ScriptDebugServer):

• inspector/InspectorDebuggerAgent.cpp:

(WebCore::InspectorDebuggerAgent::didClearMainFrameWindowObject):
(WebCore):
(WebCore::InspectorDebuggerAgent::isPaused):

• inspector/InspectorDebuggerAgent.h:

(InspectorDebuggerAgent):

• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::isDebuggerPausedImpl):
(WebCore):

• inspector/InspectorInstrumentation.h:

(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::isDebuggerPaused):
(WebCore):

• loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::didFinishLoading):

LayoutTests:

Reviewed by Pavel Feldman.

• platform/chromium/test_expectations.txt: assert was fixed, remove custom expectation for inspector/debugger/pause-in-inline-script.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptDebugServer.h (modified) (1 diff)
• Source/WebCore/bindings/v8/ScriptDebugServer.h (modified) (2 diffs)
• Source/WebCore/inspector/InspectorDebuggerAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorDebuggerAgent.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/loader/MainResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-03  Yury Semikhatsky  <yurys@chromium.org>
+
+        inspector/debugger/pause-in-inline-script.html asserts in chromium debug
+        https://bugs.webkit.org/show_bug.cgi?id=77663
+
+        Reviewed by Pavel Feldman.
+
+        * platform/chromium/test_expectations.txt: assert was fixed, remove
+          custom expectation for inspector/debugger/pause-in-inline-script.html
+
 2012-01-27  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -4048 +4048 @@
 
 BUGWK77661 WIN LINUX : http/tests/inspector/indexeddb/database-structure.html = TEXT
-BUGWK77663 WIN LINUX DEBUG : inspector/debugger/pause-in-inline-script.html = CRASH
 
 // Hitting ASSERT_NOT_REACHED in EventHandler::handleTouchEvent() as of r106554.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Yury Semikhatsky  <yurys@chromium.org>
+
+        inspector/debugger/pause-in-inline-script.html asserts in chromium debug
+        https://bugs.webkit.org/show_bug.cgi?id=77663
+
+        Make ASSERT in MainResourceLoader not fail if debugger hits breakpoint
+        in the main resource inline script.
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/debugger/pause-in-inline-script.html
+
+        * bindings/js/ScriptDebugServer.h:
+        (WebCore::ScriptDebugServer::isPaused):
+        (ScriptDebugServer):
+        * bindings/v8/ScriptDebugServer.h:
+        (ScriptDebugServer):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::didClearMainFrameWindowObject):
+        (WebCore):
+        (WebCore::InspectorDebuggerAgent::isPaused):
+        * inspector/InspectorDebuggerAgent.h:
+        (InspectorDebuggerAgent):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::isDebuggerPausedImpl):
+        (WebCore):
+        * inspector/InspectorInstrumentation.h:
+        (InspectorInstrumentation):
+        (WebCore::InspectorInstrumentation::isDebuggerPaused):
+        (WebCore):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didFinishLoading):
+
 2012-02-03  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/bindings/js/ScriptDebugServer.h

@@ -91 +91 @@
     virtual void recompileAllJSFunctions(Timer<ScriptDebugServer>* = 0) = 0;
 
+    bool isPaused() { return m_paused; }
+
 protected:
     typedef HashSet<ScriptDebugListener*> ListenerSet;

trunk/Source/WebCore/bindings/v8/ScriptDebugServer.h

@@ -93 +93 @@
     void runPendingTasks();
 
+    bool isPaused();
+
 protected:
     ScriptDebugServer();
@@ -113 +115 @@
     void ensureDebuggerScriptCompiled();
     
-    bool isPaused();
-
     PauseOnExceptionsState m_pauseOnExceptionsState;
     OwnHandle<v8::Object> m_debuggerScript;

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -186 +186 @@
 }
 
+bool InspectorDebuggerAgent::isPaused()
+{
+    return scriptDebugServer().isPaused();
+}
+
 static PassRefPtr<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, bool isRegex)
 {

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -78 +78 @@
 
     void didClearMainFrameWindowObject();
+    bool isPaused();
 
     // Part of the protocol.

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -110 +110 @@
 }
 
+bool InspectorInstrumentation::isDebuggerPausedImpl(InstrumentingAgents* instrumentingAgents)
+{
+#if ENABLE(JAVASCRIPT_DEBUGGER)
+    if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
+        return debuggerAgent->isPaused();
+#endif
+    return false;
+}
+
 void InspectorInstrumentation::willInsertDOMNodeImpl(InstrumentingAgents* instrumentingAgents, Node* node, Node* parent)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -81 +81 @@
 public:
     static void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*);
+    static bool isDebuggerPaused(Frame*);
 
     static void willInsertDOMNode(Document*, Node*, Node* parent);
@@ -229 +230 @@
 #if ENABLE(INSPECTOR)
     static void didClearWindowObjectInWorldImpl(InstrumentingAgents*, Frame*, DOMWrapperWorld*);
+    static bool isDebuggerPausedImpl(InstrumentingAgents*);
 
     static void willInsertDOMNodeImpl(InstrumentingAgents*, Node*, Node* parent);
@@ -384 +386 @@
 }
 
+inline bool InspectorInstrumentation::isDebuggerPaused(Frame* frame)
+{
+#if ENABLE(INSPECTOR)
+    FAST_RETURN_IF_NO_FRONTENDS(false);
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+        return isDebuggerPausedImpl(instrumentingAgents);
+#endif
+    return false;
+}
+
 inline void InspectorInstrumentation::willInsertDOMNode(Document* document, Node* node, Node* parent)
 {

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -470 +470 @@
     // See <rdar://problem/6304600> for more details.
 #if !USE(CF)
-    ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading());
+    ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading() || InspectorInstrumentation::isDebuggerPaused(m_frame.get()));
 #endif