summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 17:43:23 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 17:43:23 +0000
commit977cff15f730e782b4caf9b96f1339ab74fcb4cb (patch)
tree07cb202c64a264607966492bd12a4c325890466d
parente94b8efe4a8d63484661abb086a641b59291bef5 (diff)
downloadchromium_src-977cff15f730e782b4caf9b96f1339ab74fcb4cb.zip
chromium_src-977cff15f730e782b4caf9b96f1339ab74fcb4cb.tar.gz
chromium_src-977cff15f730e782b4caf9b96f1339ab74fcb4cb.tar.bz2
Disable UI compositor partial swaps on Mac
There isn't a mechanism for doing partial swaps of a CAOpenGLLayer on Mac. BUG=314190 Review URL: https://codereview.chromium.org/316173005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275469 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/compositor/compositor.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 51b8e66..190a949 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -100,8 +100,10 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
settings.main_frame_before_activation_enabled = false;
settings.throttle_frame_production =
!command_line->HasSwitch(switches::kDisableGpuVsync);
+#if !defined(OS_MACOSX)
settings.partial_swap_enabled =
!command_line->HasSwitch(cc::switches::kUIDisablePartialSwap);
+#endif
#if defined(OS_CHROMEOS)
settings.per_tile_painting_enabled = true;
#endif