Avoid using window.internals when internals is enough after r117771

https://bugs.webkit.org/show_bug.cgi?id=87059

Reviewed by Darin Adler.

Revision r117771 introduced a style change in the layout tests that was not
intended. This patch amends this by using "window.internals" only when checking
for the internals object. Once we know internals is there, we use directly.

This conforms to the style used for layoutTestController in the affected tests.

* editing/deleting/delete-ligature-003.html:
* editing/deleting/paragraph-in-preserveNewline.html:
* editing/deleting/whitespace-pre-1.html:
* editing/execCommand/script-tests/query-command-state.js:
(runTests):
* editing/execCommand/script-tests/query-text-alignment.js:
(runRangeTests):
* editing/execCommand/script-tests/toggle-compound-styles.js:
* editing/selection/5195166-1.html:
* editing/selection/5354455-1.html:
* editing/selection/caret-mode-paragraph-keys-navigation.html:
* editing/selection/collapse-selection-in-bidi.html:
* editing/selection/context-menu-text-selection.html:
* editing/selection/directionality-after-undo-replace.html:
* editing/selection/extend-after-mouse-selection.html:
* editing/selection/extend-selection-after-double-click.html:
* editing/selection/move-by-word-visually-crash-test-1.html:
* editing/selection/move-by-word-visually-crash-test-2.html:
* editing/selection/move-by-word-visually-crash-test-3.html:
* editing/selection/move-by-word-visually-crash-test-4.html:
* editing/selection/move-by-word-visually-crash-test-5.html:
* editing/selection/move-by-word-visually-crash-test-css-generated-content.html:
* editing/selection/move-by-word-visually-crash-test-textarea.html:
* editing/selection/move-by-word-visually-inline-block-positioned-element.html:
* editing/selection/move-by-word-visually-mac.html:
* editing/selection/move-by-word-visually-multi-line.html:
* editing/selection/move-by-word-visually-multi-space.html:
* editing/selection/move-by-word-visually-null-box.html:
* editing/selection/move-by-word-visually-single-space-inline-element.html:
* editing/selection/move-by-word-visually-single-space-one-element.html:
* editing/selection/move-by-word-visually-textarea.html:
* editing/selection/move-by-word-visually-wrong-left-right.html:
* editing/selection/programmatic-selection-on-mac-is-directionless.html:
* editing/selection/rtl-move-selection-right-left.html:
* editing/selection/script-tests/click-in-margins-inside-editable-div.js:
* editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
* editing/selection/script-tests/shift-click.js:
(runShiftClickTest):
* editing/selection/selection-extend-should-not-move-across-caret-on-mac.html:
* editing/style/iframe-onload-crash-mac.html:
* editing/style/iframe-onload-crash-unix.html:
* editing/style/iframe-onload-crash-win.html:
* fast/events/backspace-navigates-back.html:
* fast/forms/selection-direction.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b4adaec..bdc788d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,61 @@
+2012-05-21  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Avoid using window.internals when internals is enough after r117771
+        https://bugs.webkit.org/show_bug.cgi?id=87059
+
+        Reviewed by Darin Adler.
+
+        Revision r117771 introduced a style change in the layout tests that was not
+        intended. This patch amends this by using "window.internals" only when checking
+        for the internals object. Once we know internals is there, we use directly.
+
+        This conforms to the style used for layoutTestController in the affected tests.
+
+        * editing/deleting/delete-ligature-003.html:
+        * editing/deleting/paragraph-in-preserveNewline.html:
+        * editing/deleting/whitespace-pre-1.html:
+        * editing/execCommand/script-tests/query-command-state.js:
+        (runTests):
+        * editing/execCommand/script-tests/query-text-alignment.js:
+        (runRangeTests):
+        * editing/execCommand/script-tests/toggle-compound-styles.js:
+        * editing/selection/5195166-1.html:
+        * editing/selection/5354455-1.html:
+        * editing/selection/caret-mode-paragraph-keys-navigation.html:
+        * editing/selection/collapse-selection-in-bidi.html:
+        * editing/selection/context-menu-text-selection.html:
+        * editing/selection/directionality-after-undo-replace.html:
+        * editing/selection/extend-after-mouse-selection.html:
+        * editing/selection/extend-selection-after-double-click.html:
+        * editing/selection/move-by-word-visually-crash-test-1.html:
+        * editing/selection/move-by-word-visually-crash-test-2.html:
+        * editing/selection/move-by-word-visually-crash-test-3.html:
+        * editing/selection/move-by-word-visually-crash-test-4.html:
+        * editing/selection/move-by-word-visually-crash-test-5.html:
+        * editing/selection/move-by-word-visually-crash-test-css-generated-content.html:
+        * editing/selection/move-by-word-visually-crash-test-textarea.html:
+        * editing/selection/move-by-word-visually-inline-block-positioned-element.html:
+        * editing/selection/move-by-word-visually-mac.html:
+        * editing/selection/move-by-word-visually-multi-line.html:
+        * editing/selection/move-by-word-visually-multi-space.html:
+        * editing/selection/move-by-word-visually-null-box.html:
+        * editing/selection/move-by-word-visually-single-space-inline-element.html:
+        * editing/selection/move-by-word-visually-single-space-one-element.html:
+        * editing/selection/move-by-word-visually-textarea.html:
+        * editing/selection/move-by-word-visually-wrong-left-right.html:
+        * editing/selection/programmatic-selection-on-mac-is-directionless.html:
+        * editing/selection/rtl-move-selection-right-left.html:
+        * editing/selection/script-tests/click-in-margins-inside-editable-div.js:
+        * editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
+        * editing/selection/script-tests/shift-click.js:
+        (runShiftClickTest):
+        * editing/selection/selection-extend-should-not-move-across-caret-on-mac.html:
+        * editing/style/iframe-onload-crash-mac.html:
+        * editing/style/iframe-onload-crash-unix.html:
+        * editing/style/iframe-onload-crash-win.html:
+        * fast/events/backspace-navigates-back.html:
+        * fast/forms/selection-direction.html:
+
 2012-05-21  Levi Weintraub  <leviw@chromium.org>
 
         Unreviewed gardening. Updating more tests post r117815.

