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

Unified Diff: cc/layer_tree_host_common.h

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/layer_tree_host.cc ('k') | cc/layer_tree_host_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_common.h
diff --git a/cc/layer_tree_host_common.h b/cc/layer_tree_host_common.h
index 8d8e5d9e64c98eaa2b170935d8e76f8f35375d02..da4f527194cf8b1b3359f157141cbe317392958f 100644
--- a/cc/layer_tree_host_common.h
+++ b/cc/layer_tree_host_common.h
@@ -74,7 +74,7 @@ bool LayerTreeHostCommon::renderSurfaceContributesToTarget(LayerType* layer, int
//
// Otherwise, the layer just contributes itself to the target surface.
- return layer->renderSurface() && layer->id() != targetSurfaceLayerID;
+ return layer->render_surface() && layer->id() != targetSurfaceLayerID;
}
template<typename LayerType>
@@ -83,11 +83,11 @@ LayerType* LayerTreeHostCommon::findLayerInSubtree(LayerType* rootLayer, int lay
if (rootLayer->id() == layerId)
return rootLayer;
- if (rootLayer->maskLayer() && rootLayer->maskLayer()->id() == layerId)
- return rootLayer->maskLayer();
+ if (rootLayer->mask_layer() && rootLayer->mask_layer()->id() == layerId)
+ return rootLayer->mask_layer();
- if (rootLayer->replicaLayer() && rootLayer->replicaLayer()->id() == layerId)
- return rootLayer->replicaLayer();
+ if (rootLayer->replica_layer() && rootLayer->replica_layer()->id() == layerId)
+ return rootLayer->replica_layer();
for (size_t i = 0; i < rootLayer->children().size(); ++i) {
if (LayerType* found = findLayerInSubtree(getChildAsRawPtr(rootLayer->children(), i), layerId))
@@ -101,11 +101,11 @@ void LayerTreeHostCommon::callFunctionForSubtree(LayerType* rootLayer)
{
Function()(rootLayer);
- if (LayerType* maskLayer = rootLayer->maskLayer())
+ if (LayerType* maskLayer = rootLayer->mask_layer())
Function()(maskLayer);
- if (LayerType* replicaLayer = rootLayer->replicaLayer()) {
+ if (LayerType* replicaLayer = rootLayer->replica_layer()) {
Function()(replicaLayer);
- if (LayerType* maskLayer = replicaLayer->maskLayer())
+ if (LayerType* maskLayer = replicaLayer->mask_layer())
Function()(maskLayer);
}
« no previous file with comments | « cc/layer_tree_host.cc ('k') | cc/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698