summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 10:17:34 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-12 10:17:34 +0000
commit7aba66652cf8fe7e131d4638d00b574fc05526ee (patch)
tree0a1012dc37172ff9b276679c55d77c38c111f37a /content/renderer
parentb2720f159750fd54728b7ec0b9da8baed9ec4a83 (diff)
downloadchromium_src-7aba66652cf8fe7e131d4638d00b574fc05526ee.zip
chromium_src-7aba66652cf8fe7e131d4638d00b574fc05526ee.tar.gz
chromium_src-7aba66652cf8fe7e131d4638d00b574fc05526ee.tar.bz2
cc: Chromify Layer and LayerImpl classes.
Style-only change. Bring the Layer and LayerImpl classes into the Chromium style. R=enne,piman,jamesr TBR=joth Review URL: https://chromiumcodereview.appspot.com/12774006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/browser_plugin/browser_plugin_compositing_helper.cc18
-rw-r--r--content/renderer/gpu/render_widget_compositor.cc2
2 files changed, 10 insertions, 10 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
index 88c3d5c..2e41493 100644
--- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
+++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
@@ -40,15 +40,15 @@ BrowserPluginCompositingHelper::~BrowserPluginCompositingHelper() {
void BrowserPluginCompositingHelper::EnableCompositing(bool enable) {
if (enable && !texture_layer_) {
- texture_layer_ = cc::TextureLayer::createForMailbox();
- texture_layer_->setIsDrawable(true);
- texture_layer_->setContentsOpaque(true);
+ texture_layer_ = cc::TextureLayer::CreateForMailbox();
+ texture_layer_->SetIsDrawable(true);
+ texture_layer_->SetContentsOpaque(true);
background_layer_ = cc::SolidColorLayer::Create();
- background_layer_->setMasksToBounds(true);
- background_layer_->setBackgroundColor(
+ background_layer_->SetMasksToBounds(true);
+ background_layer_->SetBackgroundColor(
SkColorSetARGBInline(255, 255, 255, 255));
- background_layer_->addChild(texture_layer_);
+ background_layer_->AddChild(texture_layer_);
web_layer_.reset(new WebKit::WebLayerImpl(background_layer_));
}
@@ -200,7 +200,7 @@ void BrowserPluginCompositingHelper::OnBuffersSwapped(
// it by the device scale factor.
gfx::Size device_scale_adjusted_size = gfx::ToFlooredSize(
gfx::ScaleSize(buffer_size_, 1.0f / device_scale_factor));
- texture_layer_->setBounds(device_scale_adjusted_size);
+ texture_layer_->SetBounds(device_scale_adjusted_size);
}
bool current_mailbox_valid = !mailbox_name.empty();
@@ -220,13 +220,13 @@ void BrowserPluginCompositingHelper::OnBuffersSwapped(
}
texture_layer_->setTextureMailbox(cc::TextureMailbox(mailbox_name,
callback));
- texture_layer_->setNeedsDisplay();
+ texture_layer_->SetNeedsDisplay();
last_mailbox_valid_ = current_mailbox_valid;
}
void BrowserPluginCompositingHelper::UpdateVisibility(bool visible) {
if (texture_layer_)
- texture_layer_->setIsDrawable(visible);
+ texture_layer_->SetIsDrawable(visible);
}
} // namespace content
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 0573a73..de7b6f8 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -395,7 +395,7 @@ void RenderWidgetCompositor::didStopFlinging() {
void RenderWidgetCompositor::registerForAnimations(WebKit::WebLayer* layer) {
cc::Layer* cc_layer = static_cast<WebKit::WebLayerImpl*>(layer)->layer();
- cc_layer->layerAnimationController()->SetAnimationRegistrar(
+ cc_layer->layer_animation_controller()->SetAnimationRegistrar(
layer_tree_host_->animationRegistrar());
}