Chromium Code Reviews| Index: ui/accelerated_widget_mac/accelerated_widget_mac.h |
| diff --git a/ui/accelerated_widget_mac/accelerated_widget_mac.h b/ui/accelerated_widget_mac/accelerated_widget_mac.h |
| index 6d05c7916f9904dcf72968eaeb72d33a8d3f4fd5..30c9c70b4e11cd571002d230fd4ccf175ada7767 100644 |
| --- a/ui/accelerated_widget_mac/accelerated_widget_mac.h |
| +++ b/ui/accelerated_widget_mac/accelerated_widget_mac.h |
| @@ -10,6 +10,7 @@ |
| #include "base/mac/scoped_cftyperef.h" |
| #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h" |
| +#include "ui/accelerated_widget_mac/surface_handle_types.h" |
| #include "ui/events/latency_info.h" |
| #include "ui/gfx/geometry/rect.h" |
| #include "ui/gfx/geometry/size.h" |
| @@ -79,13 +80,13 @@ class ACCELERATED_WIDGET_MAC_EXPORT AcceleratedWidgetMac { |
| void BeginPumpingFrames(); |
| void EndPumpingFrames(); |
| - void GotAcceleratedFrame( |
| - uint64 surface_handle, |
| - const std::vector<ui::LatencyInfo>& latency_info, |
| - const gfx::Size& pixel_size, |
| - float scale_factor, |
| - const gfx::Rect& pixel_damage_rect, |
| - const base::Closure& drawn_callback); |
| + void GotAcceleratedFrame(CAContextID ca_context_id, |
|
Ken Russell (switch to Gerrit)
2015/10/23 01:13:13
Could you document that |ca_context_id| and |io_su
|
| + base::ScopedCFTypeRef<IOSurfaceRef> io_surface, |
| + const std::vector<ui::LatencyInfo>& latency_info, |
| + const gfx::Size& pixel_size, |
| + float scale_factor, |
| + const gfx::Rect& pixel_damage_rect, |
| + const base::Closure& drawn_callback); |
| void GotIOSurfaceFrame(base::ScopedCFTypeRef<IOSurfaceRef> io_surface, |
| const gfx::Size& pixel_size, |
| @@ -153,14 +154,18 @@ class ACCELERATED_WIDGET_MAC_EXPORT AcceleratedWidgetMac { |
| ACCELERATED_WIDGET_MAC_EXPORT |
| void AcceleratedWidgetMacGotAcceleratedFrame( |
|
ccameron
2015/10/22 22:16:49
This has some overlay and redundancy with Accelera
Ken Russell (switch to Gerrit)
2015/10/23 01:13:13
Sounds good.
|
| - gfx::AcceleratedWidget widget, uint64 surface_handle, |
| + gfx::AcceleratedWidget widget, |
| + CAContextID ca_context_id, |
| + base::ScopedCFTypeRef<IOSurfaceRef> io_surface, |
| const std::vector<ui::LatencyInfo>& latency_info, |
| const gfx::Size& pixel_size, |
| float scale_factor, |
| const gfx::Rect& pixel_damage_rect, |
| const base::Closure& drawn_callback, |
| - bool* disable_throttling, int* renderer_id, |
| - base::TimeTicks* vsync_timebase, base::TimeDelta* vsync_interval); |
| + bool* disable_throttling, |
| + int* renderer_id, |
| + base::TimeTicks* vsync_timebase, |
| + base::TimeDelta* vsync_interval); |
| ACCELERATED_WIDGET_MAC_EXPORT |
| void AcceleratedWidgetMacGotIOSurfaceFrame( |