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

Unified Diff: content/renderer/render_view_impl.cc

Issue 8399009: Add support for touch based zoom gesture on Windows. This change also handles the WM_POINTERDOWN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc (revision 107928)
+++ content/renderer/render_view_impl.cc (working copy)
@@ -272,6 +272,8 @@
static const float kScalingIncrement = 0.1f;
+static const float kScalingIncrementForGesture = 0.01f;
+
static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
WebVector<WebURL> urls;
ds->redirectChain(urls);
@@ -599,6 +601,7 @@
IPC_MESSAGE_HANDLER(ViewMsg_FindReplyACK, OnFindReplyAck)
IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevel, OnSetZoomLevel)
+ IPC_MESSAGE_HANDLER(ViewMsg_ZoomFactor, OnZoomFactor)
IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
OnSetZoomLevelForLoadingURL)
IPC_MESSAGE_HANDLER(ViewMsg_ExitFullscreen, OnExitFullscreen)
@@ -3557,17 +3560,36 @@
}
webview()->setZoomLevel(false, zoom_level);
#else
+ ZoomFactorHelper(function, 0, 0, kScalingIncrement);
+#endif
+ zoomLevelChanged();
+}
+
+void RenderViewImpl::OnZoomFactor(content::PageZoom zoom,
+ int zoom_center_x, int zoom_center_y) {
+ ZoomFactorHelper(zoom, zoom_center_x, zoom_center_y,
+ kScalingIncrementForGesture);
+}
+
+void RenderViewImpl::ZoomFactorHelper(content::PageZoom zoom,
+ int zoom_center_x,
+ int zoom_center_y,
+ float scaling_increment) {
+ if (!webview()) // Not sure if this can happen, but no harm in being safe.
+ return;
+
double old_page_scale_factor = webview()->pageScaleFactor();
double page_scale_factor;
if (zoom == content::PAGE_ZOOM_RESET) {
page_scale_factor = 1.0;
} else {
page_scale_factor = old_page_scale_factor +
- (zoom > 0 ? kScalingIncrement : -kScalingIncrement);
+ (zoom > 0 ? scaling_increment : -scaling_increment);
}
- webview()->scalePage(page_scale_factor, WebPoint(0, 0));
-#endif
- zoomLevelChanged();
+ if (page_scale_factor > 0) {
+ webview()->scalePage(page_scale_factor,
+ WebPoint(zoom_center_x, zoom_center_y));
+ }
}
void RenderViewImpl::OnSetZoomLevel(double zoom_level) {
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698