| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index 6c435b81ecbe972ca086801a55076a1a50bdb56b..21af90620918d02272745eab724e11d734fa44bd 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -614,12 +614,12 @@ void Layer::PaintContents(SkCanvas* sk_canvas,
|
| canvas->Restore();
|
| }
|
|
|
| -unsigned Layer::prepareTexture(cc::ResourceUpdateQueue&) {
|
| +unsigned Layer::PrepareTexture(cc::ResourceUpdateQueue* queue) {
|
| DCHECK(texture_layer_);
|
| return texture_->PrepareTexture();
|
| }
|
|
|
| -WebKit::WebGraphicsContext3D* Layer::context() {
|
| +WebKit::WebGraphicsContext3D* Layer::Context3d() {
|
| DCHECK(texture_layer_);
|
| return texture_->HostContext3D();
|
| }
|
|
|