cc: switch to new WebLayerTreeViewClient API for requesting font atlas

cc/layer_tree_host.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "cc/font_atlas.h"
@@ skipping 280 matching lines @@
 
     m_commitNumber++;
 }
 
 void LayerTreeHost::createHUDLayerIfNeeded()
 {
     if (!m_hudLayer)
         m_hudLayer = HeadsUpDisplayLayer::create();
 }
 
+void LayerTreeHost::createFontAtlasIfNeeded()
+{
+    if (m_hudLayer && !m_hudLayer->hasFontAtlas())
+        m_hudLayer->setFontAtlas(m_client->createFontAtlas());
+}
+
 void LayerTreeHost::setShowFPSCounter(bool show)
 {
     createHUDLayerIfNeeded();
+    createFontAtlasIfNeeded();

[jamesr, 2012/11/27 21:07:44]

will we ever get setShowFPSCounter(false) calls? we don't need the font atlas
unless the fps counter is actually being shown, right?

[egraether, 2012/11/27 21:49:22]

right, I'll add a check for that.
ATM there shouldn't be a show=false call unless there was a show=true call
before.

     m_hudLayer->setShowFPSCounter(show);
 }
 
-void LayerTreeHost::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
-{
-    createHUDLayerIfNeeded();
-    m_hudLayer->setFontAtlas(fontAtlas.Pass());
-}
-
 void LayerTreeHost::willCommit()
 {
     m_client->willCommit();
 
     if (m_settings.showDebugInfo())
         createHUDLayerIfNeeded();
 
+    if (m_settings.showPlatformLayerTree)
+        createFontAtlasIfNeeded();
+
     if (m_rootLayer && m_hudLayer && !m_hudLayer->parent())
         m_rootLayer->addChild(m_hudLayer);
 }
 
 void LayerTreeHost::commitComplete()
 {
     m_client->didCommit();
 }
 
 scoped_ptr<GraphicsContext> LayerTreeHost::createContext()
@@ skipping 525 matching lines @@
             else
                 layer->notifyAnimationFinished(wallClockTime.ToDoubleT());
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 }  // namespace cc