cc: switch to new WebLayerTreeViewClient API for requesting font atlas

webkit/compositor_bindings/web_layer_tree_view_impl.h

 // 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.
 
 #ifndef WebLayerTreeViewImpl_h
 #define WebLayerTreeViewImpl_h
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layer_tree_host_client.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
 
 namespace cc {
+class FontAtlas;
 class LayerTreeHost;
 class Thread;
 }
 
 namespace WebKit {
 class WebLayer;
 class WebLayerTreeViewClient;
 class WebLayerTreeViewClientAdapter;
 
 class WebLayerTreeViewImpl : public WebLayerTreeView, public cc::LayerTreeHostClient {
@@ skipping 21 matching lines @@
     virtual void setNeedsAnimate() OVERRIDE;
     virtual void setNeedsRedraw() OVERRIDE;
     virtual bool commitRequested() const OVERRIDE;
     virtual void composite() OVERRIDE;
     virtual void updateAnimations(double frameBeginTime) OVERRIDE;
     virtual bool compositeAndReadback(void *pixels, const WebRect&) OVERRIDE;
     virtual void finishAllRendering() OVERRIDE;
     virtual void setDeferCommits(bool deferCommits) OVERRIDE;
     virtual void renderingStats(WebRenderingStats&) const OVERRIDE;
     virtual void setShowFPSCounter(bool show);
-    virtual void setFontAtlas(SkBitmap, WebRect asciiToRectTable[128], int fontHeight);
-    virtual void setFontAtlas(WebRect asciiToRectTable[128], const SkBitmap&, int fontHeight);
     virtual void loseCompositorContext(int numTimes) OVERRIDE;
 
     // cc::LayerTreeHostClient implementation.
     virtual void willBeginFrame() OVERRIDE;
     virtual void didBeginFrame() OVERRIDE;
     virtual void animate(double monotonicFrameBeginTime) OVERRIDE;
     virtual void layout() OVERRIDE;
     virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float pageScale) OVERRIDE;
     virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRIDE;
     virtual void didRecreateOutputSurface(bool success) OVERRIDE;
     virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
     virtual void willCommit() OVERRIDE;
     virtual void didCommit() OVERRIDE;
     virtual void didCommitAndDrawFrame() OVERRIDE;
     virtual void didCompleteSwapBuffers() OVERRIDE;
     virtual void scheduleComposite() OVERRIDE;
+    virtual scoped_ptr<cc::FontAtlas> createFontAtlas();
 
 private:
     WebLayerTreeViewClient* m_client;
     scoped_ptr<cc::LayerTreeHost> m_layerTreeHost;
 };
 
 } // namespace WebKit
 
 #endif // WebLayerTreeViewImpl_h