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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121765 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7df831e..7f10002 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-03  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        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  <apavlov@chromium.org>
 
         [REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries

diff --git a/LayoutTests/inspector/debugger/script-snippet-model-expected.txt b/LayoutTests/inspector/debugger/script-snippet-model-expected.txt
index 17cefc1..5813f9c 100644 (file)
--- a/LayoutTests/inspector/debugger/script-snippet-model-expected.txt
+++ b/LayoutTests/inspector/debugger/script-snippet-model-expected.txt
@@ -8,8 +8,7 @@ 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()
-{
+Snippet execution result: function doesNothing() {
     var  i = 2+2;
 }
 Last evaluation source url for snippet: snippets:///1_3

diff --git a/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt b/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt
new file mode 100644 (file)
index 0000000..17cefc1
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/debugger/script-snippet-model-expected.txt
@@ -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.
+

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 51b316b..3bd9540 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2533,6 +2533,3 @@ fast/block/positive-margin-start-negative-margin-end-align-center.html
 # 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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6593018..810e1cd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-07-03  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        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  <apavlov@chromium.org>
 
         [REGRESSION] Crash when copying a StyleRuleMedia with a NULL m_mediaQueries

diff --git a/Source/WebCore/inspector/front-end/ScriptSnippetModel.js b/Source/WebCore/inspector/front-end/ScriptSnippetModel.js
index ede6352..4defd7c 100644 (file)
--- a/Source/WebCore/inspector/front-end/ScriptSnippetModel.js
+++ b/Source/WebCore/inspector/front-end/ScriptSnippetModel.js
@@ -170,7 +170,7 @@ WebInspector.ScriptSnippetModel.prototype = {
         // 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;
         }