Revert "cc: Rename cc classes and members to match filenames"

This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 14 deletions

diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc
index f767d93..5e0439a 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/heads_up_display_layer.cc
@@ -12,25 +12,25 @@
 
 namespace cc {
 
-scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create()
+scoped_refptr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
 {
-    return make_scoped_refptr(new HeadsUpDisplayLayer());
+    return make_scoped_refptr(new HeadsUpDisplayLayerChromium());
 }
 
-HeadsUpDisplayLayer::HeadsUpDisplayLayer()
-    : Layer()
+HeadsUpDisplayLayerChromium::HeadsUpDisplayLayerChromium()
+    : LayerChromium()
 {
 
     setBounds(IntSize(512, 128));
 }
 
-HeadsUpDisplayLayer::~HeadsUpDisplayLayer()
+HeadsUpDisplayLayerChromium::~HeadsUpDisplayLayerChromium()
 {
 }
 
-void HeadsUpDisplayLayer::update(TextureUpdateQueue&, const OcclusionTracker*, RenderingStats&)
+void HeadsUpDisplayLayerChromium::update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&)
 {
-    const LayerTreeSettings& settings = layerTreeHost()->settings();
+    const CCLayerTreeSettings& settings = layerTreeHost()->settings();
     int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
 
     IntSize bounds;
@@ -45,30 +45,30 @@ void HeadsUpDisplayLayer::update(TextureUpdateQueue&, const OcclusionTracker*, R
     setBounds(bounds);
 }
 
-bool HeadsUpDisplayLayer::drawsContent() const
+bool HeadsUpDisplayLayerChromium::drawsContent() const
 {
     return true;
 }
 
-void HeadsUpDisplayLayer::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
+void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
     m_fontAtlas = fontAtlas.Pass();
     setNeedsCommit();
 }
 
-scoped_ptr<LayerImpl> HeadsUpDisplayLayer::createLayerImpl()
+scoped_ptr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl()
 {
-    return HeadsUpDisplayLayerImpl::create(m_layerId).PassAs<LayerImpl>();
+    return CCHeadsUpDisplayLayerImpl::create(m_layerId).PassAs<CCLayerImpl>();
 }
 
-void HeadsUpDisplayLayer::pushPropertiesTo(LayerImpl* layerImpl)
+void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
 {
-    Layer::pushPropertiesTo(layerImpl);
+    LayerChromium::pushPropertiesTo(layerImpl);
 
     if (!m_fontAtlas.get())
         return;
 
-    HeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<HeadsUpDisplayLayerImpl*>(layerImpl);
+    CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
     hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
 }