diff options
author | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 00:42:41 +0000 |
---|---|---|
committer | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 00:42:41 +0000 |
commit | 27664a514b029b131906e4e8b2246f7afb5b34cd (patch) | |
tree | 83845269db9094f758c5d02a8c1f33e1878269c7 /cc/heads_up_display_layer.cc | |
parent | 9c52413002109eed3ac64b2ec6c258dd67b2d941 (diff) | |
download | chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.zip chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.tar.gz chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.tar.bz2 |
This change switches the compositor to the new WebLayerTreeViewClient::createFontAtlas() API. LayerTreeHost now manages whether a font atlas needs to be loaded.
commit order:
https://bugs.webkit.org/show_bug.cgi?id=102958
https://codereview.chromium.org/11413123
https://bugs.webkit.org/show_bug.cgi?id=102960
BUG=
Review URL: https://chromiumcodereview.appspot.com/11413123
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/heads_up_display_layer.cc')
-rw-r--r-- | cc/heads_up_display_layer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/heads_up_display_layer.cc b/cc/heads_up_display_layer.cc index 5f7ba23..b3d85cd 100644 --- a/cc/heads_up_display_layer.cc +++ b/cc/heads_up_display_layer.cc @@ -17,6 +17,7 @@ scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::create() HeadsUpDisplayLayer::HeadsUpDisplayLayer() : Layer() + , m_hasFontAtlas(false) { setBounds(gfx::Size(256, 128)); } @@ -55,7 +56,7 @@ bool HeadsUpDisplayLayer::drawsContent() const void HeadsUpDisplayLayer::setFontAtlas(scoped_ptr<FontAtlas> fontAtlas) { m_fontAtlas = fontAtlas.Pass(); - setNeedsCommit(); + m_hasFontAtlas = true; } scoped_ptr<LayerImpl> HeadsUpDisplayLayer::createLayerImpl() |