| Index: content/browser/renderer_host/frame_metadata_util.cc
|
| diff --git a/content/browser/renderer_host/frame_metadata_util.cc b/content/browser/renderer_host/frame_metadata_util.cc
|
| index 11cf5d2e65e2b5d4de95cc2886549cffb17c3cc3..0b2fc8725c7fc4a94175d955c2f4b24212526597 100644
|
| --- a/content/browser/renderer_host/frame_metadata_util.cc
|
| +++ b/content/browser/renderer_host/frame_metadata_util.cc
|
| @@ -30,8 +30,11 @@ bool HasMobileViewport(const cc::CompositorFrameMetadata& frame_metadata) {
|
|
|
| namespace content {
|
|
|
| -bool IsMobileOptimizedFrame(const cc::CompositorFrameMetadata& frame_metadata) {
|
| - bool has_mobile_viewport = HasMobileViewport(frame_metadata);
|
| +bool IsMobileOptimizedFrame(const cc::CompositorFrameMetadata& frame_metadata,
|
| + bool force_enable_zoom) {
|
| + bool has_mobile_viewport = false;
|
| + if (!force_enable_zoom)
|
| + has_mobile_viewport = HasMobileViewport(frame_metadata);
|
| bool has_fixed_page_scale = HasFixedPageScale(frame_metadata);
|
| return has_fixed_page_scale || has_mobile_viewport;
|
| }
|
|
|