diff --git a/LayoutTests/editing/deleting/delete-ligature-003.html b/LayoutTests/editing/deleting/delete-ligature-003.html
index fc33885..9fcd16c 100644 (file)
--- a/LayoutTests/editing/deleting/delete-ligature-003.html
+++ b/LayoutTests/editing/deleting/delete-ligature-003.html
@@ -15,7 +15,7 @@
         function runTestOn(platform) {
             var testarea = document.getElementById("test");
             if (window.internals)
-                window.internals.settings.setEditingBehavior(platform);
+                internals.settings.setEditingBehavior(platform);
 
             testarea.focus();
             moveSelectionForwardByCharacterCommand();

diff --git a/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html b/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html
index 58bb43b..e277731 100644 (file)
--- a/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html
+++ b/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html
@@ -12,7 +12,7 @@ function runTestsOn(platform) {
     var e = document.getElementById("test");
     
     if (window.internals)
-        window.internals.settings.setEditingBehavior(platform);
+        internals.settings.setEditingBehavior(platform);
 
     sel.setPosition(e, 0);
     sel.modify("extend", "forward", "character");

diff --git a/LayoutTests/editing/deleting/whitespace-pre-1.html b/LayoutTests/editing/deleting/whitespace-pre-1.html
index d325287..2040fa6 100644 (file)
--- a/LayoutTests/editing/deleting/whitespace-pre-1.html
+++ b/LayoutTests/editing/deleting/whitespace-pre-1.html
@@ -11,7 +11,7 @@ function runTestsOn(platform) {
     var s = window.getSelection();
 
     if (window.internals)
-        window.internals.settings.setEditingBehavior(platform);
+        internals.settings.setEditingBehavior(platform);
 
     s.setPosition(e, 0);
     s.modify("extend", "forward", "lineBoundary");

diff --git a/LayoutTests/editing/execCommand/script-tests/query-command-state.js b/LayoutTests/editing/execCommand/script-tests/query-command-state.js
index 749d834..659b1f1 100644 (file)
--- a/LayoutTests/editing/execCommand/script-tests/query-command-state.js
+++ b/LayoutTests/editing/execCommand/script-tests/query-command-state.js
@@ -43,7 +43,7 @@ function selectFirstTwoWords(container) {
 
 function runTests(editingBehavior) {
     if (window.internals)
-        window.internals.settings.setEditingBehavior(editingBehavior);
+        internals.settings.setEditingBehavior(editingBehavior);
     debug('Tests for ' + editingBehavior)
 
     testQueryCommandState("bold", 'hello', selectAll, {'mac': false, 'win': false}[editingBehavior]);

diff --git a/LayoutTests/editing/execCommand/script-tests/query-text-alignment.js b/LayoutTests/editing/execCommand/script-tests/query-text-alignment.js
index 97dea0f..78b0109 100644 (file)
--- a/LayoutTests/editing/execCommand/script-tests/query-text-alignment.js
+++ b/LayoutTests/editing/execCommand/script-tests/query-text-alignment.js
@@ -83,7 +83,7 @@ queryTextAlignment(selectFirstPosition, '<div align="right">hello</div>', 'right
 function runRangeTests(editingBehavior)
 {
     if (window.internals)
-        window.internals.settings.setEditingBehavior(editingBehavior);
+        internals.settings.setEditingBehavior(editingBehavior);
     debug('Tests for ' + editingBehavior);
 
     queryTextAlignment(selectMiddleOfHelloWorld, '<p>hello</p><p>world</p>', '');

diff --git a/LayoutTests/editing/execCommand/script-tests/toggle-compound-styles.js b/LayoutTests/editing/execCommand/script-tests/toggle-compound-styles.js
index 93b40d9..955d7a9 100644 (file)
--- a/LayoutTests/editing/execCommand/script-tests/toggle-compound-styles.js
+++ b/LayoutTests/editing/execCommand/script-tests/toggle-compound-styles.js
@@ -23,7 +23,7 @@ for (var i = 0; i < platforms.length; i++) {
     debug('Platform: ' + platform);
 
     if (window.internals)
-        window.internals.settings.setEditingBehavior(platform);
+        internals.settings.setEditingBehavior(platform);
 
     if (platform == 'win' || platform == 'unix')
         platform = 'nonmac';

diff --git a/LayoutTests/editing/selection/5195166-1.html b/LayoutTests/editing/selection/5195166-1.html
index 48fe59f..0d743fb 100644 (file)
--- a/LayoutTests/editing/selection/5195166-1.html
+++ b/LayoutTests/editing/selection/5195166-1.html
@@ -13,7 +13,7 @@ function log(str)
 
 function runTest(platform, expectedText)
 {
-    window.internals.settings.setEditingBehavior(platform);
+    internals.settings.setEditingBehavior(platform);
     
     var target = document.getElementById('select');
     var startX = target.offsetLeft + target.offsetWidth;

diff --git a/LayoutTests/editing/selection/5354455-1.html b/LayoutTests/editing/selection/5354455-1.html
index 99cbb0e..1ab4d5b 100644 (file)
--- a/LayoutTests/editing/selection/5354455-1.html
+++ b/LayoutTests/editing/selection/5354455-1.html
@@ -10,7 +10,7 @@
 <script>
 function test(platform, result) {
     window.getSelection().removeAllRanges();
-    window.internals.settings.setEditingBehavior(platform);
+    internals.settings.setEditingBehavior(platform);
     
     paragraph = document.getElementById("text");
     x = paragraph.offsetParent.offsetLeft + paragraph.offsetLeft + paragraph.offsetWidth + 10;

diff --git a/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html b/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html
index ff0905c..34e150b 100644 (file)
--- a/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html
+++ b/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html
@@ -13,7 +13,7 @@ description("This tests that keys navigation through a paragraph work as expecte
 if (window.layoutTestController && window.internals) {
   layoutTestController.overridePreference("WebKitEnableCaretBrowsing", true);
   layoutTestController.dumpAsText();
-  window.internals.settings.setEditingBehavior('mac');
+  internals.settings.setEditingBehavior('mac');
 
   var target = document.getElementById("target");
   target.focus();

diff --git a/LayoutTests/editing/selection/collapse-selection-in-bidi.html b/LayoutTests/editing/selection/collapse-selection-in-bidi.html
index 8efe9eb..e66fcaa 100644 (file)
--- a/LayoutTests/editing/selection/collapse-selection-in-bidi.html
+++ b/LayoutTests/editing/selection/collapse-selection-in-bidi.html
@@ -14,7 +14,7 @@ The selection should collapse to the left if you pressed the left arrow key and
 <script>
 
 if (window.internals) {
-    window.internals.settings.setEditingBehavior('mac');
+    internals.settings.setEditingBehavior('mac');
 
     function selectTarget(target) {
         eventSender.mouseMoveTo(target.offsetLeft + target.offsetWidth * 2 / 5, target.offsetTop + 5);

diff --git a/LayoutTests/editing/selection/context-menu-text-selection.html b/LayoutTests/editing/selection/context-menu-text-selection.html
index 89fcb0a..2013ac9 100644 (file)
--- a/LayoutTests/editing/selection/context-menu-text-selection.html
+++ b/LayoutTests/editing/selection/context-menu-text-selection.html
@@ -11,7 +11,7 @@ function test(platform, selectionExpected, result)
     // clear selection
     window.getSelection().removeAllRanges();
 
-    window.internals.settings.setEditingBehavior(platform);
+    internals.settings.setEditingBehavior(platform);
 
     var text = document.getElementById("text");
 

diff --git a/LayoutTests/editing/selection/directionality-after-undo-replace.html b/LayoutTests/editing/selection/directionality-after-undo-replace.html
index f026936..258774b 100644 (file)
--- a/LayoutTests/editing/selection/directionality-after-undo-replace.html
+++ b/LayoutTests/editing/selection/directionality-after-undo-replace.html
@@ -18,7 +18,7 @@ if (window.layoutTestController && window.internals) {
     if (!window.eventSender)
         document.writeln('FAIL - this test requires eventSender');
     else {
-        window.internals.settings.setEditingBehavior('mac');
+        internals.settings.setEditingBehavior('mac');
 
         var test = document.getElementById('target');
         eventSender.mouseMoveTo(target.offsetLeft + target.offsetWidth / 2, target.offsetTop + target.offsetHeight / 2);

diff --git a/LayoutTests/editing/selection/extend-after-mouse-selection.html b/LayoutTests/editing/selection/extend-after-mouse-selection.html
index 2e66320..92e421a 100644 (file)
--- a/LayoutTests/editing/selection/extend-after-mouse-selection.html
+++ b/LayoutTests/editing/selection/extend-after-mouse-selection.html
@@ -16,7 +16,7 @@
 function editingTest(editingBehavior) {
 
     if (window.internals)
-        window.internals.settings.setEditingBehavior(editingBehavior);
+        internals.settings.setEditingBehavior(editingBehavior);
 
     var startTarget = document.getElementById('start');
     var endTarget = document.getElementById('end');

diff --git a/LayoutTests/editing/selection/extend-selection-after-double-click.html b/LayoutTests/editing/selection/extend-selection-after-double-click.html
index ba923c9..fa18fc9 100644 (file)
--- a/LayoutTests/editing/selection/extend-selection-after-double-click.html
+++ b/LayoutTests/editing/selection/extend-selection-after-double-click.html
@@ -36,7 +36,7 @@
 
     function runTest(behavior, expectedText)
     {
-        window.internals.settings.setEditingBehavior(behavior);
+        internals.settings.setEditingBehavior(behavior);
         doubleClickWord();
         getSelection().modify("extend", "backward", "character");
         getSelection().modify("extend", "backward", "character");

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html
index 6c78dab..583d0d9 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-1.html
@@ -12,7 +12,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <textarea></textarea>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html
index 67ddd8e..23056c7 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-2.html
@@ -12,7 +12,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <vkern></vkern><marquee><div title="0|0" class="test_move_by_word">abc def

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html
index bae03dc..e77889c 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-3.html
@@ -12,7 +12,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <video></video><meter><image class="test_move_by_word" title="0|0">

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html
index b069569..ac5f482 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-4.html
@@ -12,7 +12,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 ><div title="0|0" class="test_move_by_word" dir=ltr><keygen><base>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-5.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-5.html
index 51ce845..c9ce2ff 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-5.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-5.html
@@ -11,7 +11,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-css-generated-content.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-css-generated-content.html
index ca54b87..4239ca0 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-css-generated-content.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-css-generated-content.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <div contenteditable dir=ltr>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html b/LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html
index 5e3a424..8635e85 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-crash-test-textarea.html
@@ -18,7 +18,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 

diff --git a/LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html b/LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html
index cf19b53..07d8d6e 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-inline-block-positioned-element.html
@@ -12,7 +12,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 

diff --git a/LayoutTests/editing/selection/move-by-word-visually-mac.html b/LayoutTests/editing/selection/move-by-word-visually-mac.html
index 59ce68e..24bb2a2 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-mac.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-mac.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('mac');
+    internals.settings.setEditingBehavior('mac');
 }
 </script>
 </head>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-multi-line.html b/LayoutTests/editing/selection/move-by-word-visually-multi-line.html
index 7191dcc..d1be03a 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-multi-line.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-multi-line.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 </head>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-multi-space.html b/LayoutTests/editing/selection/move-by-word-visually-multi-space.html
index 20668ba..95a9538 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-multi-space.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-multi-space.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 </head>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-null-box.html b/LayoutTests/editing/selection/move-by-word-visually-null-box.html
index b83caa9..30bbfbf 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-null-box.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-null-box.html
@@ -18,7 +18,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <div id="console"></div>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html b/LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html
index 250e0d6..d52f588 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-single-space-inline-element.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 </head>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html b/LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html
index 350d908..563bede 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-single-space-one-element.html
@@ -19,7 +19,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 </head>

diff --git a/LayoutTests/editing/selection/move-by-word-visually-textarea.html b/LayoutTests/editing/selection/move-by-word-visually-textarea.html
index 78166c6..d6b42e2 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-textarea.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-textarea.html
@@ -36,7 +36,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 

diff --git a/LayoutTests/editing/selection/move-by-word-visually-wrong-left-right.html b/LayoutTests/editing/selection/move-by-word-visually-wrong-left-right.html
index fda7cea..cb17552 100644 (file)
--- a/LayoutTests/editing/selection/move-by-word-visually-wrong-left-right.html
+++ b/LayoutTests/editing/selection/move-by-word-visually-wrong-left-right.html
@@ -22,7 +22,7 @@ onload = function() {
 
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 </script>
 <title>wrong result because VisiblePosition.left()/right() returns wrong result</title>

diff --git a/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless.html b/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless.html
index adb877a..c5a5a7c 100644 (file)
--- a/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless.html
+++ b/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless.html
@@ -122,7 +122,7 @@ function runTestsOn(platform, node) {
 
 function runTestsFor(platform) {
     debug(platform + ':');
-    window.internals.settings.setEditingBehavior(platform);
+    internals.settings.setEditingBehavior(platform);
     var listOfTestNodes = document.getElementById('test').childNodes;
 
     for (var i = 0; i < listOfTestNodes.length; i++) {

diff --git a/LayoutTests/editing/selection/rtl-move-selection-right-left.html b/LayoutTests/editing/selection/rtl-move-selection-right-left.html
index 2889e9c..0e6c670 100644 (file)
--- a/LayoutTests/editing/selection/rtl-move-selection-right-left.html
+++ b/LayoutTests/editing/selection/rtl-move-selection-right-left.html
@@ -70,13 +70,13 @@ function runTests()
     testSelectionChange(setSelection, "move", "left", 3, 0, "Move selection left");
     if (window.layoutTestController && window.internals) {
         layoutTestController.dumpAsText();
-        window.internals.settings.setEditingBehavior("mac");
+        internals.settings.setEditingBehavior("mac");
         testSelectionChange(dragSelection, "extend", "right", 0, 0, "Extend dragged selection right (Mac)");
         testSelectionChange(dragSelection, "extend", "left", 0, 0, "Extend dragged selection left (Mac)");
-        window.internals.settings.setEditingBehavior("win");
+        internals.settings.setEditingBehavior("win");
         testSelectionChange(dragSelection, "extend", "right", 0, 0, "Extend dragged selection right (Win)");
         testSelectionChange(dragSelection, "extend", "left", 1, 0, "Extend dragged selection left (Win)");
-        window.internals.settings.setEditingBehavior("unix");
+        internals.settings.setEditingBehavior("unix");
         testSelectionChange(dragSelection, "extend", "right", 0, 0, "Extend dragged selection right (Unix)");
         testSelectionChange(dragSelection, "extend", "left", 1, 0, "Extend dragged selection left (Unix)");
     }

diff --git a/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js b/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
index 3dc9ffa..e9beabb 100644 (file)
--- a/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
+++ b/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
@@ -69,7 +69,7 @@ function runInteractiveTests()
 function editingTest(editingBehavior)
 {
     if (window.internals)
-        window.internals.settings.setEditingBehavior(editingBehavior);
+        internals.settings.setEditingBehavior(editingBehavior);
 
     var expectMacStyleSelection = editingBehavior == "mac";
 

diff --git a/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js b/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
index 3699a24..4a8cf38 100644 (file)
--- a/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
+++ b/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
@@ -50,7 +50,7 @@ function runInteractiveTests()
 function editingTest(editingBehavior)
 {
     if (window.internals)
-        window.internals.settings.setEditingBehavior(editingBehavior);
+        internals.settings.setEditingBehavior(editingBehavior);
     
     var expectMacStyleSelection = editingBehavior == "mac";
 

diff --git a/LayoutTests/editing/selection/script-tests/shift-click.js b/LayoutTests/editing/selection/script-tests/shift-click.js
index b482d12..af1ea17 100644 (file)
--- a/LayoutTests/editing/selection/script-tests/shift-click.js
+++ b/LayoutTests/editing/selection/script-tests/shift-click.js
@@ -44,7 +44,7 @@ function assertSelectionOrder(direction)
 
 function runShiftClickTest(editingBehavior)
 {
-    window.internals.settings.setEditingBehavior(editingBehavior);
+    internals.settings.setEditingBehavior(editingBehavior);
 
     // Double-click select to get around eventSender bug where it won't select
     // text just using single-click.

diff --git a/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html b/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html
index 5f1dbf9..21598c1 100644 (file)
--- a/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html
+++ b/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html
@@ -17,7 +17,7 @@ of the word (which is windows/unix behavior).
 function editingTest(behavior) {
     if (window.layoutTestController && window.internals) {
         layoutTestController.dumpAsText();
-        window.internals.settings.setEditingBehavior(behavior);
+        internals.settings.setEditingBehavior(behavior);
     }
 
     function getSetCaretFunction(node, container, offset) {

diff --git a/LayoutTests/editing/style/iframe-onload-crash-mac.html b/LayoutTests/editing/style/iframe-onload-crash-mac.html
index 6ebe259..c93a6cc 100644 (file)
--- a/LayoutTests/editing/style/iframe-onload-crash-mac.html
+++ b/LayoutTests/editing/style/iframe-onload-crash-mac.html
@@ -1,7 +1,7 @@
 <meta><input><h6><nobr></nobr><datagrid><ins><button><em><iframe onload="
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('mac');
+    internals.settings.setEditingBehavior('mac');
 }
 
 if (document.counter)

diff --git a/LayoutTests/editing/style/iframe-onload-crash-unix.html b/LayoutTests/editing/style/iframe-onload-crash-unix.html
index bfa6f01..4a04f86 100644 (file)
--- a/LayoutTests/editing/style/iframe-onload-crash-unix.html
+++ b/LayoutTests/editing/style/iframe-onload-crash-unix.html
@@ -1,7 +1,7 @@
 <meta><input><h6><nobr></nobr><datagrid><ins><button><em><iframe onload="
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('unix');
+    internals.settings.setEditingBehavior('unix');
 }
 
 if (document.counter)

diff --git a/LayoutTests/editing/style/iframe-onload-crash-win.html b/LayoutTests/editing/style/iframe-onload-crash-win.html
index 3d304eb..2a7e068 100644 (file)
--- a/LayoutTests/editing/style/iframe-onload-crash-win.html
+++ b/LayoutTests/editing/style/iframe-onload-crash-win.html
@@ -1,7 +1,7 @@
 <meta><input><h6><nobr></nobr><datagrid><ins><button><em><iframe onload="
 if (window.layoutTestController && window.internals) {
     layoutTestController.dumpAsText();
-    window.internals.settings.setEditingBehavior('win');
+    internals.settings.setEditingBehavior('win');
 }
 
 if (document.counter)

diff --git a/LayoutTests/fast/events/backspace-navigates-back.html b/LayoutTests/fast/events/backspace-navigates-back.html
index e659cd1..14fcbfc 100644 (file)
--- a/LayoutTests/fast/events/backspace-navigates-back.html
+++ b/LayoutTests/fast/events/backspace-navigates-back.html
@@ -37,7 +37,7 @@ function doStep(step, location) {
         if (!expect(location == 'test-mac', 'navigation to test-mac'))
             return;
 
-        window.internals.settings.setEditingBehavior('mac');
+        internals.settings.setEditingBehavior('mac');
         testBackspaceNavigatesBack();
 
         break;
@@ -50,7 +50,7 @@ function doStep(step, location) {
         if (!expect(location == 'test-win', 'navigation to test-win'))
             return;
 
-        window.internals.settings.setEditingBehavior('win');
+        internals.settings.setEditingBehavior('win');
         testBackspaceNavigatesBack();
 
         break;
@@ -64,7 +64,7 @@ function doStep(step, location) {
             return;
 
         // Test unix behavior: that backspace does not go back.
-        window.internals.settings.setEditingBehavior('unix');
+        internals.settings.setEditingBehavior('unix');
 
         // We expect backspace to *not* navigate.
         // Start a navigation to the success page; if backspace causes us to go back,

diff --git a/LayoutTests/fast/forms/selection-direction.html b/LayoutTests/fast/forms/selection-direction.html
index eef19b4..b8bed2a 100644 (file)
--- a/LayoutTests/fast/forms/selection-direction.html
+++ b/LayoutTests/fast/forms/selection-direction.html
@@ -81,7 +81,7 @@ function runTest(element, platform) {
 \r
 function runTestFor(platform) {\r
     if (window.internals)\r
-        window.internals.settings.setEditingBehavior(platform.toLowerCase());\r
+        internals.settings.setEditingBehavior(platform.toLowerCase());\r
     var tests = document.getElementById('tests');\r
     for (var i = 0; i < tests.childNodes.length; i++) {\r
         runTest(tests.childNodes[i], platform);\r