Commit e52372c2 authored by bokan's avatar bokan Committed by Commit bot

Enable virtual viewport on all platforms except Android WebView.

BUG=148816

Review URL: https://codereview.chromium.org/665963002

Cr-Commit-Position: refs/heads/master@{#301307}
parent 0fb0f0f1
......@@ -20,6 +20,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_restrictions.h"
#include "cc/base/switches.h"
#include "content/browser/media/android/browser_media_player_manager.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/browser/browser_thread.h"
......@@ -83,6 +84,10 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
// This is needed for sharing textures across the different GL threads.
cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes);
// Virtual viewport doesn't behave well with web view. crbug.com/426891
cl->AppendSwitch(cc::switches::kDisablePinchVirtualViewport);
return false;
}
......
......@@ -173,11 +173,7 @@ bool IsPinchVirtualViewportEnabled() {
if (command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport))
return true;
#if defined(OS_CHROMEOS)
return true;
#else
return false;
#endif
}
bool IsDelegatedRendererEnabled() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment