Index: content/renderer/android/synchronous_compositor_proxy.h |
diff --git a/content/renderer/android/synchronous_compositor_proxy.h b/content/renderer/android/synchronous_compositor_proxy.h |
index 07a651e6cd22a889c6d0d627fefd326832521634..5f25789c8c4fe6e93cc4c9c98e1a1b230e92b5e3 100644 |
--- a/content/renderer/android/synchronous_compositor_proxy.h |
+++ b/content/renderer/android/synchronous_compositor_proxy.h |
@@ -10,7 +10,7 @@ |
#include "base/macros.h" |
#include "content/common/input/input_event_ack_state.h" |
-#include "content/renderer/android/synchronous_compositor_output_surface.h" |
+#include "content/renderer/android/synchronous_compositor_frame_sink.h" |
#include "ui/events/blink/synchronous_input_handler_proxy.h" |
#include "ui/gfx/geometry/scroll_offset.h" |
#include "ui/gfx/geometry/size_f.h" |
@@ -32,15 +32,14 @@ class CompositorFrame; |
namespace content { |
-class SynchronousCompositorOutputSurface; |
+class SynchronousCompositorFrameSink; |
struct SyncCompositorCommonRendererParams; |
struct SyncCompositorDemandDrawHwParams; |
struct SyncCompositorDemandDrawSwParams; |
struct SyncCompositorSetSharedMemoryParams; |
-class SynchronousCompositorProxy |
- : public ui::SynchronousInputHandler, |
- public SynchronousCompositorOutputSurfaceClient { |
+class SynchronousCompositorProxy : public ui::SynchronousInputHandler, |
+ public SynchronousCompositorFrameSinkClient { |
public: |
SynchronousCompositorProxy( |
int routing_id, |
@@ -57,13 +56,14 @@ class SynchronousCompositorProxy |
float min_page_scale_factor, |
float max_page_scale_factor) override; |
- // SynchronousCompositorOutputSurfaceClient overrides. |
+ // SynchronousCompositorFrameSinkClient overrides. |
void DidActivatePendingTree() override; |
void Invalidate() override; |
- void SwapBuffers(uint32_t output_surface_id, |
+ void SwapBuffers(uint32_t compositor_frame_sink_id, |
cc::CompositorFrame frame) override; |
- void SetOutputSurface(SynchronousCompositorOutputSurface* output_surface); |
+ void SetCompositorFrameSink( |
+ SynchronousCompositorFrameSink* compositor_frame_sink); |
void OnMessageReceived(const IPC::Message& message); |
bool Send(IPC::Message* message); |
void PopulateCommonParams(SyncCompositorCommonRendererParams* params) const; |
@@ -89,14 +89,15 @@ class SynchronousCompositorProxy |
SyncCompositorCommonRendererParams* common_renderer_params); |
void SetScroll(const gfx::ScrollOffset& total_scroll_offset); |
- void SwapBuffersHwAsync(uint32_t output_surface_id, |
+ void SwapBuffersHwAsync(uint32_t compositor_frame_sink_id, |
cc::CompositorFrame frame); |
- void SwapBuffersHw(uint32_t output_surface_id, cc::CompositorFrame frame); |
+ void SwapBuffersHw(uint32_t compositor_frame_sink_id, |
+ cc::CompositorFrame frame); |
void SendDemandDrawHwReply(cc::CompositorFrame frame, |
- uint32_t output_surface_id, |
+ uint32_t compositor_frame_sink_id, |
IPC::Message* reply_message); |
void SendDemandDrawHwReplyAsync(cc::CompositorFrame frame, |
- uint32_t output_surface_id); |
+ uint32_t compositor_frame_sink_id); |
void DoDemandDrawSw(const SyncCompositorDemandDrawSwParams& params); |
void SwapBuffersSw(cc::CompositorFrame frame); |
void SendDemandDrawSwReply(bool success, |
@@ -110,7 +111,7 @@ class SynchronousCompositorProxy |
IPC::Sender* const sender_; |
ui::SynchronousInputHandlerProxy* const input_handler_proxy_; |
const bool use_in_process_zero_copy_software_draw_; |
- SynchronousCompositorOutputSurface* output_surface_; |
+ SynchronousCompositorFrameSink* compositor_frame_sink_; |
bool inside_receive_; |
IPC::Message* hardware_draw_reply_; |
IPC::Message* software_draw_reply_; |