Modified: trunk/LayoutTests/ChangeLog (130263 => 130264)
--- trunk/LayoutTests/ChangeLog 2012-10-03 08:50:24 UTC (rev 130263)
+++ trunk/LayoutTests/ChangeLog 2012-10-03 08:54:28 UTC (rev 130264)
@@ -1,3 +1,14 @@
+2012-10-03 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
Add data passing to the GetStats interface of RTCPeerConnection
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (130263 => 130264)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-03 08:50:24 UTC (rev 130263)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-03 08:54:28 UTC (rev 130264)
@@ -3719,5 +3719,3 @@
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 ]
Modified: trunk/Source/WebCore/ChangeLog (130263 => 130264)
--- trunk/Source/WebCore/ChangeLog 2012-10-03 08:50:24 UTC (rev 130263)
+++ trunk/Source/WebCore/ChangeLog 2012-10-03 08:54:28 UTC (rev 130264)
@@ -1,3 +1,16 @@
+2012-10-03 Vsevolod Vlasov <[email protected]>
+
+ 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 <[email protected]>
Unreviewed. Touch FrameView.cpp file for fixing mac bot compilation.
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (130263 => 130264)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-10-03 08:50:24 UTC (rev 130263)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2012-10-03 08:54:28 UTC (rev 130264)
@@ -633,13 +633,14 @@
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::_javascript_Breakpoints);
@@ -649,7 +650,7 @@
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);
