Title: [121765] trunk
- Revision
- 121765
- Author
- [email protected]
- Date
- 2012-07-03 08:00:09 -0700 (Tue, 03 Jul 2012)
Log Message
inspector/debugger/script-snippet-model.html fails
https://bugs.webkit.org/show_bug.cgi?id=90385
Reviewed by Pavel Feldman.
Source/WebCore:
* inspector/front-end/ScriptSnippetModel.js:
LayoutTests:
* inspector/debugger/script-snippet-model-expected.txt:
* platform/chromium/inspector/debugger/script-snippet-model-expected.txt: Copied from LayoutTests/inspector/debugger/script-snippet-model-expected.txt.
* platform/qt/Skipped:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121764 => 121765)
--- trunk/LayoutTests/ChangeLog 2012-07-03 14:44:19 UTC (rev 121764)
+++ trunk/LayoutTests/ChangeLog 2012-07-03 15:00:09 UTC (rev 121765)
@@ -1,3 +1,14 @@
+2012-07-03 Vsevolod Vlasov <[email protected]>
+
+ inspector/debugger/script-snippet-model.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=90385
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/debugger/script-snippet-model-expected.txt:
+ * platform/chromium/inspector/debugger/script-snippet-model-expected.txt: Copied from LayoutTests/inspector/debugger/script-snippet-model-expected.txt.
+ * platform/qt/Skipped:
+
2012-07-03 Alexander Pavlov <[email protected]>
[REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries
Modified: trunk/LayoutTests/inspector/debugger/script-snippet-model-expected.txt (121764 => 121765)
--- trunk/LayoutTests/inspector/debugger/script-snippet-model-expected.txt 2012-07-03 14:44:19 UTC (rev 121764)
+++ trunk/LayoutTests/inspector/debugger/script-snippet-model-expected.txt 2012-07-03 15:00:09 UTC (rev 121765)
@@ -8,8 +8,7 @@
Snippet execution result: undefined
Last evaluation source url for snippet: snippets:///2_2
Snippet script added, sourceURL = snippets:///2_2
-Snippet execution result: function doesNothing()
-{
+Snippet execution result: function doesNothing() {
var i = 2+2;
}
Last evaluation source url for snippet: snippets:///1_3
Copied: trunk/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt (from rev 121764, trunk/LayoutTests/inspector/debugger/script-snippet-model-expected.txt) (0 => 121765)
--- trunk/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt 2012-07-03 15:00:09 UTC (rev 121765)
@@ -0,0 +1,19 @@
+Tests script snippet model.
+
+Debugger was enabled.
+
+Running: testEvaluate
+Last evaluation source url for snippet: snippets:///1_1
+Snippet script added, sourceURL = snippets:///1_1
+Snippet execution result: undefined
+Last evaluation source url for snippet: snippets:///2_2
+Snippet script added, sourceURL = snippets:///2_2
+Snippet execution result: function doesNothing()
+{
+ var i = 2+2;
+}
+Last evaluation source url for snippet: snippets:///1_3
+Snippet script added, sourceURL = snippets:///1_3
+Snippet execution result: undefined
+Debugger was disabled.
+
Modified: trunk/LayoutTests/platform/qt/Skipped (121764 => 121765)
--- trunk/LayoutTests/platform/qt/Skipped 2012-07-03 14:44:19 UTC (rev 121764)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-07-03 15:00:09 UTC (rev 121765)
@@ -2533,6 +2533,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=90165
css3/filters/huge-region-composited.html
-# inspector/debugger/script-snippet-model.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=90385
-inspector/debugger/script-snippet-model.html
Modified: trunk/Source/WebCore/ChangeLog (121764 => 121765)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 14:44:19 UTC (rev 121764)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 15:00:09 UTC (rev 121765)
@@ -1,3 +1,12 @@
+2012-07-03 Vsevolod Vlasov <[email protected]>
+
+ inspector/debugger/script-snippet-model.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=90385
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/ScriptSnippetModel.js:
+
2012-07-03 Alexander Pavlov <[email protected]>
[REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (121764 => 121765)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-03 14:44:19 UTC (rev 121764)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2012-07-03 15:00:09 UTC (rev 121765)
@@ -170,7 +170,7 @@
// In case we don't need that since debugger is already paused.
// We do the same when we are stopped on the call frame since debugger is already paused and can not stop on breakpoint anymore.
if (WebInspector.debuggerModel.selectedCallFrame() || !Capabilities.separateScriptCompilationAndExecutionEnabled) {
- _expression_ = snippetJavaScriptSource.workingCopy() + "\n//@ sourceURL=" + snippetJavaScriptSource.url + "\n";
+ _expression_ = snippetJavaScriptSource.workingCopy() + "\n//@ sourceURL=" + evaluationUrl + "\n";
WebInspector.evaluateInConsole(_expression_, true);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
