summaryrefslogtreecommitdiffstats
path: root/cc/heads_up_display_layer.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 23:09:55 +0000
commit96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch)
tree4332d128a05777ae34641ca2f185b7b548330b8d /cc/heads_up_display_layer.cc
parent1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff)
downloadchromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz
chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/ TBR=jam@chromium.org,jamesr@chromium.org BUG=155413 Review URL: https://codereview.chromium.org/11231054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/heads_up_display_layer.cc')
-rw-r--r--cc/heads_up_display_layer.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index 5e0439a..f767d93 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -12,25 +12,25 @@
namespace cc {
-scoped_refptr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
+scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()
{
- return make_scoped_refptr(new HeadsUpDisplayLayerChromium());
+ return make_scoped_refptr(new HeadsUpDisplayLayer());
}
-HeadsUpDisplayLayerChromium::HeadsUpDisplayLayerChromium()
- : LayerChromium()
+HeadsUpDisplayLayer::HeadsUpDisplayLayer()
+ : Layer()
{
setBounds(IntSize(512, 128));
}
-HeadsUpDisplayLayerChromium::~HeadsUpDisplayLayerChromium()
+HeadsUpDisplayLayer::~HeadsUpDisplayLayer()
{
}
-void HeadsUpDisplayLayerChromium::update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&)
+void HeadsUpDisplayLayer::update(TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&)
{
- const CCLayerTreeSettings& settings = layerTreeHost()->settings();
+ const LayerTreeSettings& settings = layerTreeHost()->settings();
int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
IntSize bounds;
@@ -45,30 +45,30 @@ void HeadsUpDisplayLayerChromium::update(CCTextureUpdateQueue&, const CCOcclusio
setBounds(bounds);
}
-bool HeadsUpDisplayLayerChromium::drawsContent() const
+bool HeadsUpDisplayLayer::drawsContent() const
{
return true;
}
-void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
+void HeadsUpDisplayLayer::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
{
m_fontAtlas = fontAtlas.Pass();
setNeedsCommit();
}
-scoped_ptr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl()
+scoped_ptr<LayerImpl> HeadsUpDisplayLayer::createLayerImpl()
{
- return CCHeadsUpDisplayLayerImpl::create(m_layerId).PassAs<CCLayerImpl>();
+ return HeadsUpDisplayLayerImpl::create(m_layerId).PassAs<LayerImpl>();
}
-void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
+void HeadsUpDisplayLayer::pushPropertiesTo(LayerImpl* layerImpl)
{
- LayerChromium::pushPropertiesTo(layerImpl);
+ Layer::pushPropertiesTo(layerImpl);
if (!m_fontAtlas.get())
return;
- CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
+ HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
}