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

Unified Diff: cc/texture_layer_impl.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings Created 7 years, 9 months 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
« no previous file with comments | « cc/texture_layer_impl.h ('k') | cc/texture_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_layer_impl.cc
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index f8eca45cf09f330af5697ce4085b8711b441de7e..9fa513cee88f56f3d445baa827b9f1bc83684b62 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -43,14 +43,14 @@ void TextureLayerImpl::setTextureMailbox(const TextureMailbox& mailbox)
m_ownMailbox = true;
}
-scoped_ptr<LayerImpl> TextureLayerImpl::createLayerImpl(LayerTreeImpl* treeImpl)
+scoped_ptr<LayerImpl> TextureLayerImpl::CreateLayerImpl(LayerTreeImpl* treeImpl)
{
- return TextureLayerImpl::create(treeImpl, id(), m_usesMailbox).PassAs<LayerImpl>();
+ return TextureLayerImpl::Create(treeImpl, id(), m_usesMailbox).PassAs<LayerImpl>();
}
-void TextureLayerImpl::pushPropertiesTo(LayerImpl* layer)
+void TextureLayerImpl::PushPropertiesTo(LayerImpl* layer)
{
- LayerImpl::pushPropertiesTo(layer);
+ LayerImpl::PushPropertiesTo(layer);
TextureLayerImpl* textureLayer = static_cast<TextureLayerImpl*>(layer);
textureLayer->setFlipped(m_flipped);
@@ -67,7 +67,7 @@ void TextureLayerImpl::pushPropertiesTo(LayerImpl* layer)
}
-void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider)
+void TextureLayerImpl::WillDraw(ResourceProvider* resourceProvider)
{
if (m_usesMailbox || !m_textureId)
return;
@@ -75,16 +75,16 @@ void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider)
m_externalTextureResource = resourceProvider->CreateResourceFromExternalTexture(m_textureId);
}
-void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
+void TextureLayerImpl::AppendQuads(QuadSink* quadSink, AppendQuadsData* appendQuadsData)
{
if (!m_externalTextureResource)
return;
- SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
- appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
+ SharedQuadState* sharedQuadState = quadSink->useSharedQuadState(CreateSharedQuadState());
+ AppendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
- gfx::Rect quadRect(gfx::Point(), contentBounds());
- gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect());
+ gfx::Rect quadRect(content_bounds());
+ gfx::Rect opaqueRect(contents_opaque() ? quadRect : gfx::Rect());
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResource, m_premultipliedAlpha, m_uvTopLeft, m_uvBottomRight, m_vertexOpacity, m_flipped);
@@ -92,10 +92,10 @@ void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu
if (sharedQuadState->is_clipped && quad->PerformClipping())
sharedQuadState->is_clipped = false;
if (!quad->rect.IsEmpty())
- quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
+ quadSink->append(quad.PassAs<DrawQuad>(), appendQuadsData);
}
-void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider)
+void TextureLayerImpl::DidDraw(ResourceProvider* resourceProvider)
{
if (m_usesMailbox || !m_externalTextureResource)
return;
@@ -107,11 +107,11 @@ void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider)
m_externalTextureResource = 0;
}
-void TextureLayerImpl::dumpLayerProperties(std::string* str, int indent) const
+void TextureLayerImpl::DumpLayerProperties(std::string* str, int indent) const
{
- str->append(indentString(indent));
+ str->append(IndentString(indent));
base::StringAppendF(str, "texture layer texture id: %u premultiplied: %d\n", m_textureId, m_premultipliedAlpha);
- LayerImpl::dumpLayerProperties(str, indent);
+ LayerImpl::DumpLayerProperties(str, indent);
}
void TextureLayerImpl::setVertexOpacity(const float vertexOpacity[4]) {
@@ -121,28 +121,28 @@ void TextureLayerImpl::setVertexOpacity(const float vertexOpacity[4]) {
m_vertexOpacity[3] = vertexOpacity[3];
}
-void TextureLayerImpl::didLoseOutputSurface()
+void TextureLayerImpl::DidLoseOutputSurface()
{
m_textureId = 0;
m_externalTextureResource = 0;
}
-const char* TextureLayerImpl::layerTypeAsString() const
+const char* TextureLayerImpl::LayerTypeAsString() const
{
return "TextureLayer";
}
-bool TextureLayerImpl::canClipSelf() const
+bool TextureLayerImpl::CanClipSelf() const
{
return true;
}
-void TextureLayerImpl::didBecomeActive()
+void TextureLayerImpl::DidBecomeActive()
{
if (!m_ownMailbox)
return;
DCHECK(!m_externalTextureResource);
- ResourceProvider* resourceProvider = layerTreeImpl()->resource_provider();
+ ResourceProvider* resourceProvider = layer_tree_impl()->resource_provider();
if (!m_textureMailbox.IsEmpty())
m_externalTextureResource = resourceProvider->CreateResourceFromTextureMailbox(m_textureMailbox);
m_ownMailbox = false;
@@ -157,7 +157,7 @@ void TextureLayerImpl::freeTextureMailbox()
m_textureMailbox.RunReleaseCallback(m_textureMailbox.sync_point());
} else if (m_externalTextureResource) {
DCHECK(!m_ownMailbox);
- ResourceProvider* resourceProvider = layerTreeImpl()->resource_provider();
+ ResourceProvider* resourceProvider = layer_tree_impl()->resource_provider();
resourceProvider->DeleteResource(m_externalTextureResource);
m_externalTextureResource = 0;
}
« no previous file with comments | « cc/texture_layer_impl.h ('k') | cc/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698