Diff
Modified: trunk/LayoutTests/ChangeLog (141398 => 141399)
--- trunk/LayoutTests/ChangeLog 2013-01-31 11:44:58 UTC (rev 141398)
+++ trunk/LayoutTests/ChangeLog 2013-01-31 12:01:01 UTC (rev 141399)
@@ -1,3 +1,17 @@
+2013-01-31 Andrey Lushnikov <[email protected]>
+
+ Web Inspector: text-editor-ctrl-movements.html timeouts on mac
+ https://bugs.webkit.org/show_bug.cgi?id=108440
+
+ Reviewed by Pavel Feldman.
+
+ Use "alt-arrows" key shortcuts to jump over words instead of
+ "ctrl-arrows" on Mac platform.
+
+ * inspector/editor/text-editor-word-jumps-expected.txt: Renamed from LayoutTests/inspector/editor/text-editor-ctrl-movements-expected.txt.
+ * inspector/editor/text-editor-word-jumps.html: Renamed from LayoutTests/inspector/editor/text-editor-ctrl-movements.html.
+ * platform/chromium/TestExpectations: Do not skip this test anymore.
+
2013-01-30 Yury Semikhatsky <[email protected]>
Web Inspector: test that references from DOM nodes to event listeners are presented in heap snapshots
Deleted: trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements-expected.txt (141398 => 141399)
--- trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements-expected.txt 2013-01-31 11:44:58 UTC (rev 141398)
+++ trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements-expected.txt 2013-01-31 12:01:01 UTC (rev 141399)
@@ -1,503 +0,0 @@
-This test checks how text editor handles different ctrl-based movements, i.e. ctrl-left, ctrl-right, ctrl-shift-left, ctrl-backspace.
-
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}
-
-Running: testCtrlRightArrow
-|function testFunction(foo, bar)
-function| testFunction(foo, bar)
-function testFunction|(foo, bar)
-function testFunction(|foo, bar)
-function testFunction(foo|, bar)
-function testFunction(foo,| bar)
-function testFunction(foo, bar|)
-function testFunction(foo, bar)|
-|{
-{|
-| someFunctionCall(bar);
- someFunctionCall|(bar);
- someFunctionCall(|bar);
- someFunctionCall(bar|);
- someFunctionCall(bar);|
-| var b = 42;
- var| b = 42;
- var b| = 42;
- var b =| 42;
- var b = 42|;
- var b = 42;|
-| return a === 1 ? true : false;
- return| a === 1 ? true : false;
- return a| === 1 ? true : false;
- return a ===| 1 ? true : false;
- return a === 1| ? true : false;
- return a === 1 ?| true : false;
- return a === 1 ? true| : false;
- return a === 1 ? true :| false;
- return a === 1 ? true : false|;
- return a === 1 ? true : false;|
-|}
-}|
-}|
-
-Running: testCtrlLeftArrow
-}|
-|}
- return a === 1 ? true : false;|
- return a === 1 ? true : false|;
- return a === 1 ? true : |false;
- return a === 1 ? true |: false;
- return a === 1 ? |true : false;
- return a === 1 |? true : false;
- return a === |1 ? true : false;
- return a |=== 1 ? true : false;
- return |a === 1 ? true : false;
- |return a === 1 ? true : false;
-| return a === 1 ? true : false;
- var b = 42;|
- var b = 42|;
- var b = |42;
- var b |= 42;
- var |b = 42;
- |var b = 42;
-| var b = 42;
- someFunctionCall(bar);|
- someFunctionCall(bar|);
- someFunctionCall(|bar);
- someFunctionCall|(bar);
- |someFunctionCall(bar);
-| someFunctionCall(bar);
-{|
-|{
-function testFunction(foo, bar)|
-function testFunction(foo, bar|)
-function testFunction(foo, |bar)
-function testFunction(foo|, bar)
-function testFunction(|foo, bar)
-function testFunction|(foo, bar)
-function |testFunction(foo, bar)
-|function testFunction(foo, bar)
-|function testFunction(foo, bar)
-
-Running: testCtrlShiftRightArrow
-|function testFunction(foo, bar)
->>function<<
->>function testFunction<<
->>function testFunction(<<
->>function testFunction(foo<<
->>function testFunction(foo,<<
->>function testFunction(foo, bar<<
->>function testFunction(foo, bar)<<
->>function testFunction(foo, bar)
-<<
->>function testFunction(foo, bar)
-{<<
->>function testFunction(foo, bar)
-{
-<<
->>function testFunction(foo, bar)
-{
- someFunctionCall<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
-<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b =<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
-<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a ===<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ?<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true :<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
-
-Running: testCtrlShiftLeftArrow
-}|
->>}<<
->>
-}<<
->>;
-}<<
->>false;
-}<<
->>: false;
-}<<
->>true : false;
-}<<
->>? true : false;
-}<<
->>1 ? true : false;
-}<<
->>=== 1 ? true : false;
-}<<
->>a === 1 ? true : false;
-}<<
->>return a === 1 ? true : false;
-}<<
->> return a === 1 ? true : false;
-}<<
->>
- return a === 1 ? true : false;
-}<<
->>;
- return a === 1 ? true : false;
-}<<
->>42;
- return a === 1 ? true : false;
-}<<
->>= 42;
- return a === 1 ? true : false;
-}<<
->>b = 42;
- return a === 1 ? true : false;
-}<<
->>var b = 42;
- return a === 1 ? true : false;
-}<<
->> var b = 42;
- return a === 1 ? true : false;
-}<<
->>
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->> someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
->>function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}<<
-
-Running: testCtrlBackspace
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
-<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- <<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
-<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(bar<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall(<<
-===============
-function testFunction(foo, bar)
-{
- someFunctionCall<<
-===============
-function testFunction(foo, bar)
-{
- <<
-===============
-function testFunction(foo, bar)
-{
-<<
-===============
-function testFunction(foo, bar)
-{<<
-===============
-function testFunction(foo, bar)
-<<
-===============
-function testFunction(foo, bar)<<
-===============
-function testFunction(foo, bar<<
-===============
-function testFunction(foo, <<
-===============
-function testFunction(foo<<
-===============
-function testFunction(<<
-===============
-function testFunction<<
-===============
-function <<
-===============
-<<
-
Deleted: trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements.html (141398 => 141399)
--- trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements.html 2013-01-31 11:44:58 UTC (rev 141398)
+++ trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements.html 2013-01-31 12:01:01 UTC (rev 141399)
@@ -1,127 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-function test()
-{
-function testFunction(foo, bar)
-{
- someFunctionCall(bar);
- var b = 42;
- return a === 1 ? true : false;
-}
-
- var textEditor = InspectorTest.createTestEditor();
- textEditor.overrideViewportForTest(0, undefined, 3);
- textEditor.mimeType = "text/_javascript_";
- textEditor.setReadOnly(false);
- textEditor.setText(testFunction.toString());
- textEditor.element.focus();
-
- InspectorTest.addResult(textEditor.text());
-
- function dumpEditorSelection()
- {
- var selection = textEditor.selection();
- if (selection.isEmpty()) {
- var line = textEditor.line(selection.startLine);
- InspectorTest.addResult(line.substring(0, selection.startColumn) + "|" + line.substring(selection.startColumn));
- } else {
- InspectorTest.addResult(">>" + textEditor._textModel.copyRange(selection.normalize()) + "<<");
- }
- return selection;
- }
-
- function setCursorAtBeginning()
- {
- textEditor.setSelection(WebInspector.TextRange.createFromLocation(0, 0));
- }
-
- function setCursorAtEnd()
- {
- var lastLine = textEditor._textModel.linesCount - 1;
- var lastColumn = textEditor._textModel.line(lastLine).length;
- textEditor.setSelection(WebInspector.TextRange.createFromLocation(lastLine, lastColumn));
- }
-
- InspectorTest.runTestSuite([
- function testCtrlRightArrow(next)
- {
- setCursorAtBeginning();
- var selection = dumpEditorSelection();
- var oldSelection;
- do {
- oldSelection = selection;
- eventSender.keyDown("rightArrow", ["ctrlKey"]);
- selection = dumpEditorSelection();
- } while (selection.compareTo(oldSelection) !== 0);
- next();
- },
-
- function testCtrlLeftArrow(next)
- {
- setCursorAtEnd();
- var selection = dumpEditorSelection();
- var oldSelection;
- do {
- oldSelection = selection;
- eventSender.keyDown("leftArrow", ["ctrlKey"]);
- selection = dumpEditorSelection();
- } while (selection.compareTo(oldSelection) !== 0);
- next();
- },
-
- function testCtrlShiftRightArrow(next)
- {
- setCursorAtBeginning();
- var selection = dumpEditorSelection();
- var oldSelection;
- do {
- oldSelection = selection;
- eventSender.keyDown("rightArrow", ["ctrlKey", "shiftKey"]);
- selection = dumpEditorSelection();
- } while (selection.collapseToEnd().compareTo(oldSelection.collapseToEnd()) !== 0);
- next();
- },
-
- function testCtrlShiftLeftArrow(next)
- {
- setCursorAtEnd();
- var selection = dumpEditorSelection();
- var oldSelection;
- do {
- oldSelection = selection;
- eventSender.keyDown("leftArrow", ["ctrlKey", "shiftKey"]);
- selection = dumpEditorSelection();
- } while (selection.collapseToEnd().compareTo(oldSelection.collapseToEnd()) !== 0);
- next();
- },
-
- function testCtrlBackspace(next)
- {
- setCursorAtEnd();
- InspectorTest.addResult("===============");
- InspectorTest.addResult(textEditor.text());
- do {
- eventSender.keyDown("\b", ["ctrlKey"]);
- InspectorTest.addResult("===============");
- InspectorTest.addResult(textEditor.text() + "<<");
- } while (textEditor.text() !== "");
- textEditor.setText(testFunction.toString());
- next();
- }
- ]);
-
-}
-
-</script>
-</head>
-
-<body _onload_="runTest();">
-<p>
-This test checks how text editor handles different ctrl-based movements, i.e. ctrl-left, ctrl-right, ctrl-shift-left, ctrl-backspace.
-</p>
-
-</body>
-</html>
Copied: trunk/LayoutTests/inspector/editor/text-editor-word-jumps-expected.txt (from rev 141398, trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements-expected.txt) (0 => 141399)
--- trunk/LayoutTests/inspector/editor/text-editor-word-jumps-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/editor/text-editor-word-jumps-expected.txt 2013-01-31 12:01:01 UTC (rev 141399)
@@ -0,0 +1,503 @@
+This test checks how text editor handles different ctrl-based movements, i.e. ctrl-left, ctrl-right, ctrl-shift-left, ctrl-backspace.
+
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}
+
+Running: testCtrlRightArrow
+|function testFunction(foo, bar)
+function| testFunction(foo, bar)
+function testFunction|(foo, bar)
+function testFunction(|foo, bar)
+function testFunction(foo|, bar)
+function testFunction(foo,| bar)
+function testFunction(foo, bar|)
+function testFunction(foo, bar)|
+|{
+{|
+| someFunctionCall(bar);
+ someFunctionCall|(bar);
+ someFunctionCall(|bar);
+ someFunctionCall(bar|);
+ someFunctionCall(bar);|
+| var b = 42;
+ var| b = 42;
+ var b| = 42;
+ var b =| 42;
+ var b = 42|;
+ var b = 42;|
+| return a === 1 ? true : false;
+ return| a === 1 ? true : false;
+ return a| === 1 ? true : false;
+ return a ===| 1 ? true : false;
+ return a === 1| ? true : false;
+ return a === 1 ?| true : false;
+ return a === 1 ? true| : false;
+ return a === 1 ? true :| false;
+ return a === 1 ? true : false|;
+ return a === 1 ? true : false;|
+|}
+}|
+}|
+
+Running: testCtrlLeftArrow
+}|
+|}
+ return a === 1 ? true : false;|
+ return a === 1 ? true : false|;
+ return a === 1 ? true : |false;
+ return a === 1 ? true |: false;
+ return a === 1 ? |true : false;
+ return a === 1 |? true : false;
+ return a === |1 ? true : false;
+ return a |=== 1 ? true : false;
+ return |a === 1 ? true : false;
+ |return a === 1 ? true : false;
+| return a === 1 ? true : false;
+ var b = 42;|
+ var b = 42|;
+ var b = |42;
+ var b |= 42;
+ var |b = 42;
+ |var b = 42;
+| var b = 42;
+ someFunctionCall(bar);|
+ someFunctionCall(bar|);
+ someFunctionCall(|bar);
+ someFunctionCall|(bar);
+ |someFunctionCall(bar);
+| someFunctionCall(bar);
+{|
+|{
+function testFunction(foo, bar)|
+function testFunction(foo, bar|)
+function testFunction(foo, |bar)
+function testFunction(foo|, bar)
+function testFunction(|foo, bar)
+function testFunction|(foo, bar)
+function |testFunction(foo, bar)
+|function testFunction(foo, bar)
+|function testFunction(foo, bar)
+
+Running: testCtrlShiftRightArrow
+|function testFunction(foo, bar)
+>>function<<
+>>function testFunction<<
+>>function testFunction(<<
+>>function testFunction(foo<<
+>>function testFunction(foo,<<
+>>function testFunction(foo, bar<<
+>>function testFunction(foo, bar)<<
+>>function testFunction(foo, bar)
+<<
+>>function testFunction(foo, bar)
+{<<
+>>function testFunction(foo, bar)
+{
+<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b =<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a ===<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ?<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true :<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+
+Running: testCtrlShiftLeftArrow
+}|
+>>}<<
+>>
+}<<
+>>;
+}<<
+>>false;
+}<<
+>>: false;
+}<<
+>>true : false;
+}<<
+>>? true : false;
+}<<
+>>1 ? true : false;
+}<<
+>>=== 1 ? true : false;
+}<<
+>>a === 1 ? true : false;
+}<<
+>>return a === 1 ? true : false;
+}<<
+>> return a === 1 ? true : false;
+}<<
+>>
+ return a === 1 ? true : false;
+}<<
+>>;
+ return a === 1 ? true : false;
+}<<
+>>42;
+ return a === 1 ? true : false;
+}<<
+>>= 42;
+ return a === 1 ? true : false;
+}<<
+>>b = 42;
+ return a === 1 ? true : false;
+}<<
+>>var b = 42;
+ return a === 1 ? true : false;
+}<<
+>> var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>> someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+>>function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}<<
+
+Running: testCtrlBackspace
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ <<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall(<<
+===============
+function testFunction(foo, bar)
+{
+ someFunctionCall<<
+===============
+function testFunction(foo, bar)
+{
+ <<
+===============
+function testFunction(foo, bar)
+{
+<<
+===============
+function testFunction(foo, bar)
+{<<
+===============
+function testFunction(foo, bar)
+<<
+===============
+function testFunction(foo, bar)<<
+===============
+function testFunction(foo, bar<<
+===============
+function testFunction(foo, <<
+===============
+function testFunction(foo<<
+===============
+function testFunction(<<
+===============
+function testFunction<<
+===============
+function <<
+===============
+<<
+
Copied: trunk/LayoutTests/inspector/editor/text-editor-word-jumps.html (from rev 141398, trunk/LayoutTests/inspector/editor/text-editor-ctrl-movements.html) (0 => 141399)
--- trunk/LayoutTests/inspector/editor/text-editor-word-jumps.html (rev 0)
+++ trunk/LayoutTests/inspector/editor/text-editor-word-jumps.html 2013-01-31 12:01:01 UTC (rev 141399)
@@ -0,0 +1,128 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+function test()
+{
+function testFunction(foo, bar)
+{
+ someFunctionCall(bar);
+ var b = 42;
+ return a === 1 ? true : false;
+}
+
+ var textEditor = InspectorTest.createTestEditor();
+ textEditor.overrideViewportForTest(0, undefined, 3);
+ textEditor.mimeType = "text/_javascript_";
+ textEditor.setReadOnly(false);
+ textEditor.setText(testFunction.toString());
+ textEditor.element.focus();
+
+ InspectorTest.addResult(textEditor.text());
+ const wordJumpModifier = WebInspector.isMac() ? "altKey" : "ctrlKey";
+
+ function dumpEditorSelection()
+ {
+ var selection = textEditor.selection();
+ if (selection.isEmpty()) {
+ var line = textEditor.line(selection.startLine);
+ InspectorTest.addResult(line.substring(0, selection.startColumn) + "|" + line.substring(selection.startColumn));
+ } else {
+ InspectorTest.addResult(">>" + textEditor._textModel.copyRange(selection.normalize()) + "<<");
+ }
+ return selection;
+ }
+
+ function setCursorAtBeginning()
+ {
+ textEditor.setSelection(WebInspector.TextRange.createFromLocation(0, 0));
+ }
+
+ function setCursorAtEnd()
+ {
+ var lastLine = textEditor._textModel.linesCount - 1;
+ var lastColumn = textEditor._textModel.line(lastLine).length;
+ textEditor.setSelection(WebInspector.TextRange.createFromLocation(lastLine, lastColumn));
+ }
+
+ InspectorTest.runTestSuite([
+ function testCtrlRightArrow(next)
+ {
+ setCursorAtBeginning();
+ var selection = dumpEditorSelection();
+ var oldSelection;
+ do {
+ oldSelection = selection;
+ eventSender.keyDown("rightArrow", [wordJumpModifier]);
+ selection = dumpEditorSelection();
+ } while (selection.compareTo(oldSelection) !== 0);
+ next();
+ },
+
+ function testCtrlLeftArrow(next)
+ {
+ setCursorAtEnd();
+ var selection = dumpEditorSelection();
+ var oldSelection;
+ do {
+ oldSelection = selection;
+ eventSender.keyDown("leftArrow", [wordJumpModifier]);
+ selection = dumpEditorSelection();
+ } while (selection.compareTo(oldSelection) !== 0);
+ next();
+ },
+
+ function testCtrlShiftRightArrow(next)
+ {
+ setCursorAtBeginning();
+ var selection = dumpEditorSelection();
+ var oldSelection;
+ do {
+ oldSelection = selection;
+ eventSender.keyDown("rightArrow", [wordJumpModifier, "shiftKey"]);
+ selection = dumpEditorSelection();
+ } while (selection.collapseToEnd().compareTo(oldSelection.collapseToEnd()) !== 0);
+ next();
+ },
+
+ function testCtrlShiftLeftArrow(next)
+ {
+ setCursorAtEnd();
+ var selection = dumpEditorSelection();
+ var oldSelection;
+ do {
+ oldSelection = selection;
+ eventSender.keyDown("leftArrow", [wordJumpModifier, "shiftKey"]);
+ selection = dumpEditorSelection();
+ } while (selection.collapseToEnd().compareTo(oldSelection.collapseToEnd()) !== 0);
+ next();
+ },
+
+ function testCtrlBackspace(next)
+ {
+ setCursorAtEnd();
+ InspectorTest.addResult("===============");
+ InspectorTest.addResult(textEditor.text());
+ do {
+ eventSender.keyDown("\b", [wordJumpModifier]);
+ InspectorTest.addResult("===============");
+ InspectorTest.addResult(textEditor.text() + "<<");
+ } while (textEditor.text() !== "");
+ textEditor.setText(testFunction.toString());
+ next();
+ }
+ ]);
+
+}
+
+</script>
+</head>
+
+<body _onload_="runTest();">
+<p>
+This test checks how text editor handles different ctrl-based movements, i.e. ctrl-left, ctrl-right, ctrl-shift-left, ctrl-backspace.
+</p>
+
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (141398 => 141399)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-31 11:44:58 UTC (rev 141398)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-31 12:01:01 UTC (rev 141399)
@@ -1069,9 +1069,6 @@
webkit.org/b/75647 http/tests/inspector/network/download.html [ Pass Timeout Failure ]
-# Timing out after http://trac.webkit.org/changeset/141245
-webkit.org/b/107944 inspector/editor/text-editor-ctrl-movements.html [ Pass Timeout ]
-
# -----------------------------------------------------------------
# Editing tests
# -----------------------------------------------------------------