Move scalePageBy from eventSender to window.internals

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

Reviewed by Simon Fraser.

.:

* Source/autotools/symbols.filter:

Source/WebCore:

Added setPageScaleFactor to window.internals.
Renamed window.internals.getPageScaleFactor to window.internals.pageScaleFactor
to match the webkit style.

* testing/Internals.cpp:
(WebCore::Internals::pageScaleFactor):
(WebCore::Internals::setPageScaleFactor):
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit2:

* win/WebKit2.def:
* win/WebKit2CFLite.def:

LayoutTests:

Updated layout tests to use window.internals.setPageScaleFactor.

* compositing/geometry/fixed-position-composited-page-scale-down.html:
* compositing/geometry/fixed-position-composited-page-scale.html:
* compositing/geometry/fixed-position-iframe-composited-page-scale-down.html:
* compositing/geometry/fixed-position-iframe-composited-page-scale.html:
* compositing/geometry/fixed-position-transform-composited-page-scale-down.html:
* compositing/geometry/fixed-position-transform-composited-page-scale.html:
* compositing/scaling/tiled-layer-recursion.html:
* fast/dom/Element/scale-page-bounding-client-rect.html:
* fast/dom/Element/scale-page-client-rects.html:
* fast/dom/Range/scale-page-bounding-client-rect.html:
* fast/dom/Range/scale-page-client-rects.html:
* fast/events/scale-and-scroll-body.html:
* fast/events/scale-and-scroll-iframe-body.html:
* fast/events/scale-and-scroll-iframe-window.html:
* fast/events/scale-and-scroll-window.html:
* fast/events/script-tests/page-scaled-mouse-click-iframe.js:
(iframeLoaded):
* fast/events/script-tests/page-scaled-mouse-click.js:
* fast/events/scroll-in-scaled-page-with-overflow-hidden.html:
* fast/events/touch/page-scaled-touch-gesture-click.html:
* fast/frames/frame-set-rotation-hit.html:
* fast/frames/frame-set-scaling-hit.html:
* fast/frames/iframe-double-scale-contents.html:
* fast/repaint/background-scaling.html:
* fast/repaint/scale-page-shrink.html:
* fast/transforms/selection-bounds-in-transformed-view.html:


git-svn-id: svn://svn.chromium.org/blink/trunk@104174 bbb929c8-8fbe-4397-9dbb-9b2b20218538

26 files changed, 102 insertions, 66 deletions

diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog
index ac65e7c..f46bf60 100644
--- a/third_party/WebKit/LayoutTests/ChangeLog
+++ b/third_party/WebKit/LayoutTests/ChangeLog
@@ -1,3 +1,39 @@
+2012-01-05  Fady Samuel  <fsamuel@chromium.org>
+
+        Move scalePageBy from eventSender to window.internals
+        https://bugs.webkit.org/show_bug.cgi?id=64512
+
+        Reviewed by Simon Fraser.
+
+        Updated layout tests to use window.internals.setPageScaleFactor.
+
+        * compositing/geometry/fixed-position-composited-page-scale-down.html:
+        * compositing/geometry/fixed-position-composited-page-scale.html:
+        * compositing/geometry/fixed-position-iframe-composited-page-scale-down.html:
+        * compositing/geometry/fixed-position-iframe-composited-page-scale.html:
+        * compositing/geometry/fixed-position-transform-composited-page-scale-down.html:
+        * compositing/geometry/fixed-position-transform-composited-page-scale.html:
+        * compositing/scaling/tiled-layer-recursion.html:
+        * fast/dom/Element/scale-page-bounding-client-rect.html:
+        * fast/dom/Element/scale-page-client-rects.html:
+        * fast/dom/Range/scale-page-bounding-client-rect.html:
+        * fast/dom/Range/scale-page-client-rects.html:
+        * fast/events/scale-and-scroll-body.html:
+        * fast/events/scale-and-scroll-iframe-body.html:
+        * fast/events/scale-and-scroll-iframe-window.html:
+        * fast/events/scale-and-scroll-window.html:
+        * fast/events/script-tests/page-scaled-mouse-click-iframe.js:
+        (iframeLoaded):
+        * fast/events/script-tests/page-scaled-mouse-click.js:
+        * fast/events/scroll-in-scaled-page-with-overflow-hidden.html:
+        * fast/events/touch/page-scaled-touch-gesture-click.html:
+        * fast/frames/frame-set-rotation-hit.html:
+        * fast/frames/frame-set-scaling-hit.html:
+        * fast/frames/iframe-double-scale-contents.html:
+        * fast/repaint/background-scaling.html:
+        * fast/repaint/scale-page-shrink.html:
+        * fast/transforms/selection-bounds-in-transformed-view.html:
+
 2012-01-05  Dmitry Lomov  <dslomov@google.com>
 
         Unreviewed: Chromium expectations update.
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
index f88666ca..3771f5e 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
@@ -18,12 +18,12 @@
 </style>
 <script>
   function scale() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(0.5, 0, 0);
