MacViews: Move content::AcceleratedWidget to new component, ui/accelerated_widget_mac

ui/compositor/mac/accelerated_widget_mac.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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 {
 namespace {
 
 typedef std::map<gfx::AcceleratedWidget,AcceleratedWidgetMac*>
     WidgetToHelperMap;
 base::LazyInstance<WidgetToHelperMap> g_widget_to_helper_map;
 
 AcceleratedWidgetMac* GetHelperFromAcceleratedWidget(
     gfx::AcceleratedWidget widget) {
   WidgetToHelperMap::const_iterator found =
       g_widget_to_helper_map.Pointer()->find(widget);
   // This can end up being accessed after the underlying widget has been
   // destroyed, but while the ui::Compositor is still being destroyed.
   // Return NULL in these cases.
   if (found == g_widget_to_helper_map.Pointer()->end())
     return NULL;
   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.org/750173002/, once it lands)

[tapted, 2014/11/25 23:53:55]

Done.

+  return gfx::ToFlooredSize(gfx::ScaleSize(size_in_pixel, 1.0f / scale_factor));
+}
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratedWidgetMac
 
 AcceleratedWidgetMac::AcceleratedWidgetMac()
     : view_(NULL) {
   // Disable the fade-in animation as the layers are added.
   ScopedCAActionDisabler disabler;
 
@@ skipping 275 matching lines @@
 }
 
 bool AcceleratedWidgetMac::IOSurfaceLayerShouldAckImmediately() const {
   // If there is no view then the accelerated layer is not in the view
   // hierarchy and will never draw.
   if (!view_)
     return true;
   return view_->AcceleratedWidgetShouldIgnoreBackpressure();
 }
 
+bool AcceleratedWidgetMac::IOSurfaceNeedsGLFinishWorkaround() const {
+  return view_ && view_->AcceleratedWidgetNeedsGLFinishWorkaround();
+}
+
 void AcceleratedWidgetMac::IOSurfaceLayerDidDrawFrame() {
   AcknowledgeAcceleratedFrame();
 }
 
 void AcceleratedWidgetMac::AcknowledgeAcceleratedFrame() {
   if (accelerated_frame_drawn_callback_.is_null())
     return;
   accelerated_frame_drawn_callback_.Run();
   accelerated_frame_drawn_callback_.Reset();
   if (view_)
@@ skipping 36 matching lines @@
 void AcceleratedWidgetMacGotSoftwareFrame(
     gfx::AcceleratedWidget widget,
     cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas) {
   AcceleratedWidgetMac* accelerated_widget_mac =
       GetHelperFromAcceleratedWidget(widget);
   if (accelerated_widget_mac)
     accelerated_widget_mac->GotSoftwareFrame(frame_data, scale_factor, canvas);
 }
 
 }  // namespace content