| OLD | NEW | 
|---|
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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 "cc/texture_layer.h" | 5 #include "cc/texture_layer.h" | 
| 6 | 6 | 
| 7 #include "cc/layer_tree_host.h" | 7 #include "cc/layer_tree_host.h" | 
| 8 #include "cc/texture_layer_client.h" | 8 #include "cc/texture_layer_client.h" | 
| 9 #include "cc/texture_layer_impl.h" | 9 #include "cc/texture_layer_impl.h" | 
| 10 #include "cc/thread.h" | 10 #include "cc/thread.h" | 
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 155     if (m_textureId && layerTreeHost() && host != layerTreeHost()) | 155     if (m_textureId && layerTreeHost() && host != layerTreeHost()) | 
| 156         layerTreeHost()->acquireLayerTextures(); | 156         layerTreeHost()->acquireLayerTextures(); | 
| 157     Layer::setLayerTreeHost(host); | 157     Layer::setLayerTreeHost(host); | 
| 158 } | 158 } | 
| 159 | 159 | 
| 160 bool TextureLayer::drawsContent() const | 160 bool TextureLayer::drawsContent() const | 
| 161 { | 161 { | 
| 162     return (m_client || m_textureId || !m_textureMailbox.IsEmpty()) && !m_contex
     tLost && Layer::drawsContent(); | 162     return (m_client || m_textureId || !m_textureMailbox.IsEmpty()) && !m_contex
     tLost && Layer::drawsContent(); | 
| 163 } | 163 } | 
| 164 | 164 | 
| 165 void TextureLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker*, R
     enderingStats&) | 165 void TextureLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker*, R
     enderingStats*) | 
| 166 { | 166 { | 
| 167     if (m_client) { | 167     if (m_client) { | 
| 168         m_textureId = m_client->prepareTexture(queue); | 168         m_textureId = m_client->prepareTexture(queue); | 
| 169         m_contextLost = m_client->context()->getGraphicsResetStatusARB() != GL_N
     O_ERROR; | 169         m_contextLost = m_client->context()->getGraphicsResetStatusARB() != GL_N
     O_ERROR; | 
| 170     } | 170     } | 
| 171 | 171 | 
| 172     m_needsDisplay = false; | 172     m_needsDisplay = false; | 
| 173 } | 173 } | 
| 174 | 174 | 
| 175 void TextureLayer::pushPropertiesTo(LayerImpl* layer) | 175 void TextureLayer::pushPropertiesTo(LayerImpl* layer) | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 201     // can block too for simplicity. | 201     // can block too for simplicity. | 
| 202     return drawsContent(); | 202     return drawsContent(); | 
| 203 } | 203 } | 
| 204 | 204 | 
| 205 bool TextureLayer::canClipSelf() const | 205 bool TextureLayer::canClipSelf() const | 
| 206 { | 206 { | 
| 207     return true; | 207     return true; | 
| 208 } | 208 } | 
| 209 | 209 | 
| 210 }  // namespace cc | 210 }  // namespace cc | 
| OLD | NEW | 
|---|