summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2016-03-23 15:20:08 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 22:22:50 +0000
commit09b6b31bbf4dc3de1ac5f8e31de9fabdd2e9f427 (patch)
tree324229afd30e22f53e507470ebf5cfa3fffa19b4 /content/browser
parent3478388ae8a2cc50e62229d212a89933bf30f4ba (diff)
downloadchromium_src-09b6b31bbf4dc3de1ac5f8e31de9fabdd2e9f427.zip
chromium_src-09b6b31bbf4dc3de1ac5f8e31de9fabdd2e9f427.tar.gz
chromium_src-09b6b31bbf4dc3de1ac5f8e31de9fabdd2e9f427.tar.bz2
Revert of Disable CALayer overlays on 10.9 (patchset #2 id:20001 of https://codereview.chromium.org/1819193002/ )
Reason for revert: Wasn't helpful. Original issue's description: > Disable CALayer overlays on 10.9 > > This is causing issues with PDF and print-preview for yet-unknown > reasons. Hopefully we can re-enable CALayer overlays when we find the > fix. > > BUG=594343 > > Committed: https://crrev.com/52dd784270ee9386ceba4e29c198c86dea9912dc > Cr-Commit-Position: refs/heads/master@{#382498} TBR=erikchen@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=594343 Review URL: https://codereview.chromium.org/1830733003 Cr-Commit-Position: refs/heads/master@{#382943}
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm7
1 files changed, 0 insertions, 7 deletions
diff --git a/content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm b/content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm
index e14bd68..3e9886b 100644
--- a/content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm
+++ b/content/browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm
@@ -7,7 +7,6 @@
#include <stddef.h>
#include "base/command_line.h"
-#include "base/mac/mac_util.h"
#include "content/browser/gpu/gpu_data_manager_impl.h"
#include "gpu/config/gpu_driver_bug_workaround_type.h"
#include "ui/base/ui_base_switches.h"
@@ -39,12 +38,6 @@ bool BrowserCompositorOverlayCandidateValidatorMac::AllowCALayerOverlays() {
if (software_mirror_active_ || ca_layers_disabled_ ||
overlays_disabled_at_command_line)
return false;
-
- // Temporarily disable CALayer overlays on 10.9 because it appears to be
- // buggy, see http://crbug.com/594343
- if (base::mac::IsOSMavericks())
- return false;
-
return true;
}