Chromium Code Reviews| Index: chrome/browser/ui/cocoa/nsview_additions.mm |
| diff --git a/chrome/browser/ui/cocoa/nsview_additions.mm b/chrome/browser/ui/cocoa/nsview_additions.mm |
| index 38e6e94b1dd63e42d47a67940a1f21d15bd54c54..5cf3fa14a5eaa98177d0970db1cf465ecc6d3746 100644 |
| --- a/chrome/browser/ui/cocoa/nsview_additions.mm |
| +++ b/chrome/browser/ui/cocoa/nsview_additions.mm |
| @@ -2,12 +2,10 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "base/command_line.h" |
| #include "base/mac/mac_util.h" |
| #include "base/mac/sdk_forward_declarations.h" |
| #import "chrome/browser/ui/cocoa/nsview_additions.h" |
| #include "chrome/common/chrome_switches.h" |
| -#include "ui/base/ui_base_switches.h" |
| #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" |
| #include "base/logging.h" |
| @@ -70,20 +68,6 @@ |
| [child cr_recursivelySetNeedsDisplay:flag]; |
| } |
| -- (void)cr_setWantsLayer:(BOOL)wantsLayer { |
| - if (CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kDisableCoreAnimation)) |
| - return; |
| - |
| - // Dynamically removing layers on SnowLeopard will sometimes result in |
| - // crashes. Once a view has a layer on SnowLeopard, it is stuck with it. |
| - // http://crbug.com/348328 |
| - if (!wantsLayer && base::mac::IsOSSnowLeopard()) |
| - return; |
|
Avi (use Gerrit)
2014/08/14 19:23:40
Do we ever call setWantsLayer:NO? I'm hoping we do
ccameron
2014/08/14 19:34:39
We didn't call cr_setWantsLayer:NO (the previous c
|
| - |
| - [self setWantsLayer:wantsLayer]; |
| -} |
| - |
| static NSView* g_ancestorBeingDrawnFrom = nil; |
| static NSView* g_childBeingDrawnTo = nil; |