| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import <OpenGL/OpenGL.h> | 5 #import <OpenGL/OpenGL.h> |
| 6 | 6 |
| 7 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h" | 7 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h" |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "content/plugin/webplugin_proxy.h" | 11 #include "content/plugin/webplugin_proxy.h" |
| 12 #include "ui/base/ui_base_switches.h" | 12 #include "ui/base/ui_base_switches.h" |
| 13 #include "ui/surface/accelerated_surface_mac.h" | 13 #include "ui/surface/accelerated_surface_mac.h" |
| 14 #include "ui/surface/io_surface_support_mac.h" | 14 #include "ui/surface/io_surface_support_mac.h" |
| 15 #include "ui/surface/transport_dib.h" | 15 #include "ui/surface/transport_dib.h" |
| 16 | 16 |
| 17 namespace content { |
| 18 |
| 17 WebPluginAcceleratedSurfaceProxy* WebPluginAcceleratedSurfaceProxy::Create( | 19 WebPluginAcceleratedSurfaceProxy* WebPluginAcceleratedSurfaceProxy::Create( |
| 18 WebPluginProxy* plugin_proxy, | 20 WebPluginProxy* plugin_proxy, |
| 19 gfx::GpuPreference gpu_preference) { | 21 gfx::GpuPreference gpu_preference) { |
| 20 bool composited = !CommandLine::ForCurrentProcess()->HasSwitch( | 22 bool composited = !CommandLine::ForCurrentProcess()->HasSwitch( |
| 21 switches::kDisableCompositedCoreAnimationPlugins); | 23 switches::kDisableCompositedCoreAnimationPlugins); |
| 22 | 24 |
| 23 // Require IOSurface support for drawing Core Animation plugins. | 25 // Require IOSurface support for drawing Core Animation plugins. |
| 24 if (composited && !IOSurfaceSupport::Initialize()) | 26 if (composited && !IOSurfaceSupport::Initialize()) |
| 25 return NULL; | 27 return NULL; |
| 26 | 28 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 return; | 114 return; |
| 113 | 115 |
| 114 surface_->SwapBuffers(); | 116 surface_->SwapBuffers(); |
| 115 if (composited_) { | 117 if (composited_) { |
| 116 plugin_proxy_->AcceleratedPluginSwappedIOSurface(); | 118 plugin_proxy_->AcceleratedPluginSwappedIOSurface(); |
| 117 } else { | 119 } else { |
| 118 plugin_proxy_->AcceleratedFrameBuffersDidSwap( | 120 plugin_proxy_->AcceleratedFrameBuffersDidSwap( |
| 119 window_handle_, surface_->GetSurfaceId()); | 121 window_handle_, surface_->GetSurfaceId()); |
| 120 } | 122 } |
| 121 } | 123 } |
| 124 |
| 125 } // namespace content |
| OLD | NEW |