| Index: ui/gfx/compositor/compositor.cc
|
| diff --git a/ui/gfx/compositor/compositor.cc b/ui/gfx/compositor/compositor.cc
|
| index 7d8abdfef62fca23266d5c9eda7f047fab6a202e..506b0ca8f18950219a53ac50cedd2311ce1548f2 100644
|
| --- a/ui/gfx/compositor/compositor.cc
|
| +++ b/ui/gfx/compositor/compositor.cc
|
| @@ -128,7 +128,11 @@ Compositor::Compositor(CompositorDelegate* delegate,
|
| command_line->HasSwitch(switches::kUIEnablePerTilePainting);
|
| #endif
|
|
|
| +#if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE)
|
| + host_.initialize(this, root_web_layer_, settings);
|
| +#else
|
| host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings);
|
| +#endif
|
| root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
|
| WidgetSizeChanged(size_);
|
| }
|
| @@ -278,11 +282,14 @@ WebKit::WebGraphicsContext3D* Compositor::createContext3D() {
|
| }
|
| }
|
|
|
| -void Compositor::didCompleteSwapBuffers() {
|
| - NotifyEnd();
|
| +void Compositor::didRebindGraphicsContext(bool success) {
|
| }
|
|
|
| -void Compositor::didRebindGraphicsContext(bool success) {
|
| +void Compositor::didCommitAndDrawFrame() {
|
| +}
|
| +
|
| +void Compositor::didCompleteSwapBuffers() {
|
| + NotifyEnd();
|
| }
|
|
|
| void Compositor::scheduleComposite() {
|
|
|