Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(99)

Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug (Closed)

Created:
9 years ago by yurys
Modified:
9 years ago
Reviewers:
yurys
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Visibility:
Public.

Description

Merge 106662 - 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 TBR=yurys@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=107229

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+32 lines, -3 lines) Patch
M Source/WebCore/bindings/js/ScriptDebugServer.h View 1 chunk +2 lines, -0 lines 0 comments Download
M Source/WebCore/bindings/v8/ScriptDebugServer.h View 2 chunks +2 lines, -2 lines 0 comments Download
M Source/WebCore/inspector/InspectorDebuggerAgent.h View 1 chunk +1 line, -0 lines 0 comments Download
M Source/WebCore/inspector/InspectorDebuggerAgent.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M Source/WebCore/inspector/InspectorInstrumentation.h View 3 chunks +12 lines, -0 lines 0 comments Download
M Source/WebCore/inspector/InspectorInstrumentation.cpp View 1 chunk +9 lines, -0 lines 0 comments Download
M Source/WebCore/loader/MainResourceLoader.cpp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 1 (0 generated)
yurys
9 years ago (2012-02-09 13:52:34 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698