| Index: cc/layer_tree_host_common_unittest.cc
|
| diff --git a/cc/layer_tree_host_common_unittest.cc b/cc/layer_tree_host_common_unittest.cc
|
| index cf864f9f6b08799ce8290d76654e387b66b09bf8..42fb01e871e5fc239d2ad36479eda26b06621e72 100644
|
| --- a/cc/layer_tree_host_common_unittest.cc
|
| +++ b/cc/layer_tree_host_common_unittest.cc
|
| @@ -785,8 +785,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithD
|
| {
|
| // This test checks for correct scroll compensation when the fixed-position container
|
| // is the direct parent of the fixed-position layer.
|
| -
|
| - DebugScopedSetImplThread scopedImplThread;
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -826,8 +824,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithT
|
| // Transforms are in general non-commutative; using something like a non-uniform scale
|
| // helps to verify that translations and non-uniform scales are applied in the correct
|
| // order.
|
| -
|
| - DebugScopedSetImplThread scopedImplThread;
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -869,8 +865,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithD
|
| {
|
| // This test checks for correct scroll compensation when the fixed-position container
|
| // is NOT the direct parent of the fixed-position layer.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -913,8 +907,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithD
|
| // This test checks for correct scroll compensation when the fixed-position container
|
| // is NOT the direct parent of the fixed-position layer, and the hierarchy has various
|
| // transforms that have to be processed in the correct order.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -975,8 +967,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithM
|
| // This test checks for correct scroll compensation when the fixed-position container
|
| // is NOT the direct parent of the fixed-position layer, and the hierarchy has various
|
| // transforms that have to be processed in the correct order.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -1037,8 +1027,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithI
|
| // contributes to a different renderSurface than the fixed-position layer. In this
|
| // case, the surface drawTransforms also have to be accounted for when checking the
|
| // scrollDelta.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -1110,8 +1098,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithM
|
| // contributes to a different renderSurface than the fixed-position layer, with
|
| // additional renderSurfaces in-between. This checks that the conversion to ancestor
|
| // surfaces is accumulated properly in the final matrix transform.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -1221,8 +1207,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerWithC
|
| // itself has a renderSurface. In this case, the container layer should be treated
|
| // like a layer that contributes to a renderTarget, and that renderTarget
|
| // is completely irrelevant; it should not affect the scroll compensation.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -1268,8 +1252,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerThatI
|
| // This test checks the scenario where a fixed-position layer also happens to be a
|
| // container itself for a descendant fixed position layer. In particular, the layer
|
| // should not accidentally be fixed to itself.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -1305,8 +1287,6 @@ TEST(LayerTreeHostCommonTest, verifyScrollCompensationForFixedPositionLayerThatH
|
| // This test checks scroll compensation when a fixed-position layer does not find any
|
| // ancestor that is a "containerForFixedPositionLayers". In this situation, the layer should
|
| // be fixed to the viewport -- not the rootLayer, which may have transforms of its own.
|
| - DebugScopedSetImplThread scopedImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = createTreeForFixedPositionTests();
|
| LayerImpl* child = root->children()[0];
|
| LayerImpl* grandChild = child->children()[0];
|
| @@ -2678,8 +2658,6 @@ TEST(LayerTreeHostCommonTest, verifyBackFaceCullingWithPreserves3dForFlatteningS
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForEmptyLayerList)
|
| {
|
| // Hit testing on an empty renderSurfaceLayerList should return a null pointer.
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| std::vector<LayerImpl*> renderSurfaceLayerList;
|
|
|
| IntPoint testPoint(0, 0);
|
| @@ -2693,8 +2671,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForEmptyLayerList)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForSingleLayer)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(12345);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -2735,8 +2711,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForSingleLayer)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForUninvertibleTransform)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(12345);
|
|
|
| WebTransformationMatrix uninvertibleTransform;
|
| @@ -2796,8 +2770,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForUninvertibleTransform)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForSinglePositionedLayer)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(12345);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -2839,8 +2811,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForSinglePositionedLayer)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForSingleRotatedLayer)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(12345);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -2890,8 +2860,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForSingleRotatedLayer)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForSinglePerspectiveLayer)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(12345);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -2952,8 +2920,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForSingleLayerWithScaledContents)
|
| // contentsScale is ignored, then hit testing will mis-interpret the visibleContentRect
|
| // as being larger than the actual bounds of the layer.
|
| //
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(1);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -3014,8 +2980,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForSimpleClippedLayer)
|
| {
|
| // Test that hit-testing will only work for the visible portion of a layer, and not
|
| // the entire layer bounds. Here we just test the simple axis-aligned case.
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| WebTransformationMatrix identityMatrix;
|
| FloatPoint anchor(0, 0);
|
|
|
| @@ -3082,8 +3046,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForMultiClippedRotatedLayer)
|
| // combined create a triangle. The rotatedLeaf will only be visible where it overlaps
|
| // this triangle.
|
| //
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(123);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -3182,8 +3144,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForNonClippingIntermediateLayer)
|
| {
|
| // This test checks that hit testing code does not accidentally clip to layer
|
| // bounds for a layer that actually does not clip.
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| WebTransformationMatrix identityMatrix;
|
| FloatPoint anchor(0, 0);
|
|
|
| @@ -3243,8 +3203,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForNonClippingIntermediateLayer)
|
|
|
| TEST(LayerTreeHostCommonTest, verifyHitTestingForMultipleLayers)
|
| {
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(1);
|
|
|
| WebTransformationMatrix identityMatrix;
|
| @@ -3348,8 +3306,6 @@ TEST(LayerTreeHostCommonTest, verifyHitTestingForMultipleLayerLists)
|
| // The geometry is set up similarly to the previous case, but
|
| // all layers are forced to be renderSurfaces now.
|
| //
|
| - DebugScopedSetImplThread thisScopeIsOnImplThread;
|
| -
|
| scoped_ptr<LayerImpl> root = LayerImpl::create(1);
|
|
|
| WebTransformationMatrix identityMatrix;
|
|
|