Chromium Code Reviews| Index: ui/compositor/mac/accelerated_widget_mac.mm |
| diff --git a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.mm b/ui/compositor/mac/accelerated_widget_mac.mm |
| similarity index 95% |
| rename from content/browser/compositor/browser_compositor_ca_layer_tree_mac.mm |
| rename to ui/compositor/mac/accelerated_widget_mac.mm |
| index 4917a55222e73b77f09fcb9c00307654dbff5d3b..b1ac84e8cb9c6bac9bfd831be862de782ee9e516 100644 |
| --- a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.mm |
| +++ b/ui/compositor/mac/accelerated_widget_mac.mm |
| @@ -2,19 +2,19 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h" |
| +#include "ui/compositor/mac/accelerated_widget_mac.h" |
| #include <map> |
| -#include "cc/output/software_frame_data.h" |
| #include "base/debug/trace_event.h" |
| #include "base/lazy_instance.h" |
| #include "base/message_loop/message_loop.h" |
| -#include "content/browser/compositor/io_surface_layer_mac.h" |
| -#include "content/browser/renderer_host/dip_util.h" |
| -#include "content/common/gpu/surface_handle_types_mac.h" |
| -#include "content/public/browser/context_factory.h" |
| +#include "cc/output/software_frame_data.h" |
| +#include "third_party/skia/include/core/SkCanvas.h" |
| #include "ui/base/cocoa/animation_utils.h" |
| +#include "ui/compositor/mac/io_surface_layer_mac.h" |
| +#include "ui/compositor/mac/surface_handle_types_mac.h" |
| +#include "ui/gfx/size_conversions.h" |
| #include "ui/gl/scoped_cgl.h" |
| namespace content { |
| @@ -36,6 +36,10 @@ AcceleratedWidgetMac* GetHelperFromAcceleratedWidget( |
| return found->second; |
| } |
| +gfx::Size ConvertSizeToDIP(float scale_factor, const gfx::Size& size_in_pixel) { |
|
ccameron
2014/11/25 17:54:25
(re-resolve against https://codereview.chromium.or
tapted
2014/11/25 23:53:55
Done.
|
| + return gfx::ToFlooredSize(gfx::ScaleSize(size_in_pixel, 1.0f / scale_factor)); |
| +} |
| + |
| } |
| //////////////////////////////////////////////////////////////////////////////// |
| @@ -331,6 +335,10 @@ bool AcceleratedWidgetMac::IOSurfaceLayerShouldAckImmediately() const { |
| return view_->AcceleratedWidgetShouldIgnoreBackpressure(); |
| } |
| +bool AcceleratedWidgetMac::IOSurfaceNeedsGLFinishWorkaround() const { |
| + return view_ && view_->AcceleratedWidgetNeedsGLFinishWorkaround(); |
| +} |
| + |
| void AcceleratedWidgetMac::IOSurfaceLayerDidDrawFrame() { |
| AcknowledgeAcceleratedFrame(); |
| } |