summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-04-06 17:51:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-07 00:51:48 +0000
commit5a39fbc9cab86332e8ab469093028e4e2efb1386 (patch)
tree8fc71467bd8664c07db0f9b7eb10deed0e4f4ff0
parent7e0be9b510179367a120696203d0f7ff6adec06c (diff)
downloadchromium_src-5a39fbc9cab86332e8ab469093028e4e2efb1386.zip
chromium_src-5a39fbc9cab86332e8ab469093028e4e2efb1386.tar.gz
chromium_src-5a39fbc9cab86332e8ab469093028e4e2efb1386.tar.bz2
Mac: Use appropriate mechanism to determine partial swap capability
BUG=474299 Review URL: https://codereview.chromium.org/1059483004 Cr-Commit-Position: refs/heads/master@{#323992}
-rw-r--r--content/common/gpu/image_transport_surface_fbo_mac.mm2
-rw-r--r--ui/compositor/compositor.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/content/common/gpu/image_transport_surface_fbo_mac.mm b/content/common/gpu/image_transport_surface_fbo_mac.mm
index cb4e3a0..64e3e72 100644
--- a/content/common/gpu/image_transport_surface_fbo_mac.mm
+++ b/content/common/gpu/image_transport_surface_fbo_mac.mm
@@ -209,7 +209,7 @@ bool ImageTransportSurfaceFBO::PostSubBuffer(
}
bool ImageTransportSurfaceFBO::SupportsPostSubBuffer() {
- return true;
+ return false;
}
gfx::Size ImageTransportSurfaceFBO::GetSize() {
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 2b1eccf..996c9852 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -98,10 +98,8 @@ 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.renderer_settings.partial_swap_enabled =
!command_line->HasSwitch(cc::switches::kUIDisablePartialSwap);
-#endif
#if defined(OS_CHROMEOS)
settings.per_tile_painting_enabled = true;
#endif