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 20d45e128a57f287f7675e84012d9db42902d8ac..95f074a91e2ed24ed665fe5834f572a3404f3e21 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -88,11 +88,6 @@ namespace { |
const int kUndefinedOutputSurfaceId = -1; |
-// Used to accomodate finite precision when comparing scaled viewport and |
-// content widths. While this value may seem large, width=device-width on an N7 |
-// V1 saw errors of ~0.065 between computed window and content widths. |
-const float kMobileViewportWidthEpsilon = 0.15f; |
- |
static const char kAsyncReadBackString[] = "Compositing.CopyFromSurfaceTime"; |
// Sends an acknowledgement to the renderer of a processed IME event. |
@@ -293,19 +288,6 @@ ui::GestureProvider::Config CreateGestureProviderConfig() { |
return config; |
} |
-bool HasFixedPageScale(const cc::CompositorFrameMetadata& frame_metadata) { |
- return frame_metadata.min_page_scale_factor == |
- frame_metadata.max_page_scale_factor; |
-} |
- |
-bool HasMobileViewport(const cc::CompositorFrameMetadata& frame_metadata) { |
- float window_width_dip = |
- frame_metadata.page_scale_factor * |
- frame_metadata.scrollable_viewport_size.width(); |
- float content_width_css = frame_metadata.root_layer_size.width(); |
- return content_width_css <= window_width_dip + kMobileViewportWidthEpsilon; |
-} |
- |
} // anonymous namespace |
ReadbackRequest::ReadbackRequest(float scale, |
@@ -1332,15 +1314,8 @@ void RenderWidgetHostViewAndroid::SynchronousCopyContents( |
void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated( |
const cc::CompositorFrameMetadata& frame_metadata) { |
- |
- // Disable double tap zoom for pages that have a width=device-width or |
- // narrower viewport (indicating that this is a mobile-optimized or responsive |
- // web design, so text will be legible without zooming). Also disable |
- // double tap and pinch for pages that prevent zooming in or out. |
- bool has_mobile_viewport = HasMobileViewport(frame_metadata); |
- bool has_fixed_page_scale = HasFixedPageScale(frame_metadata); |
gesture_provider_.SetDoubleTapSupportForPageEnabled( |
- !has_fixed_page_scale && !has_mobile_viewport); |
+ IsMobileOptimizedFrame(frame_metadata)); |
if (!content_view_core_) |
return; |