Commit 4b25f827 authored by vsevik@chromium.org's avatar vsevik@chromium.org
Browse files

Web Inspector: SourceURL should be taken from debugger agent when possible.

https://bugs.webkit.org/show_bug.cgi?id=98239

Reviewed by Yury Semikhatsky.

Source/WebCore:

Removed a check that sourceURL coming from js engine is the same as the one parsed by debugger agent.
Alwys use the one from debugger agent now.

* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::didParseSource):

LayoutTests:

Unskipped test.

* platform/chromium/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@130264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3e7e2e81
2012-10-03 Vsevolod Vlasov <vsevik@chromium.org>
Web Inspector: SourceURL should be taken from debugger agent when possible.
https://bugs.webkit.org/show_bug.cgi?id=98239
Reviewed by Yury Semikhatsky.
Unskipped test.
* platform/chromium/TestExpectations:
2012-10-03 Harald Alvestrand <hta@google.com>
Add data passing to the GetStats interface of RTCPeerConnection
......
......@@ -3719,5 +3719,3 @@ webkit.org/b/98198 tables/mozilla_expected_failures/marvin/backgr_border-table-c
webkit.org/b/98192 [ Win Debug ] fast/js/dfg-cross-global-object-inline-new-array-with-elements.html [ Failure Pass ]
webkit.org/b/98192 [ Win Debug ] fast/js/post-message-numeric-property.html [ Failure Pass ]
webkit.org/b/97231 inspector/debugger/source-url-comment.html [ Failure Timeout ]
2012-10-03 Vsevolod Vlasov <vsevik@chromium.org>
Web Inspector: SourceURL should be taken from debugger agent when possible.
https://bugs.webkit.org/show_bug.cgi?id=98239
Reviewed by Yury Semikhatsky.
Removed a check that sourceURL coming from js engine is the same as the one parsed by debugger agent.
Alwys use the one from debugger agent now.
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::didParseSource):
2012-10-03 Ilya Tikhonovsky <loislo@chromium.org>
Unreviewed. Touch FrameView.cpp file for fixing mac bot compilation.
......
......@@ -633,13 +633,14 @@ void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script
String sourceURL;
if (!script.startLine && !script.startColumn)
sourceURL = ContentSearchUtils::findSourceURL(script.source);
bool hasSourceURL = !sourceURL.isEmpty() && sourceURL == script.url;
bool hasSourceURL = !sourceURL.isEmpty();
String scriptURL = hasSourceURL ? sourceURL : script.url;
bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : 0;
m_frontend->scriptParsed(scriptId, script.url, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, sourceMapURLParam, hasSourceURLParam);
m_frontend->scriptParsed(scriptId, scriptURL, script.startLine, script.startColumn, script.endLine, script.endColumn, isContentScript, sourceMapURLParam, hasSourceURLParam);
m_scripts.set(scriptId, script);
if (script.url.isEmpty())
if (scriptURL.isEmpty())
return;
RefPtr<InspectorObject> breakpointsCookie = m_state->getObject(DebuggerAgentState::javaScriptBreakpoints);
......@@ -649,7 +650,7 @@ void InspectorDebuggerAgent::didParseSource(const String& scriptId, const Script
breakpointObject->getBoolean("isRegex", &isRegex);
String url;
breakpointObject->getString("url", &url);
if (!matches(script.url, url, isRegex))
if (!matches(scriptURL, url, isRegex))
continue;
ScriptBreakpoint breakpoint;
breakpointObject->getNumber("lineNumber", &breakpoint.lineNumber);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment