Index: content/renderer/render_view.cc |
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc |
index a09f7323d5e22dfdd84b9c30786d61a2fcfb5e96..a2f4bbe13834d24923cd81b4dec017691212cc35 100644 |
--- a/content/renderer/render_view.cc |
+++ b/content/renderer/render_view.cc |
@@ -3328,7 +3328,7 @@ void RenderView::OnZoom(PageZoom::Function function) { |
return; |
webview()->hidePopups(); |
- |
+#ifndef TOUCH_UI |
jam
2011/08/11 20:44:56
nit: normal convention is "!defined(TOUCH_UI)"
Fady Samuel
2011/08/12 21:58:13
Done.
|
double old_zoom_level = webview()->zoomLevel(); |
double zoom_level; |
if (function == PageZoom::RESET) { |
@@ -3349,8 +3349,17 @@ void RenderView::OnZoom(PageZoom::Function function) { |
zoom_level = static_cast<int>(old_zoom_level); |
} |
} |
- |
webview()->setZoomLevel(false, zoom_level); |
+#else |
+ double old_page_scale_factor = webview()->pageScaleFactor(); |
+ double page_scale_factor; |
+ if (function == PageZoom::RESET) { |
+ page_scale_factor = 1.0; |
+ } else { |
+ page_scale_factor = old_page_scale_factor + (function > 0 ? 0.1 : -0.1); |
jam
2011/08/11 20:44:56
these all need to be constants
|
+ } |
+ webview()->scalePage(page_scale_factor, WebPoint(0, 0)); |
+#endif |
zoomLevelChanged(); |
} |