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 46 matching lines @@
 bool LayerTreeDebugState::showHudInfo() const
 {
     return showFPSCounter || showPlatformLayerTree || showHudRects();
 }
 
 bool LayerTreeDebugState::showHudRects() const
 {
     return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects || showNonOccludingRects;
 }
 
+bool LayerTreeDebugState::hudNeedsFont() const
+{
+    return showFPSCounter || showPlatformLayerTree;
+}
+
 bool LayerTreeDebugState::equal(const LayerTreeDebugState& a, const LayerTreeDebugState& b)
 {
     return memcmp(&a, &b, sizeof(LayerTreeDebugState)) == 0;
 }
 
 LayerTreeDebugState LayerTreeDebugState::unite(const LayerTreeDebugState& a, const LayerTreeDebugState& b)
 {
     LayerTreeDebugState r(a);
 
     r.showFPSCounter |= b.showFPSCounter;
@@ skipping 255 matching lines @@
     hostImpl->setViewportSize(layoutViewportSize(), deviceViewportSize());
     hostImpl->setDeviceScaleFactor(deviceScaleFactor());
     hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor);
     hostImpl->setBackgroundColor(m_backgroundColor);
     hostImpl->setHasTransparentBackground(m_hasTransparentBackground);
     hostImpl->setDebugState(m_debugState);
 
     m_commitNumber++;
 }
 
-void LayerTreeHost::createHUDLayerIfNeeded()
-{
-    if (!m_hudLayer)
-        m_hudLayer = HeadsUpDisplayLayer::create();
-}
-
-void LayerTreeHost::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas)
-{
-    createHUDLayerIfNeeded();
-    m_hudLayer->setFontAtlas(fontAtlas.Pass());
-}
-
 void LayerTreeHost::willCommit()

[egraether, 2012/11/30 21:27:56]

With LayerTreeDebugState and font atlas creation on demand it was possible to
put back all hudLayer logic into LayerTreeHost::willCommit().

 {
     m_client->willCommit();
 
-    if (m_debugState.showHudInfo())
-        createHUDLayerIfNeeded();
+    if (m_debugState.showHudInfo()) {
+        if (!m_hudLayer)
+            m_hudLayer = HeadsUpDisplayLayer::create();
 
-    if (m_rootLayer && m_hudLayer && !m_hudLayer->parent())
-        m_rootLayer->addChild(m_hudLayer);
+        if (m_debugState.hudNeedsFont() && !m_hudLayer->hasFontAtlas())
+            m_hudLayer->setFontAtlas(m_client->createFontAtlas());
+
+        if (m_rootLayer && !m_hudLayer->parent())
+            m_rootLayer->addChild(m_hudLayer);
+    } else if (m_hudLayer) {
+        m_hudLayer->removeFromParent();
+        m_hudLayer = 0;

[egraether, 2012/11/30 21:27:56]

The hudLayer gets released when no longer needed, the fontAtlas is lost as well
though.

+    }
 }
 
 void LayerTreeHost::commitComplete()
 {
     m_client->didCommit();
 }
 
 scoped_ptr<GraphicsContext> LayerTreeHost::createContext()
 {
     return m_client->createOutputSurface();
@@ skipping 535 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