summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_common.h
diff options
context:
space:
mode:
authorenne <enne@chromium.org>2015-05-19 11:20:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-19 18:20:31 +0000
commit601f2ef11b664dfb8bffd8982de9d8afa560a8cc (patch)
tree61dda7dfa1d808cd304f291af977278b722d7db8 /cc/trees/layer_tree_host_common.h
parent4a8834a23af95d84a1fb0b0a02f729644312df23 (diff)
downloadchromium_src-601f2ef11b664dfb8bffd8982de9d8afa560a8cc.zip
chromium_src-601f2ef11b664dfb8bffd8982de9d8afa560a8cc.tar.gz
chromium_src-601f2ef11b664dfb8bffd8982de9d8afa560a8cc.tar.bz2
Fix cc unit tests that depend on verify_property_trees=true
A number of cc unit tests have started checking property tree output, primarily visible_rect_from_property_trees but also needs_rebuild on the trees. Because of this, these tests now depend on running the property tree code, so setting verify_property_trees=false forces these tests to run only CDP code which causes them to fail. Therefore, convert these specific tests to use property tree updates directly. This also requires a PrecalculateMetaInformation function for LayerImpl, as LayerTreeHostCommonTest.SkippingSubtreeImpl touched LayerImpl properties that could only theoretically be changed from the main thread. In the future, I think all layer tree host common tests will need to go down the property tree update path, but (in my opinion) it's not worth doing that until we have property trees everywhere. This patch is just a step in that direction to unblock property trees for the compositor thread first. R=ajuma@chromium.org,vollick@chromium.org BUG=481585 Review URL: https://codereview.chromium.org/1136643006 Cr-Commit-Position: refs/heads/master@{#330561}
Diffstat (limited to 'cc/trees/layer_tree_host_common.h')
-rw-r--r--cc/trees/layer_tree_host_common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 7d90445..e48741a 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -121,6 +121,7 @@ class CC_EXPORT LayerTreeHostCommon {
bool* animation_preserves_axis_alignment);
static void CalculateDrawProperties(CalcDrawPropsMainInputs* inputs);
static void PreCalculateMetaInformation(Layer* root_layer);
+ static void PreCalculateMetaInformationForTesting(LayerImpl* root_layer);
typedef CalcDrawPropsInputs<LayerImpl, LayerImplList> CalcDrawPropsImplInputs;
typedef CalcDrawPropsInputsForTesting<LayerImpl, LayerImplList>