DoubleTap Zoom support for Mobile Viewport pages

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 0404809aee851394babc0f21a464ff167e212e2f..20fc04e39ea7401972268d1e9a7b529a94a93a20 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1207,8 +1207,12 @@ void RenderWidgetHostViewAndroid::SynchronousFrameMetadata(
     cc::CompositorFrameMetadata frame_metadata) {
   if (!content_view_core_)
     return;
-
-  bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
+  bool enable_force_zoom = false;
+  if (host_)
+    enable_force_zoom =
+        RenderViewHost::From(host_)->GetWebkitPreferences().force_enable_zoom;
+  bool is_mobile_optimized =
+      IsMobileOptimizedFrame(frame_metadata, enable_force_zoom);
 
   if (host_ && host_->input_router()) {
     host_->input_router()->NotifySiteIsMobileOptimized(
@@ -1345,7 +1349,12 @@ void RenderWidgetHostViewAndroid::SynchronousCopyContents(
 void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
     const cc::CompositorFrameMetadata& frame_metadata,
     bool is_transparent) {
-  bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
+  bool enable_force_zoom = false;
+  if (host_)
+    enable_force_zoom =
+        RenderViewHost::From(host_)->GetWebkitPreferences().force_enable_zoom;
+  bool is_mobile_optimized =
+      IsMobileOptimizedFrame(frame_metadata, enable_force_zoom);
   gesture_provider_.SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
 
   if (!content_view_core_)