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/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 bool aborted() const { return aborted_; } | 330 bool aborted() const { return aborted_; } |
331 | 331 |
332 void Reset() { | 332 void Reset() { |
333 will_start_ = false; | 333 will_start_ = false; |
334 started_ = false; | 334 started_ = false; |
335 ended_ = false; | 335 ended_ = false; |
336 aborted_ = false; | 336 aborted_ = false; |
337 } | 337 } |
338 | 338 |
339 private: | 339 private: |
| 340 virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE { |
| 341 } |
| 342 |
340 virtual void OnCompositingWillStart(Compositor* compositor) OVERRIDE { | 343 virtual void OnCompositingWillStart(Compositor* compositor) OVERRIDE { |
341 will_start_ = true; | 344 will_start_ = true; |
342 } | 345 } |
343 | 346 |
344 virtual void OnCompositingStarted(Compositor* compositor) OVERRIDE { | 347 virtual void OnCompositingStarted(Compositor* compositor) OVERRIDE { |
345 started_ = true; | 348 started_ = true; |
346 } | 349 } |
347 | 350 |
348 virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE { | 351 virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE { |
349 ended_ = true; | 352 ended_ = true; |
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1296 | 1299 |
1297 // Resize layer. | 1300 // Resize layer. |
1298 child->SetBounds(gfx::Rect(200, 200, 400, 400)); | 1301 child->SetBounds(gfx::Rect(200, 200, 400, 400)); |
1299 child->SetVisible(true); | 1302 child->SetVisible(true); |
1300 EXPECT_TRUE(schedule_draw_invoked_); | 1303 EXPECT_TRUE(schedule_draw_invoked_); |
1301 DrawTree(root.get()); | 1304 DrawTree(root.get()); |
1302 EXPECT_TRUE(delegate.painted()); | 1305 EXPECT_TRUE(delegate.painted()); |
1303 } | 1306 } |
1304 | 1307 |
1305 } // namespace ui | 1308 } // namespace ui |
OLD | NEW |