Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl.h

Issue 11413123: cc: switch to new WebLayerTreeViewClient API for requesting font atlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixing tests Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/compositor_bindings/web_layer_tree_view_impl.h
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.h b/webkit/compositor_bindings/web_layer_tree_view_impl.h
index 33c6eef4c5a2a6bdbed9746291d9fc84b0d7798e..dcd61f46db0b13976dea256b217d6e41106cfd8a 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.h
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.h
@@ -10,6 +10,7 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
namespace cc {
+class FontAtlas;
class LayerTreeHost;
class Thread;
}
@@ -51,8 +52,6 @@ public:
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.
@@ -69,6 +68,7 @@ public:
virtual void didCommitAndDrawFrame() OVERRIDE;
virtual void didCompleteSwapBuffers() OVERRIDE;
virtual void scheduleComposite() OVERRIDE;
+ virtual scoped_ptr<cc::FontAtlas> createFontAtlas();
private:
WebLayerTreeViewClient* m_client;

Powered by Google App Engine
This is Rietveld 408576698