Index: ui/gfx/compositor/compositor_win.cc |
diff --git a/ui/gfx/compositor/compositor_win.cc b/ui/gfx/compositor/compositor_win.cc |
index 3c0a2ff8663ec89b3ede2e7f4aeae47dd3e0509d..ae145a9733eda35617dfd56299afefde4462302b 100644 |
--- a/ui/gfx/compositor/compositor_win.cc |
+++ b/ui/gfx/compositor/compositor_win.cc |
@@ -86,7 +86,8 @@ class ViewTexture : public Texture { |
// D3D 10 Compositor implementation. |
class CompositorWin : public Compositor { |
public: |
- CompositorWin(gfx::AcceleratedWidget widget, |
+ CompositorWin(CompositorDelegate* delegate, |
+ gfx::AcceleratedWidget widget, |
const gfx::Size& size); |
void Init(); |
@@ -104,7 +105,6 @@ class CompositorWin : public Compositor { |
virtual void NotifyStart() OVERRIDE; |
virtual void NotifyEnd() OVERRIDE; |
virtual void Blur(const gfx::Rect& bounds) OVERRIDE; |
- virtual void SchedulePaint() OVERRIDE; |
protected: |
virtual void OnWidgetSizeChanged() OVERRIDE; |
@@ -321,9 +321,10 @@ void ViewTexture::CreateVertexBufferForRegion(const gfx::Rect& bounds) { |
vertex_buffer_.Receive())); |
} |
-CompositorWin::CompositorWin(gfx::AcceleratedWidget widget, |
+CompositorWin::CompositorWin(CompositorDelegate* delegate, |
+ gfx::AcceleratedWidget widget, |
const gfx::Size& size) |
- : Compositor(size), |
+ : Compositor(delegate, size), |
host_(widget), |
technique_(NULL) { |
} |
@@ -499,12 +500,6 @@ void CompositorWin::Blur(const gfx::Rect& bounds) { |
#endif |
} |
-void CompositorWin::SchedulePaint() { |
- RECT bounds; |
- GetClientRect(host_, &bounds); |
- InvalidateRect(host_, &bounds, FALSE); |
-} |
- |
void CompositorWin::OnWidgetSizeChanged() { |
dest_render_target_view_ = NULL; |
depth_stencil_buffer_ = NULL; |
@@ -796,9 +791,10 @@ ID3D10Buffer* CompositorWin::CreateVertexBufferForRegion( |
} // namespace |
// static |
-Compositor* Compositor::Create(gfx::AcceleratedWidget widget, |
+Compositor* Compositor::Create(CompositorDelegate* delegate, |
+ gfx::AcceleratedWidget widget, |
const gfx::Size& size) { |
- CompositorWin* compositor = new CompositorWin(widget, size); |
+ CompositorWin* compositor = new CompositorWin(delegate, widget, size); |
compositor->Init(); |
return compositor; |
} |