Add js bindings for eventSender.zoomPageIn and eventSender.zoomPageOut.

BUG=10488

Review URL: http://codereview.chromium.org/67282

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14035 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 16 insertions, 3 deletions

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bd21a11..de8c808 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2455,9 +2455,6 @@ BUG10055 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL
 BUG10045 LINUX : LayoutTests/editing/inserting/5418891.html = FAIL
 BUG10045 LINUX : LayoutTests/editing/inserting/5510537.html = FAIL
 
-// New test from webkit merge 42403:42440.
-BUG10488 : LayoutTests/fast/css/zoom-body-scroll.html = FAIL
-
 // Regression from WebKit merge 42403:42440 -- MessageChannel binding no longer
 // gets generated, probably just a matter of enabling ENABLE_CHANNEL_MESSAGING
 // due to http://trac.webkit.org/changeset/42428.
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 5808bd3..0fce5e1 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -162,6 +162,8 @@ EventSendingController::EventSendingController(TestShell* shell)
   BindMethod("clearKillRing", &EventSendingController::clearKillRing);
   BindMethod("textZoomIn", &EventSendingController::textZoomIn);
   BindMethod("textZoomOut", &EventSendingController::textZoomOut);
+  BindMethod("zoomPageIn", &EventSendingController::zoomPageIn);
+  BindMethod("zoomPageOut", &EventSendingController::zoomPageOut);
   BindMethod("scheduleAsynchronousClick",
              &EventSendingController::scheduleAsynchronousClick);
 
@@ -504,6 +506,18 @@ void EventSendingController::textZoomOut(
   result->SetNull();
 }
 
+void EventSendingController::zoomPageIn(
+    const CppArgumentList& args, CppVariant* result) {
+  webview()->ZoomIn(false);
+  result->SetNull();
+}
+
+void EventSendingController::zoomPageOut(
+    const CppArgumentList& args, CppVariant* result) {
+  webview()->ZoomOut(false);
+  result->SetNull();
+}
+
 void EventSendingController::ReplaySavedEvents() {
   replaying_saved_events = true;
   while (!mouse_event_queue.empty()) {
diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h
index 7123692..1571c68 100644
--- a/webkit/tools/test_shell/event_sending_controller.h
+++ b/webkit/tools/test_shell/event_sending_controller.h
@@ -51,6 +51,8 @@ class EventSendingController : public CppBoundClass {
   void dispatchMessage(const CppArgumentList& args, CppVariant* result);
   void textZoomIn(const CppArgumentList& args, CppVariant* result);
   void textZoomOut(const CppArgumentList& args, CppVariant* result);
+  void zoomPageIn(const CppArgumentList& args, CppVariant* result);
+  void zoomPageOut(const CppArgumentList& args, CppVariant* result);
   void scheduleAsynchronousClick(const CppArgumentList& args,
                                  CppVariant* result);