OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/compositor/layer.h" | 5 #include "ui/compositor/layer.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 2198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2209 | 2209 |
2210 private: | 2210 private: |
2211 bool report_called_ = false; | 2211 bool report_called_ = false; |
2212 int value_ = -1; | 2212 int value_ = -1; |
2213 | 2213 |
2214 DISALLOW_COPY_AND_ASSIGN(TestMetricsReporter); | 2214 DISALLOW_COPY_AND_ASSIGN(TestMetricsReporter); |
2215 }; | 2215 }; |
2216 | 2216 |
2217 // Starts an animation and tests that incrementing compositor frame count can | 2217 // Starts an animation and tests that incrementing compositor frame count can |
2218 // be used to report animation smoothness metrics. | 2218 // be used to report animation smoothness metrics. |
2219 TEST_F(LayerWithRealCompositorTest, ReportMetrics) { | 2219 // Flaky test crbug.com/709080 |
| 2220 TEST_F(LayerWithRealCompositorTest, DISABLED_ReportMetrics) { |
2220 std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR)); | 2221 std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR)); |
2221 GetCompositor()->SetRootLayer(root.get()); | 2222 GetCompositor()->SetRootLayer(root.get()); |
2222 LayerAnimator* animator = root->GetAnimator(); | 2223 LayerAnimator* animator = root->GetAnimator(); |
2223 std::unique_ptr<ui::LayerAnimationElement> animation_element = | 2224 std::unique_ptr<ui::LayerAnimationElement> animation_element = |
2224 ui::LayerAnimationElement::CreateColorElement( | 2225 ui::LayerAnimationElement::CreateColorElement( |
2225 SK_ColorRED, base::TimeDelta::FromMilliseconds(100)); | 2226 SK_ColorRED, base::TimeDelta::FromMilliseconds(100)); |
2226 ui::LayerAnimationSequence* animation_sequence = | 2227 ui::LayerAnimationSequence* animation_sequence = |
2227 new ui::LayerAnimationSequence(std::move(animation_element)); | 2228 new ui::LayerAnimationSequence(std::move(animation_element)); |
2228 TestMetricsReporter reporter; | 2229 TestMetricsReporter reporter; |
2229 animation_sequence->SetAnimationMetricsReporter(&reporter); | 2230 animation_sequence->SetAnimationMetricsReporter(&reporter); |
(...skipping 12 matching lines...) Expand all Loading... |
2242 layer.set_name("foo"); | 2243 layer.set_name("foo"); |
2243 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info = | 2244 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> debug_info = |
2244 layer.TakeDebugInfo(nullptr); | 2245 layer.TakeDebugInfo(nullptr); |
2245 std::string trace_format("bar,"); | 2246 std::string trace_format("bar,"); |
2246 debug_info->AppendAsTraceFormat(&trace_format); | 2247 debug_info->AppendAsTraceFormat(&trace_format); |
2247 std::string expected("bar,{\"layer_name\":\"foo\"}"); | 2248 std::string expected("bar,{\"layer_name\":\"foo\"}"); |
2248 EXPECT_EQ(expected, trace_format); | 2249 EXPECT_EQ(expected, trace_format); |
2249 } | 2250 } |
2250 | 2251 |
2251 } // namespace ui | 2252 } // namespace ui |
OLD | NEW |