cc: switch to new WebLayerTreeViewClient API for requesting font atlas

webkit/compositor_bindings/web_layer_tree_view_impl.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 "web_layer_tree_view_impl.h"
 
 #include "base/command_line.h"
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
@@ skipping 167 matching lines @@
         &static_cast<WebRenderingStatsImpl&>(stats).rendering_stats);
 }
 
 void WebLayerTreeViewImpl::setShowFPSCounter(bool show)
 {
     LayerTreeDebugState debugState = m_layerTreeHost->debugState();
     debugState.showFPSCounter = show;
     m_layerTreeHost->setDebugState(debugState);
 }
 
-void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight) {
-    setFontAtlas(asciiToWebRectTable, bitmap, fontHeight);
-}
+scoped_ptr<FontAtlas> WebLayerTreeViewImpl::createFontAtlas()
+{
+    int fontHeight;
+    WebRect asciiToWebRectTable[128];
+    gfx::Rect asciiToRectTable[128];
+    SkBitmap bitmap;
 
-void WebLayerTreeViewImpl::setFontAtlas(WebRect asciiToWebRectTable[128], const SkBitmap& bitmap, int fontHeight)
-{
-    gfx::Rect asciiToRectTable[128];
+    m_client->createFontAtlas(bitmap, asciiToWebRectTable, fontHeight);
+
     for (int i = 0; i < 128; ++i)
         asciiToRectTable[i] = asciiToWebRectTable[i];
-    scoped_ptr<FontAtlas> fontAtlas = FontAtlas::create(bitmap, asciiToRectTable, fontHeight);
-    m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
+
+    return FontAtlas::create(bitmap, asciiToRectTable, fontHeight).Pass();
 }
 
 void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)
 {
     m_layerTreeHost->loseContext(numTimes);
 }
 
 void WebLayerTreeViewImpl::willBeginFrame()
 {
     m_client->willBeginFrame();
@@ skipping 57 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit