| Index: webkit/compositor_bindings/web_content_layer_impl.cc
|
| diff --git a/webkit/compositor_bindings/web_content_layer_impl.cc b/webkit/compositor_bindings/web_content_layer_impl.cc
|
| index 6e227f01678584fb67d74557d04bb653a0223640..70c66450fd59d4ab20df6088770e28f7a2e50f3a 100644
|
| --- a/webkit/compositor_bindings/web_content_layer_impl.cc
|
| +++ b/webkit/compositor_bindings/web_content_layer_impl.cc
|
| @@ -26,10 +26,10 @@ static bool usingPictureLayer() {
|
| WebContentLayerImpl::WebContentLayerImpl(WebContentLayerClient* client)
|
| : client_(client) {
|
| if (usingPictureLayer())
|
| - layer_ = make_scoped_ptr(new WebLayerImpl(PictureLayer::create(this)));
|
| + layer_ = make_scoped_ptr(new WebLayerImpl(PictureLayer::Create(this)));
|
| else
|
| - layer_ = make_scoped_ptr(new WebLayerImpl(ContentLayer::create(this)));
|
| - layer_->layer()->setIsDrawable(true);
|
| + layer_ = make_scoped_ptr(new WebLayerImpl(ContentLayer::Create(this)));
|
| + layer_->layer()->SetIsDrawable(true);
|
| }
|
|
|
| WebContentLayerImpl::~WebContentLayerImpl() {
|
| @@ -42,27 +42,27 @@ WebContentLayerImpl::~WebContentLayerImpl() {
|
| WebLayer* WebContentLayerImpl::layer() { return layer_.get(); }
|
|
|
| void WebContentLayerImpl::setDoubleSided(bool double_sided) {
|
| - layer_->layer()->setDoubleSided(double_sided);
|
| + layer_->layer()->SetDoubleSided(double_sided);
|
| }
|
|
|
| void WebContentLayerImpl::setBoundsContainPageScale(
|
| bool bounds_contain_page_scale) {
|
| - return layer_->layer()->setBoundsContainPageScale(bounds_contain_page_scale);
|
| + return layer_->layer()->SetBoundsContainPageScale(bounds_contain_page_scale);
|
| }
|
|
|
| bool WebContentLayerImpl::boundsContainPageScale() const {
|
| - return layer_->layer()->boundsContainPageScale();
|
| + return layer_->layer()->bounds_contain_page_scale();
|
| }
|
|
|
| void WebContentLayerImpl::setAutomaticallyComputeRasterScale(bool automatic) {
|
| - layer_->layer()->setAutomaticallyComputeRasterScale(automatic);
|
| + layer_->layer()->SetAutomaticallyComputeRasterScale(automatic);
|
| }
|
|
|
| // TODO(alokp): Remove this function from WebContentLayer API.
|
| void WebContentLayerImpl::setUseLCDText(bool enable) {}
|
|
|
| void WebContentLayerImpl::setDrawCheckerboardForMissingTiles(bool enable) {
|
| - layer_->layer()->setDrawCheckerboardForMissingTiles(enable);
|
| + layer_->layer()->SetDrawCheckerboardForMissingTiles(enable);
|
| }
|
|
|
| void WebContentLayerImpl::paintContents(SkCanvas* canvas,
|
| @@ -73,7 +73,7 @@ void WebContentLayerImpl::paintContents(SkCanvas* canvas,
|
|
|
| WebFloatRect web_opaque;
|
| client_->paintContents(
|
| - canvas, clip, layer_->layer()->canUseLCDText(), web_opaque);
|
| + canvas, clip, layer_->layer()->can_use_lcd_text(), web_opaque);
|
| opaque = web_opaque;
|
| }
|
|
|
|
|