| OLD | NEW |
| 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/renderer_host/frame_metadata_util.h" | 5 #include "content/browser/renderer_host/frame_metadata_util.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame_metadata.h" | 7 #include "cc/output/compositor_frame_metadata.h" |
| 8 | 8 |
| 9 namespace { | 9 namespace { |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 frame_metadata.page_scale_factor * | 23 frame_metadata.page_scale_factor * |
| 24 frame_metadata.scrollable_viewport_size.width(); | 24 frame_metadata.scrollable_viewport_size.width(); |
| 25 float content_width_css = frame_metadata.root_layer_size.width(); | 25 float content_width_css = frame_metadata.root_layer_size.width(); |
| 26 return content_width_css <= window_width_dip + kMobileViewportWidthEpsilon; | 26 return content_width_css <= window_width_dip + kMobileViewportWidthEpsilon; |
| 27 } | 27 } |
| 28 | 28 |
| 29 } // namespace | 29 } // namespace |
| 30 | 30 |
| 31 namespace content { | 31 namespace content { |
| 32 | 32 |
| 33 bool IsMobileOptimizedFrame(const cc::CompositorFrameMetadata& frame_metadata) { | 33 bool IsMobileOptimizedFrame(const cc::CompositorFrameMetadata& frame_metadata, |
| 34 bool has_mobile_viewport = HasMobileViewport(frame_metadata); | 34 bool force_enable_zoom) { |
| 35 bool has_mobile_viewport = false; |
| 36 if (!force_enable_zoom) |
| 37 has_mobile_viewport = HasMobileViewport(frame_metadata); |
| 35 bool has_fixed_page_scale = HasFixedPageScale(frame_metadata); | 38 bool has_fixed_page_scale = HasFixedPageScale(frame_metadata); |
| 36 return has_fixed_page_scale || has_mobile_viewport; | 39 return has_fixed_page_scale || has_mobile_viewport; |
| 37 } | 40 } |
| 38 | 41 |
| 39 } // namespace content | 42 } // namespace content |
| OLD | NEW |