+      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
   }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
index a755dda..0c58541 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
@@ -18,12 +18,12 @@
 </style>
 <script>
   function scale() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(2, 0, 0);
+      window.internals.setPageScaleFactor(document, 2, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
   }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
index adf69e6..3c725da 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
@@ -18,12 +18,12 @@
 </style>
 <script>
   function test() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(0.5, 0, 0);
+      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
 
     var d = document.getElementById('frame').contentDocument.open();
     d.write("<div style='position:fixed; z-index: 1; left; 10px;'>TEST</div>");
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
index 085f61e..16ab075 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
@@ -18,12 +18,12 @@
 </style>
 <script>
   function test() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(2, 0, 0);
+      window.internals.setPageScaleFactor(document, 2, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
 
     var d = document.getElementById('frame').contentDocument.open();
     d.write("<div style='position:fixed; z-index: 1; left; 10px;'>TEST</div>");
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
index be9d9cc..45ce035 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
@@ -20,12 +20,12 @@
 </style>
 <script>
   function scale() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(0.5, 0, 0);
+      window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
   }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
index f7fb3df..df8667b 100644
--- a/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
+++ b/third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
@@ -20,12 +20,12 @@
 </style>
 <script>
   function scale() {
-    if (window.internals)
+    if (window.internals) {
       window.internals.setEnableCompositingForFixedPosition(document, true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      eventSender.scalePageBy(2, 0, 0);
+      window.internals.setPageScaleFactor(document, 2, 0, 0);
     }
+    if (window.layoutTestController)
+      layoutTestController.dumpAsText(true);
   }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/compositing/scaling/tiled-layer-recursion.html b/third_party/WebKit/LayoutTests/compositing/scaling/tiled-layer-recursion.html
index f8b189f..399d0e0 100644
--- a/third_party/WebKit/LayoutTests/compositing/scaling/tiled-layer-recursion.html
+++ b/third_party/WebKit/LayoutTests/compositing/scaling/tiled-layer-recursion.html
@@ -16,7 +16,8 @@
 
     function scalePage()
     {
-      eventSender.scalePageBy(1.50025, 0, 0);
+      if (window.internals)
+        window.internals.setPageScaleFactor(document, 1.50025, 0, 0);
     }
   
     window.addEventListener('load', scalePage, false);
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html b/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
index e4966d3..602289b 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-bounding-client-rect.html
@@ -3,13 +3,13 @@
 <script>
 function testRects()
 {
-    if (!window.layoutTestController)
+    if (!window.layoutTestController || !window.internals)
         return;
     layoutTestController.dumpAsText();
     
     var div = document.getElementById("div");
     var rect = div.getBoundingClientRect();
-    eventSender.scalePageBy(2,0,0);
+    window.internals.setPageScaleFactor(document, 2, 0, 0);
     var scaledRect = div.getBoundingClientRect();
 
     var result = document.getElementById("result");
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-client-rects.html b/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-client-rects.html
index 74d028a..8fa2a31 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-client-rects.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Element/scale-page-client-rects.html
@@ -3,13 +3,13 @@
 <script>
 function testRects()
 {
-    if (!window.layoutTestController)
+    if (!window.layoutTestController || !window.internals)
         return;
     layoutTestController.dumpAsText();
     
     var div = document.getElementById("div");
     var rectList = div.getClientRects();
-    eventSender.scalePageBy(2,0,0);
+    window.internals.setPageScaleFactor(document, 2, 0, 0);
     var scaledRectList = div.getClientRects();
 
     var result = document.getElementById("result");
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html b/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
index 9a3e210..f12c0fd 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-bounding-client-rect.html
@@ -3,7 +3,7 @@
 <script>
 function testRects()
 {
-    if (!window.layoutTestController)
+    if (!window.layoutTestController || !window.internals)
         return;
     layoutTestController.dumpAsText();
 
@@ -11,7 +11,7 @@ function testRects()
     range.selectNodeContents(document.getElementById('div'));
     var rect = range.getBoundingClientRect();
    
-    eventSender.scalePageBy(2,0,0);
+    window.internals.setPageScaleFactor(document, 2, 0, 0);
     var scaledRange = document.createRange();
     scaledRange.selectNodeContents(document.getElementById('div'));
     var scaledRect = scaledRange.getBoundingClientRect();
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-client-rects.html b/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-client-rects.html
index 5cf2bd3..3ef3679 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-client-rects.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/Range/scale-page-client-rects.html
@@ -3,7 +3,7 @@
 <script>
 function testRects()
 {
-    if (!window.layoutTestController)
+    if (!window.layoutTestController ||  !window.internals)
         return;
     layoutTestController.dumpAsText();
 
@@ -12,7 +12,7 @@ function testRects()
     var rectList = range.getClientRects();
     var rect = rectList[0];
    
-    eventSender.scalePageBy(2,0,0);
+    window.internals.setPageScaleFactor(document, 2, 0, 0);
     var scaledRange = document.createRange();
     scaledRange.selectNodeContents(document.getElementById('div'));
     var scaledRectList = scaledRange.getClientRects();
diff --git a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-body.html b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-body.html
index 7a87ef4..a570d79 100644
--- a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-body.html
+++ b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-body.html
@@ -10,7 +10,7 @@
       window.enablePixelTesting = true;
 
       function scroll() {
-          // The page scale, as set by EventSender.scalePageBy should not be apparent
+          // The page scale, as set by window.internals.setPageScaleFactor should not be apparent
           // to javascript. So, we expect scrolling to (100,100) to be page coordinates, rather
           // than device pixels.
           document.body.scrollLeft = 100;
@@ -25,8 +25,8 @@
       function scaleWithEventSender() {
           var scaleFactor = 2.0;
           var scaleOffset = 0;
-          if (window.eventSender) {
-             eventSender.scalePageBy(scaleFactor, scaleOffset, scaleOffset);
+          if (window.internals) {
+             window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
           }
       }
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-body.html b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
index 0a518c7..8195b99 100644
--- a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
+++ b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-body.html
@@ -24,8 +24,8 @@
         function scaleWithEventSender() {
             var scaleFactor = 0.5;
             var scaleOffset = 0;
-            if (window.eventSender) {
-                 eventSender.scalePageBy(scaleFactor, scaleOffset, scaleOffset);
+            if (window.internals) {
+                 window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
             }
         }
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-window.html b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
index 41ceac7..7793581 100644
--- a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
+++ b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-iframe-window.html
@@ -23,8 +23,8 @@
         function scaleWithEventSender() {
             var scaleFactor = 0.5;
             var scaleOffset = 0;
-            if (window.eventSender) {
-                 eventSender.scalePageBy(scaleFactor, scaleOffset, scaleOffset);
+            if (window.internals) {
+                 window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
             }
         }
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-window.html b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-window.html
index c555115..5c35e65 100644
--- a/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-window.html
+++ b/third_party/WebKit/LayoutTests/fast/events/scale-and-scroll-window.html
@@ -10,7 +10,7 @@
       window.enablePixelTesting = true;
 
       function scroll() {
-          // The page scale, as set by EventSender.scalePageBy should not be apparent
+          // The page scale, as set by window.internals.setPageScaleFactor should not be apparent
           // to javascript. So, we expect scrolling to (100,100) to be page coordinates, rather
           // than device pixels.
           window.scrollTo(100,100);
@@ -24,8 +24,8 @@
       function scaleWithEventSender() {
           var scaleFactor = 2.0;
           var scaleOffset = 0;
-          if (window.eventSender) {
-             eventSender.scalePageBy(scaleFactor, scaleOffset, scaleOffset);
+          if (window.internals) {
+             window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
           }
       }
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js b/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
index bd963e8..397f8de 100644
--- a/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
+++ b/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click-iframe.js
@@ -52,7 +52,7 @@ function iframeLoaded() {
   div.addEventListener("click", appendEventLog, false);
   iframe.contentWindow.document.body.insertBefore(div, iframe.contentWindow.document.body.firstChild);
 
-  if (window.eventSender) {
+  if (window.eventSender && window.internals) {
     eventSender.mouseMoveTo(10, 10);
     // We are clicking in the same position on screen. As we scale or transform the page,
     // we expect the pageX and pageY event coordinates to change because different
@@ -60,15 +60,15 @@ function iframeLoaded() {
 
     testEvents(0, "Unscaled", "click(10, 10)");
 
-    eventSender.scalePageBy(0.5, 0, 0);
+    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     testEvents(0, "setPageScale(0.5)", "click(20, 20)");
 
-    eventSender.scalePageBy(1.0, 0, 0);
+    window.internals.setPageScaleFactor(document, 1.0, 0, 0);
     html.style["-webkit-transform"] = "scale(0.5, 2.0)";
     html.style["-webkit-transform-origin"] = "0 0";
     testEvents(0, "CSS scale(0.5, 2.0)", "click(20, 5)");
 
-    eventSender.scalePageBy(0.5, 0, 0);
+    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     testEvents(0, "setPageScale(0.5), CSS scale(0.5, 2.0)", "click(40, 10)");
   }
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js b/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
index 9787f95..44e683c 100644
--- a/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
+++ b/third_party/WebKit/LayoutTests/fast/events/script-tests/page-scaled-mouse-click.js
@@ -43,13 +43,13 @@ function testEvents(button, description, expectedString) {
     clearEventLog();
 }
 
-if (window.eventSender) {
+if (window.eventSender && window.internals) {
     eventSender.mouseMoveTo(10, 10);
     // We are clicking in the same position on screen. As we scale or transform the page,
     // we expect the pageX and pageY event coordinates to change because different
     // parts of the document are under the mouse.
     testEvents(0, "Unscaled", "click(10, 10)");
 
-    eventSender.scalePageBy(0.5, 0, 0);
+    window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     testEvents(0, "setPageScale(0.5)", "click(20, 20)");
 }
diff --git a/third_party/WebKit/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html b/third_party/WebKit/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
index 030ac16..ff6d2c9 100644
--- a/third_party/WebKit/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
+++ b/third_party/WebKit/LayoutTests/fast/events/scroll-in-scaled-page-with-overflow-hidden.html
@@ -22,8 +22,8 @@
         // Force a layout.
         document.body.offsetLeft;
 
-        if (window.eventSender)
-            eventSender.scalePageBy(2, 0, 0);
+        if (window.internals)
+            window.internals.setPageScaleFactor(document, 2, 0, 0);
 
         shouldBe("window.document.body.scrollTop", "0");
 
diff --git a/third_party/WebKit/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html b/third_party/WebKit/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
index 28b98bb..0db955b 100644
--- a/third_party/WebKit/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
+++ b/third_party/WebKit/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html
@@ -83,8 +83,8 @@ function endTest()
 }
 
 function runTest() {
-    if (window.eventSender) {
-        eventSender.scalePageBy(0.5, 0, 0);
+    if (window.internals) {
+        window.internals.setPageScaleFactor(document, 0.5, 0, 0);
     }
 
     var div = document.getElementById('touchtarget');
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-rotation-hit.html b/third_party/WebKit/LayoutTests/fast/frames/frame-set-rotation-hit.html
index b19774d..cc2c214 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-rotation-hit.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-rotation-hit.html
@@ -4,10 +4,10 @@
 
     <script>
         function init() {
-            if (!window.eventSender)
+            if (!window.eventSender || !window.internals)
                 return;
             // Scale the page and resize the frames to verify hit testing on the frameset
-            eventSender.scalePageBy(0.5, 0, 0);
+            window.internals.setPageScaleFactor(document, 0.5, 0, 0);
             var leftPanelWidth = window.innerWidth / 8;
             eventSender.mouseMoveTo(window.innerWidth / 4, leftPanelWidth);
             eventSender.mouseDown();
diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-hit.html b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-hit.html
index 33bceab..b2211b6 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-hit.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-hit.html
@@ -4,11 +4,11 @@
 
     <script>
         function init() {
-            if (!window.eventSender)
+            if (!window.eventSender || !window.internals)
                 return;
             // Scale the page and resize the frames to verify hit testing on the frameset
             var leftPanelWidth = window.innerWidth / 8;
-            eventSender.scalePageBy(0.5, 0, 0);
+            window.internals.setPageScaleFactor(document, 0.5, 0, 0);
             eventSender.mouseMoveTo(leftPanelWidth, window.innerHeight / 4);
             eventSender.mouseDown();
             eventSender.mouseMoveTo(2 * leftPanelWidth, window.innerHeight / 4);
diff --git a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
index 915c0b5..d3af5f69 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
+++ b/third_party/WebKit/LayoutTests/fast/frames/iframe-double-scale-contents.html
@@ -22,8 +22,8 @@
 
       function scalePage(scaleFactor) {
           var scaleOffset = 0;
-          if (window.eventSender) {
-            eventSender.scalePageBy(scaleFactor, scaleOffset, scaleOffset);
+          if (window.internals) {
+            window.internals.setPageScaleFactor(document, scaleFactor, scaleOffset, scaleOffset);
           }
       }
 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html b/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
index ae553a1..e8cff0d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/background-scaling.html
@@ -4,8 +4,8 @@
 <script type="text/javascript"> 
     function repaintTest()
     {
-        if (window.layoutTestController)
-            eventSender.scalePageBy(0.2,0,0);
+        if (window.internals)
+            window.internals.setPageScaleFactor(document, 0.25, 0, 0);
     }
 </script> 
 </head> 
diff --git a/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html b/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
index c1ca576..92f3e3d 100644
--- a/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
+++ b/third_party/WebKit/LayoutTests/fast/repaint/scale-page-shrink.html
@@ -4,8 +4,8 @@
 <script type="text/javascript">
     function repaintTest()
     {
-        if (window.layoutTestController)
-            eventSender.scalePageBy(0.2,0,0);
+        if (window.internals)
+            window.internals.setPageScaleFactor(document, 0.25, 0, 0);
     }
 </script>
 </head>
diff --git a/third_party/WebKit/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html b/third_party/WebKit/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
index a10a4d1..10e26bb 100644
--- a/third_party/WebKit/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
+++ b/third_party/WebKit/LayoutTests/fast/transforms/selection-bounds-in-transformed-view.html
@@ -4,10 +4,9 @@
     <div style="height: 100px;">target</div>
     <div style="height: 1000px;"></div>
     <script>
-        if (window.layoutTestController) {
+        if (window.layoutTestController && window.internals) {
             layoutTestController.dumpAsText();
-
-            eventSender.scalePageBy(2, 0, 0);
+            window.internals.setPageScaleFactor(document, 2, 0, 0);
         }
 
         document.execCommand("FindString", false, "target");