Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(584)

Unified Diff: ui/accelerated_widget_mac/ca_renderer_layer_tree.mm

Issue 2269473002: Mac: Disable AVSampleBufferDisplayLayer on Mac <10.11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
diff --git a/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm b/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
index 7acd00ef7e6003eb668fef72a74c4d278746f81f..496cfb81e2fcc0d588c9527df740887b29c86593 100644
--- a/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
+++ b/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
@@ -10,6 +10,7 @@
#include <GLES2/gl2extchromium.h>
#include "base/command_line.h"
+#include "base/mac/mac_util.h"
#include "base/mac/sdk_forward_declarations.h"
#include "base/trace_event/trace_event.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -327,7 +328,11 @@ bool AVSampleBufferDisplayLayerEnqueueIOSurface(
if (IOSurfaceGetPixelFormat(io_surface) ==
kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange &&
contents_rect == gfx::RectF(0, 0, 1, 1)) {
- use_av_layer = true;
+ // Disable AVSampleBufferDisplayLayer on <10.11 due to reports of memory
+ // leaks on 10.9.
+ // https://crbug.com/631485
+ if (base::mac::IsOSElCapitanOrLater())
+ use_av_layer = true;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698