| Index: ui/base/cocoa/remote_layer_api.mm
|
| diff --git a/ui/base/cocoa/remote_layer_api.mm b/ui/base/cocoa/remote_layer_api.mm
|
| index 0fb1fdff4804ee0a9b5559e6960bf81ea1d2a990..839daa1c7d5a8b7f6604be578529e483618c6bfb 100644
|
| --- a/ui/base/cocoa/remote_layer_api.mm
|
| +++ b/ui/base/cocoa/remote_layer_api.mm
|
| @@ -5,6 +5,7 @@
|
| #include "ui/base/cocoa/remote_layer_api.h"
|
|
|
| #include "base/command_line.h"
|
| +#include "base/mac/mac_util.h"
|
| #include "ui/base/ui_base_switches.h"
|
|
|
| #include <objc/runtime.h>
|
| @@ -12,10 +13,14 @@
|
| namespace ui {
|
|
|
| bool RemoteLayerAPISupported() {
|
| - bool enabled_at_command_line =
|
| + // This API only works on Mac OS 10.9 and later.
|
| + if (!base::mac::IsOSMavericksOrLater())
|
| + return false;
|
| +
|
| + bool disabled_at_command_line =
|
| CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableRemoteCoreAnimation);
|
| - if (!enabled_at_command_line)
|
| + switches::kDisableRemoteCoreAnimation);
|
| + if (disabled_at_command_line)
|
| return false;
|
|
|
| // Verify the GPU process interfaces are present.
|
|
|