Index: ui/compositor/mac/io_surface_layer_mac.mm |
diff --git a/content/browser/compositor/io_surface_layer_mac.mm b/ui/compositor/mac/io_surface_layer_mac.mm |
similarity index 97% |
rename from content/browser/compositor/io_surface_layer_mac.mm |
rename to ui/compositor/mac/io_surface_layer_mac.mm |
index 2ca9479297656eb1b3d4e8a29be0885dc41d49c0..f215d77d2edea7fb50bbf3399183cb268a23b0e6 100644 |
--- a/content/browser/compositor/io_surface_layer_mac.mm |
+++ b/ui/compositor/mac/io_surface_layer_mac.mm |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/browser/compositor/io_surface_layer_mac.h" |
+#include "ui/compositor/mac/io_surface_layer_mac.h" |
#include <CoreFoundation/CoreFoundation.h> |
#include <OpenGL/CGLIOSurface.h> |
@@ -13,9 +13,9 @@ |
#include "base/debug/trace_event.h" |
#include "base/mac/mac_util.h" |
#include "base/mac/sdk_forward_declarations.h" |
-#include "content/browser/compositor/io_surface_context_mac.h" |
-#include "content/browser/compositor/io_surface_texture_mac.h" |
#include "ui/base/cocoa/animation_utils.h" |
+#include "ui/compositor/mac/io_surface_context_mac.h" |
+#include "ui/compositor/mac/io_surface_texture_mac.h" |
#include "ui/gfx/size_conversions.h" |
#include "ui/gl/gpu_switching_manager.h" |
@@ -172,7 +172,8 @@ void IOSurfaceLayerHelper::EndPumpingFrames() { |
if (self = [super init]) { |
helper_.reset(new content::IOSurfaceLayerHelper(client, self)); |
- iosurface_ = content::IOSurfaceTexture::Create(); |
+ iosurface_ = content::IOSurfaceTexture::Create( |
+ client->IOSurfaceNeedsGLFinishWorkaround()); |
context_ = content::IOSurfaceContext::Get( |
content::IOSurfaceContext::kCALayerContext); |
if (!iosurface_.get() || !context_.get()) { |