| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "HeadsUpDisplayLayerChromium.h" | 7 #include "HeadsUpDisplayLayerChromium.h" |
| 8 | 8 |
| 9 #include "CCHeadsUpDisplayLayerImpl.h" | 9 #include "CCHeadsUpDisplayLayerImpl.h" |
| 10 #include "CCLayerTreeHost.h" | 10 #include "CCLayerTreeHost.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 { | 49 { |
| 50 return true; | 50 return true; |
| 51 } | 51 } |
| 52 | 52 |
| 53 void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas
) | 53 void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas
) |
| 54 { | 54 { |
| 55 m_fontAtlas = fontAtlas.Pass(); | 55 m_fontAtlas = fontAtlas.Pass(); |
| 56 setNeedsCommit(); | 56 setNeedsCommit(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 PassOwnPtr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl() | 59 scoped_ptr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl() |
| 60 { | 60 { |
| 61 return CCHeadsUpDisplayLayerImpl::create(m_layerId); | 61 return CCHeadsUpDisplayLayerImpl::create(m_layerId).PassAs<CCLayerImpl>(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl) | 64 void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl) |
| 65 { | 65 { |
| 66 LayerChromium::pushPropertiesTo(layerImpl); | 66 LayerChromium::pushPropertiesTo(layerImpl); |
| 67 | 67 |
| 68 if (!m_fontAtlas.get()) | 68 if (!m_fontAtlas.get()) |
| 69 return; | 69 return; |
| 70 | 70 |
| 71 CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerI
mpl*>(layerImpl); | 71 CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerI
mpl*>(layerImpl); |
| 72 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass()); | 72 hudLayerImpl->setFontAtlas(m_fontAtlas.Pass()); |
| 73 } | 73 } |
| 74 | 74 |
| 75 } | 75 } |
| OLD | NEW |