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; |
} |
} |