| Index: ui/gfx/compositor/compositor_gl.cc
|
| diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc
|
| index ee1a38d994c861e7ece04cd0a7bc28e0fa1efff0..cb8a6cd523222f27238076539d42d3734c96eaa0 100644
|
| --- a/ui/gfx/compositor/compositor_gl.cc
|
| +++ b/ui/gfx/compositor/compositor_gl.cc
|
| @@ -441,9 +441,10 @@ void TextureGL::DrawInternal(const ui::TextureProgramGL& program,
|
| glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
| }
|
|
|
| -CompositorGL::CompositorGL(gfx::AcceleratedWidget widget,
|
| +CompositorGL::CompositorGL(CompositorDelegate* delegate,
|
| + gfx::AcceleratedWidget widget,
|
| const gfx::Size& size)
|
| - : Compositor(size),
|
| + : Compositor(delegate, size),
|
| started_(false) {
|
| gl_surface_ = gfx::GLSurface::CreateViewGLSurface(false, widget);
|
| gl_context_ = SharedResources::GetInstance()->
|
| @@ -494,17 +495,17 @@ void CompositorGL::Blur(const gfx::Rect& bounds) {
|
| }
|
|
|
| void CompositorGL::SchedulePaint() {
|
| - // TODO: X doesn't provide coalescing of regions, its left to the toolkit.
|
| - NOTIMPLEMENTED();
|
| + delegate()->ScheduleCompositorPaint();
|
| }
|
|
|
| // static
|
| -Compositor* Compositor::Create(gfx::AcceleratedWidget widget,
|
| +Compositor* Compositor::Create(CompositorDelegate* owner,
|
| + gfx::AcceleratedWidget widget,
|
| const gfx::Size& size) {
|
| if (SharedResources::GetInstance() == NULL)
|
| return NULL;
|
| else
|
| - return new CompositorGL(widget, size);
|
| + return new CompositorGL(owner, widget, size);
|
| }
|
|
|
| } // namespace ui
|
|
|