diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
| commit | 96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch) | |
| tree | 4332d128a05777ae34641ca2f185b7b548330b8d /cc/texture_layer.cc | |
| parent | 1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff) | |
| download | chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2 | |
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/
TBR=jam@chromium.org,jamesr@chromium.org
BUG=155413
Review URL: https://codereview.chromium.org/11231054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_layer.cc')
| -rw-r--r-- | cc/texture_layer.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/cc/texture_layer.cc b/cc/texture_layer.cc index 7bd258d..89fc68b 100644 --- a/cc/texture_layer.cc +++ b/cc/texture_layer.cc @@ -13,13 +13,13 @@ namespace cc { -scoped_refptr<TextureLayerChromium> TextureLayerChromium::create(TextureLayerChromiumClient* client) +scoped_refptr<TextureLayer> TextureLayer::create(TextureLayerClient* client) { - return scoped_refptr<TextureLayerChromium>(new TextureLayerChromium(client)); + return scoped_refptr<TextureLayer>(new TextureLayer(client)); } -TextureLayerChromium::TextureLayerChromium(TextureLayerChromiumClient* client) - : LayerChromium() +TextureLayer::TextureLayer(TextureLayerClient* client) + : Layer() , m_client(client) , m_flipped(true) , m_uvRect(0, 0, 1, 1) @@ -30,7 +30,7 @@ TextureLayerChromium::TextureLayerChromium(TextureLayerChromiumClient* client) { } -TextureLayerChromium::~TextureLayerChromium() +TextureLayer::~TextureLayer() { if (layerTreeHost()) { if (m_textureId) @@ -40,30 +40,30 @@ TextureLayerChromium::~TextureLayerChromium() } } -scoped_ptr<CCLayerImpl> TextureLayerChromium::createCCLayerImpl() +scoped_ptr<LayerImpl> TextureLayer::createLayerImpl() { - return CCTextureLayerImpl::create(m_layerId).PassAs<CCLayerImpl>(); + return TextureLayerImpl::create(m_layerId).PassAs<LayerImpl>(); } -void TextureLayerChromium::setFlipped(bool flipped) +void TextureLayer::setFlipped(bool flipped) { m_flipped = flipped; setNeedsCommit(); } -void TextureLayerChromium::setUVRect(const FloatRect& rect) +void TextureLayer::setUVRect(const FloatRect& rect) { m_uvRect = rect; setNeedsCommit(); } -void TextureLayerChromium::setPremultipliedAlpha(bool premultipliedAlpha) +void TextureLayer::setPremultipliedAlpha(bool premultipliedAlpha) { m_premultipliedAlpha = premultipliedAlpha; setNeedsCommit(); } -void TextureLayerChromium::setRateLimitContext(bool rateLimit) +void TextureLayer::setRateLimitContext(bool rateLimit) { if (!rateLimit && m_rateLimitContext && m_client && layerTreeHost()) layerTreeHost()->stopRateLimiter(m_client->context()); @@ -71,7 +71,7 @@ void TextureLayerChromium::setRateLimitContext(bool rateLimit) m_rateLimitContext = rateLimit; } -void TextureLayerChromium::setTextureId(unsigned id) +void TextureLayer::setTextureId(unsigned id) { if (m_textureId == id) return; @@ -81,33 +81,33 @@ void TextureLayerChromium::setTextureId(unsigned id) setNeedsCommit(); } -void TextureLayerChromium::willModifyTexture() +void TextureLayer::willModifyTexture() { if (layerTreeHost()) layerTreeHost()->acquireLayerTextures(); } -void TextureLayerChromium::setNeedsDisplayRect(const FloatRect& dirtyRect) +void TextureLayer::setNeedsDisplayRect(const FloatRect& dirtyRect) { - LayerChromium::setNeedsDisplayRect(dirtyRect); + Layer::setNeedsDisplayRect(dirtyRect); if (m_rateLimitContext && m_client && layerTreeHost()) layerTreeHost()->startRateLimiter(m_client->context()); } -void TextureLayerChromium::setLayerTreeHost(CCLayerTreeHost* host) +void TextureLayer::setLayerTreeHost(LayerTreeHost* host) { if (m_textureId && layerTreeHost() && host != layerTreeHost()) layerTreeHost()->acquireLayerTextures(); - LayerChromium::setLayerTreeHost(host); + Layer::setLayerTreeHost(host); } -bool TextureLayerChromium::drawsContent() const +bool TextureLayer::drawsContent() const { - return (m_client || m_textureId) && !m_contextLost && LayerChromium::drawsContent(); + return (m_client || m_textureId) && !m_contextLost && Layer::drawsContent(); } -void TextureLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats&) +void TextureLayer::update(TextureUpdateQueue& queue, const OcclusionTracker*, RenderingStats&) { if (m_client) { m_textureId = m_client->prepareTexture(queue); @@ -117,11 +117,11 @@ void TextureLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusion m_needsDisplay = false; } -void TextureLayerChromium::pushPropertiesTo(CCLayerImpl* layer) +void TextureLayer::pushPropertiesTo(LayerImpl* layer) { - LayerChromium::pushPropertiesTo(layer); + Layer::pushPropertiesTo(layer); - CCTextureLayerImpl* textureLayer = static_cast<CCTextureLayerImpl*>(layer); + TextureLayerImpl* textureLayer = static_cast<TextureLayerImpl*>(layer); textureLayer->setFlipped(m_flipped); textureLayer->setUVRect(m_uvRect); textureLayer->setPremultipliedAlpha(m_premultipliedAlpha); |