| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 ended_ = true; | 347 ended_ = true; |
| 348 } | 348 } |
| 349 | 349 |
| 350 virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE { | 350 virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE { |
| 351 aborted_ = true; | 351 aborted_ = true; |
| 352 } | 352 } |
| 353 | 353 |
| 354 virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE { | 354 virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE { |
| 355 } | 355 } |
| 356 | 356 |
| 357 virtual void OnUpdateVSyncParameters(Compositor* compositor, |
| 358 base::TimeTicks timebase, |
| 359 base::TimeDelta interval) OVERRIDE { |
| 360 } |
| 361 |
| 357 bool committed_; | 362 bool committed_; |
| 358 bool started_; | 363 bool started_; |
| 359 bool ended_; | 364 bool ended_; |
| 360 bool aborted_; | 365 bool aborted_; |
| 361 | 366 |
| 362 DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver); | 367 DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver); |
| 363 }; | 368 }; |
| 364 | 369 |
| 365 } // namespace | 370 } // namespace |
| 366 | 371 |
| (...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1511 l1->SetOpacity(0.5f); | 1516 l1->SetOpacity(0.5f); |
| 1512 | 1517 |
| 1513 // Change l1's cc::Layer. | 1518 // Change l1's cc::Layer. |
| 1514 l1->SwitchCCLayerForTest(); | 1519 l1->SwitchCCLayerForTest(); |
| 1515 | 1520 |
| 1516 // Ensure that the opacity animation completed. | 1521 // Ensure that the opacity animation completed. |
| 1517 EXPECT_FLOAT_EQ(l1->opacity(), 0.5f); | 1522 EXPECT_FLOAT_EQ(l1->opacity(), 0.5f); |
| 1518 } | 1523 } |
| 1519 | 1524 |
| 1520 } // namespace ui | 1525 } // namespace ui |
| OLD | NEW |