Fix tests to avoid page scale reset when setting page scale.

Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 283 matching lines @@
     bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate);
     bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScrollUpdateWithoutPropagation);
     bindMethod("gestureTap", &EventSender::gestureTap);
     bindMethod("gestureTapDown", &EventSender::gestureTapDown);
     bindMethod("gestureTapCancel", &EventSender::gestureTapCancel);
     bindMethod("gestureLongPress", &EventSender::gestureLongPress);
     bindMethod("gestureLongTap", &EventSender::gestureLongTap);
     bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap);
     bindMethod("zoomPageIn", &EventSender::zoomPageIn);
     bindMethod("zoomPageOut", &EventSender::zoomPageOut);
-    bindMethod("scalePageBy", &EventSender::scalePageBy);
+    bindMethod("setInitialPageScaleOverride", &EventSender::setInitialPageScaleOverride);
+    bindMethod("setPageScaleFactor", &EventSender::setPageScaleFactor);
 
     bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents);
 
     // When set to true (the default value), we batch mouse move and mouse up
     // events so we can simulate drag & drop.
     bindProperty("dragMode", &dragMode);
 #ifdef WIN32
     bindProperty("WM_KEYDOWN", &wmKeyDown);
     bindProperty("WM_KEYUP", &wmKeyUp);
     bindProperty("WM_CHAR", &wmChar);
@@ skipping 455 matching lines @@
     webview()->setZoomLevel(false, webview()->zoomLevel() + 1);
     result->setNull();
 }
 
 void EventSender::zoomPageOut(const CppArgumentList&, CppVariant* result)
 {
     webview()->setZoomLevel(false, webview()->zoomLevel() - 1);
     result->setNull();
 }
 
-void EventSender::scalePageBy(const CppArgumentList& arguments, CppVariant* result)
+void EventSender::setInitialPageScaleOverride(const CppArgumentList& arguments, CppVariant* result)
+{
+    if (arguments.size() != 1 || !arguments[0].isNumber())
+        return;
+
+    float pageScaleOverride = static_cast<float>(arguments[0].toDouble());
+    webview()->setInitialPageScaleOverride(pageScaleOverride);
+    result->setNull();
+}
+
+void EventSender::setPageScaleFactor(const CppArgumentList& arguments, CppVariant* result)
 {
     if (arguments.size() < 3 || !arguments[0].isNumber() || !arguments[1].isNumber() || !arguments[2].isNumber())
         return;
 
     float scaleFactor = static_cast<float>(arguments[0].toDouble());
     int x = arguments[1].toInt32();
     int y = arguments[2].toInt32();
     webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y));
     result->setNull();
 }
@@ skipping 583 matching lines @@
 {
     result->setNull();
 }
 
 void EventSender::clearKillRing(const CppArgumentList&, CppVariant* result)
 {
     result->setNull();
 }
 
 }