| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 944 private: | 944 private: |
| 945 int num_draws_; | 945 int num_draws_; |
| 946 const gfx::Size bounds_; | 946 const gfx::Size bounds_; |
| 947 const gfx::Rect invalid_rect_; | 947 const gfx::Rect invalid_rect_; |
| 948 FakeContentLayerClient client_; | 948 FakeContentLayerClient client_; |
| 949 scoped_refptr<FakePictureLayer> root_layer_; | 949 scoped_refptr<FakePictureLayer> root_layer_; |
| 950 }; | 950 }; |
| 951 | 951 |
| 952 // As there's no pending tree in single-threaded case, this test should run | 952 // As there's no pending tree in single-threaded case, this test should run |
| 953 // only for multi-threaded case. | 953 // only for multi-threaded case. |
| 954 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged); | 954 // Multi-thread case is flaky too. Disabling pending resolution on |
| 955 // crbug.com/598491 |
| 956 // MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged); |
| 955 | 957 |
| 956 class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest { | 958 class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest { |
| 957 public: | 959 public: |
| 958 void InitializeSettings(LayerTreeSettings* settings) override { | 960 void InitializeSettings(LayerTreeSettings* settings) override { |
| 959 settings->layer_transforms_should_scale_layer_contents = true; | 961 settings->layer_transforms_should_scale_layer_contents = true; |
| 960 } | 962 } |
| 961 | 963 |
| 962 void SetupTree() override { | 964 void SetupTree() override { |
| 963 root_layer_ = Layer::Create(); | 965 root_layer_ = Layer::Create(); |
| 964 root_layer_->SetBounds(gfx::Size(10, 20)); | 966 root_layer_->SetBounds(gfx::Size(10, 20)); |
| (...skipping 5714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6679 EndTest(); | 6681 EndTest(); |
| 6680 } | 6682 } |
| 6681 | 6683 |
| 6682 void AfterTest() override {} | 6684 void AfterTest() override {} |
| 6683 }; | 6685 }; |
| 6684 | 6686 |
| 6685 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); | 6687 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); |
| 6686 | 6688 |
| 6687 } // namespace | 6689 } // namespace |
| 6688 } // namespace cc | 6690 } // namespace cc |
| OLD | NEW |