Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: Source/testing/runner/EventSender.cpp

Issue 18546003: Fix tests to avoid page scale reset when setting page scale. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use setPageScaleFactorLimits(). Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/testing/runner/EventSender.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate); 294 bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate);
295 bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScr ollUpdateWithoutPropagation); 295 bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScr ollUpdateWithoutPropagation);
296 bindMethod("gestureTap", &EventSender::gestureTap); 296 bindMethod("gestureTap", &EventSender::gestureTap);
297 bindMethod("gestureTapDown", &EventSender::gestureTapDown); 297 bindMethod("gestureTapDown", &EventSender::gestureTapDown);
298 bindMethod("gestureTapCancel", &EventSender::gestureTapCancel); 298 bindMethod("gestureTapCancel", &EventSender::gestureTapCancel);
299 bindMethod("gestureLongPress", &EventSender::gestureLongPress); 299 bindMethod("gestureLongPress", &EventSender::gestureLongPress);
300 bindMethod("gestureLongTap", &EventSender::gestureLongTap); 300 bindMethod("gestureLongTap", &EventSender::gestureLongTap);
301 bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap); 301 bindMethod("gestureTwoFingerTap", &EventSender::gestureTwoFingerTap);
302 bindMethod("zoomPageIn", &EventSender::zoomPageIn); 302 bindMethod("zoomPageIn", &EventSender::zoomPageIn);
303 bindMethod("zoomPageOut", &EventSender::zoomPageOut); 303 bindMethod("zoomPageOut", &EventSender::zoomPageOut);
304 bindMethod("scalePageBy", &EventSender::scalePageBy); 304 bindMethod("setPageScaleFactor", &EventSender::setPageScaleFactor);
305 305
306 bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents); 306 bindProperty("forceLayoutOnEvents", &forceLayoutOnEvents);
307 307
308 // When set to true (the default value), we batch mouse move and mouse up 308 // When set to true (the default value), we batch mouse move and mouse up
309 // events so we can simulate drag & drop. 309 // events so we can simulate drag & drop.
310 bindProperty("dragMode", &dragMode); 310 bindProperty("dragMode", &dragMode);
311 #ifdef WIN32 311 #ifdef WIN32
312 bindProperty("WM_KEYDOWN", &wmKeyDown); 312 bindProperty("WM_KEYDOWN", &wmKeyDown);
313 bindProperty("WM_KEYUP", &wmKeyUp); 313 bindProperty("WM_KEYUP", &wmKeyUp);
314 bindProperty("WM_CHAR", &wmChar); 314 bindProperty("WM_CHAR", &wmChar);
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 webview()->setZoomLevel(false, webview()->zoomLevel() + 1); 770 webview()->setZoomLevel(false, webview()->zoomLevel() + 1);
771 result->setNull(); 771 result->setNull();
772 } 772 }
773 773
774 void EventSender::zoomPageOut(const CppArgumentList&, CppVariant* result) 774 void EventSender::zoomPageOut(const CppArgumentList&, CppVariant* result)
775 { 775 {
776 webview()->setZoomLevel(false, webview()->zoomLevel() - 1); 776 webview()->setZoomLevel(false, webview()->zoomLevel() - 1);
777 result->setNull(); 777 result->setNull();
778 } 778 }
779 779
780 void EventSender::scalePageBy(const CppArgumentList& arguments, CppVariant* resu lt) 780 void EventSender::setPageScaleFactor(const CppArgumentList& arguments, CppVarian t* result)
781 { 781 {
782 if (arguments.size() < 3 || !arguments[0].isNumber() || !arguments[1].isNumb er() || !arguments[2].isNumber()) 782 if (arguments.size() < 3 || !arguments[0].isNumber() || !arguments[1].isNumb er() || !arguments[2].isNumber())
783 return; 783 return;
784 784
785 float scaleFactor = static_cast<float>(arguments[0].toDouble()); 785 float scaleFactor = static_cast<float>(arguments[0].toDouble());
786 int x = arguments[1].toInt32(); 786 int x = arguments[1].toInt32();
787 int y = arguments[2].toInt32(); 787 int y = arguments[2].toInt32();
788 webview()->setPageScaleFactorLimits(scaleFactor, scaleFactor);
788 webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y)); 789 webview()->setPageScaleFactor(scaleFactor, WebPoint(x, y));
789 result->setNull(); 790 result->setNull();
790 } 791 }
791 792
792 void EventSender::mouseScrollBy(const CppArgumentList& arguments, CppVariant* re sult) 793 void EventSender::mouseScrollBy(const CppArgumentList& arguments, CppVariant* re sult)
793 { 794 {
794 handleMouseWheel(arguments, result, false); 795 handleMouseWheel(arguments, result, false);
795 } 796 }
796 797
797 void EventSender::continuousMouseScrollBy(const CppArgumentList& arguments, CppV ariant* result) 798 void EventSender::continuousMouseScrollBy(const CppArgumentList& arguments, CppV ariant* result)
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 { 1375 {
1375 result->setNull(); 1376 result->setNull();
1376 } 1377 }
1377 1378
1378 void EventSender::clearKillRing(const CppArgumentList&, CppVariant* result) 1379 void EventSender::clearKillRing(const CppArgumentList&, CppVariant* result)
1379 { 1380 {
1380 result->setNull(); 1381 result->setNull();
1381 } 1382 }
1382 1383
1383 } 1384 }
OLDNEW
« no previous file with comments | « Source/testing/runner/EventSender.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698