| Index: ui/gfx/compositor/layer.cc
|
| diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc
|
| index 51ad1dbb472b49179fc3accf7b50317446401184..c0285da7153f91e6425b5ac6dce168b9ab857c3f 100644
|
| --- a/ui/gfx/compositor/layer.cc
|
| +++ b/ui/gfx/compositor/layer.cc
|
| @@ -265,9 +265,9 @@ void Layer::SetExternalTexture(ui::Texture* texture) {
|
| web_layer_.removeAllChildren();
|
| WebKit::WebLayer new_layer;
|
| if (layer_updated_externally_)
|
| - new_layer = WebKit::WebExternalTextureLayer::create(this);
|
| + new_layer = WebKit::WebExternalTextureLayer::create();
|
| else
|
| - new_layer = WebKit::WebContentLayer::create(this, this);
|
| + new_layer = WebKit::WebContentLayer::create(this);
|
| if (parent_) {
|
| DCHECK(!parent_->web_layer_.isNull());
|
| parent_->web_layer_.replaceChild(web_layer_, new_layer);
|
| @@ -397,14 +397,6 @@ void Layer::DrawTree() {
|
| #endif
|
| }
|
|
|
| -void Layer::notifyNeedsComposite() {
|
| -#if defined(USE_WEBKIT_COMPOSITOR)
|
| - ScheduleDraw();
|
| -#else
|
| - NOTREACHED();
|
| -#endif
|
| -}
|
| -
|
| void Layer::paintContents(WebKit::WebCanvas* web_canvas,
|
| const WebKit::WebRect& clip) {
|
| TRACE_EVENT0("ui", "Layer::paintContents");
|
| @@ -730,7 +722,7 @@ float Layer::GetOpacityForAnimation() const {
|
|
|
| #if defined(USE_WEBKIT_COMPOSITOR)
|
| void Layer::CreateWebLayer() {
|
| - web_layer_ = WebKit::WebContentLayer::create(this, this);
|
| + web_layer_ = WebKit::WebContentLayer::create(this);
|
| web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
|
| web_layer_.setOpaque(true);
|
| web_layer_is_accelerated_ = false;
|
|
|