Changeset 90993 in webkit

Timestamp:

Jul 14, 2011 6:28:19 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

Web Inspector: add test for css live edit.
​https://bugs.webkit.org/show_bug.cgi?id=64454

Reviewed by Pavel Feldman.

• http/tests/inspector/inspector-test.js:

(initialize_InspectorTest.InspectorTest.showResource):

• http/tests/inspector/live-edit-test.js: Added.

(initialize_LiveEditTest.InspectorTest.replaceInSource):
(initialize_LiveEditTest):

• inspector/debugger/live-edit.html:
• inspector/styles/css-live-edit-expected.txt: Added.
• inspector/styles/css-live-edit.html: Added.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/inspector-test.js (modified) (1 diff)
• http/tests/inspector/live-edit-test.js (added)
• inspector/debugger/live-edit.html (modified) (2 diffs)
• inspector/styles/css-live-edit-expected.txt (added)
• inspector/styles/css-live-edit.html (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-13  Pavel Podivilov  <podivilov@chromium.org>
+
+        Web Inspector: add test for css live edit.
+        https://bugs.webkit.org/show_bug.cgi?id=64454
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/inspector-test.js:
+        (initialize_InspectorTest.InspectorTest.showResource):
+        * http/tests/inspector/live-edit-test.js: Added.
+        (initialize_LiveEditTest.InspectorTest.replaceInSource):
+        (initialize_LiveEditTest):
+        * inspector/debugger/live-edit.html:
+        * inspector/styles/css-live-edit-expected.txt: Added.
+        * inspector/styles/css-live-edit.html: Added.
+
 2011-07-14  Yuta Kitamura  <yutak@chromium.org>
 

trunk/LayoutTests/http/tests/inspector/inspector-test.js

@@ -69 +69 @@
     InspectorTest.evaluateInPage("setTimeout(unescape('" + escape(code) + "'))");
 }
+
+InspectorTest.showResource = function(resourceURL, callback)
+{
+    callback = InspectorTest.safeWrap(callback);
+    for (var url in WebInspector.resourceTreeModel._resourcesByURL) {
+        if (url.indexOf(resourceURL) !== -1) {
+            var resource = WebInspector.resourceTreeModel._resourcesByURL[url];
+            WebInspector.panels.resources.showResource(resource, 1);
+            var sourceFrame = WebInspector.panels.resources._resourceViewForResource(resource);
+            if (sourceFrame.loaded)
+                callback(sourceFrame);
+            else
+                sourceFrame.addEventListener(WebInspector.SourceFrame.Events.Loaded, callback.bind(null, sourceFrame));
+            return;
+        }
+    }
+    InspectorTest.addSniffer(WebInspector.resourceTreeModel, "_bindResourceURL", InspectorTest.showResource.bind(InspectorTest, url, callback));
+};
 
 InspectorTest.addResult = function(text)

trunk/LayoutTests/inspector/debugger/live-edit.html

@@ -3 +3 @@
 <script src="../../http/tests/inspector/inspector-test.js"></script>
 <script src="../../http/tests/inspector/debugger-test.js"></script>
+<script src="../../http/tests/inspector/live-edit-test.js"></script>
 <script src="resources/edit-me.js"></script>
 <script src="resources/edit-me-when-paused.js"></script>
@@ -112 +113 @@
     {
         InspectorTest.addSniffer(WebInspector.debuggerModel, "_didEditScriptSource", callback);
-        sourceFrame._textViewer._mainPanel.readOnly = false;
-        sourceFrame.beforeTextChanged();
-        var oldRange, newRange;
-        var lines = sourceFrame._textModel._lines;
-        for (var i = 0; i < lines.length; ++i) {
-            var column = lines[i].indexOf(string);
-            if (column === -1)
-                continue;
-            lines[i] = lines[i].replace(string, replacement);
-            var lineEndings = replacement.lineEndings();
-            var lastLineLength = lineEndings[lineEndings.length - 1] - (lineEndings[lineEndings.length - 2] || 0);
-            oldRange = new WebInspector.TextRange(i, column, i, column + string.length);
-            newRange = new WebInspector.TextRange(i, column, i + lineEndings.length - 1, lastLineLength);
-            break;
-        }
-        sourceFrame.afterTextChanged(oldRange, newRange);
-        sourceFrame._textViewer._commitEditing();
+        InspectorTest.replaceInSource(sourceFrame, string, replacement);
     }
 };