| Index: content/browser/renderer_host/render_widget_host_view_base.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
| index 8fee3f1e6ff8d2e63dd221c5c1f88879b8d11445..44f3434143e3073924b62d84060e4e241df78a33 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
| @@ -32,12 +32,14 @@ RenderWidgetHostViewPort* RenderWidgetHostViewPort::CreateViewForWidget(
|
| return FromRWHV(RenderWidgetHostView::CreateViewForWidget(widget));
|
| }
|
|
|
| -RenderWidgetHostViewBase::RenderWidgetHostViewBase()
|
| +RenderWidgetHostViewBase::RenderWidgetHostViewBase(
|
| + scoped_ptr<CompositingDelegate> delegate)
|
| : popup_type_(WebKit::WebPopupTypeNone),
|
| mouse_locked_(false),
|
| showing_context_menu_(false),
|
| selection_text_offset_(0),
|
| - selection_range_(ui::Range::InvalidRange()) {
|
| + selection_range_(ui::Range::InvalidRange()),
|
| + compositing_delegate_(delegate.Pass()) {
|
| }
|
|
|
| RenderWidgetHostViewBase::~RenderWidgetHostViewBase() {
|
| @@ -74,6 +76,30 @@ bool RenderWidgetHostViewBase::IsMouseLocked() {
|
| return mouse_locked_;
|
| }
|
|
|
| +gfx::GLSurfaceHandle RenderWidgetHostViewBase::GetCompositingSurface() {
|
| + return compositing_delegate_->GetCompositingSurface();
|
| +}
|
| +
|
| +bool RenderWidgetHostViewBase::ResizeNeedsNewSurface() {
|
| + return compositing_delegate_->ResizeNeedsNewSurface();
|
| +}
|
| +
|
| +void RenderWidgetHostViewBase::AcceleratedSurfaceNew(int32 width_in_pixel, int32 height_in_pixel, uint64* surface_handle, TransportDIB::Handle* shm_handle) {
|
| + compositing_delegate_->AcceleratedSurfaceNew(width_in_pixel, height_in_pixel, surface_handle, shm_handle);
|
| +}
|
| +
|
| +void RenderWidgetHostViewBase::AcceleratedSurfaceRelease(uint64 surface_handle) {
|
| + compositing_delegate_->AcceleratedSurfaceRelease(surface_handle);
|
| +}
|
| +
|
| +void RenderWidgetHostViewBase::AcceleratedSurfacePostSubBuffer(const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, int gpu_host_id) {
|
| + compositing_delegate_->AcceleratedSurfacePostSubBuffer(params_in_pixel, gpu_host_id);
|
| +}
|
| +
|
| +void RenderWidgetHostViewBase::AcceleratedSurfaceBuffersSwapped(const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, int gpu_host_id) {
|
| + compositing_delegate_->AcceleratedSurfaceBuffersSwapped(params_in_pixel, gpu_host_id);
|
| +}
|
| +
|
| void RenderWidgetHostViewBase::UnhandledWheelEvent(
|
| const WebKit::WebMouseWheelEvent& event) {
|
| // Most implementations don't need to do anything here.
|
| @@ -112,4 +138,15 @@ void RenderWidgetHostViewBase::UpdateScreenInfo() {
|
| }
|
| }
|
|
|
| +void RenderWidgetHostViewBase::CompositingDelegate::AcceleratedSurfaceNew(int32 width_in_pixel, int32 height_in_pixel, uint64* surface_handle, TransportDIB::Handle* shm_handle) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +void RenderWidgetHostViewBase::CompositingDelegate::AcceleratedSurfaceRelease(uint64 surface_handle) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +RenderWidgetHostViewBase::CompositingDelegate::~CompositingDelegate() {
|
| +}
|
| +
|
| } // namespace content
|
|
|