Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: ui/compositor/layer_unittest.cc

Issue 859423002: Explicitly specify the ui::Compositor to DelegatedFrameHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use compositor Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/compositor/compositor_observer.cc ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 } 337 }
338 338
339 void OnCompositingEnded(Compositor* compositor) override { ended_ = true; } 339 void OnCompositingEnded(Compositor* compositor) override { ended_ = true; }
340 340
341 void OnCompositingAborted(Compositor* compositor) override { 341 void OnCompositingAborted(Compositor* compositor) override {
342 aborted_ = true; 342 aborted_ = true;
343 } 343 }
344 344
345 void OnCompositingLockStateChanged(Compositor* compositor) override {} 345 void OnCompositingLockStateChanged(Compositor* compositor) override {}
346 346
347 void OnCompositingShuttingDown(Compositor* compositor) override {}
348
347 bool committed_; 349 bool committed_;
348 bool started_; 350 bool started_;
349 bool ended_; 351 bool ended_;
350 bool aborted_; 352 bool aborted_;
351 353
352 DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver); 354 DISALLOW_COPY_AND_ASSIGN(TestCompositorObserver);
353 }; 355 };
354 356
355 } // namespace 357 } // namespace
356 358
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1731 MakeFrameData(gfx::Size(10, 10)))); 1733 MakeFrameData(gfx::Size(10, 10))));
1732 layer->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10)); 1734 layer->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
1733 1735
1734 EXPECT_FALSE(delegate.delegated_frame_damage_called()); 1736 EXPECT_FALSE(delegate.delegated_frame_damage_called());
1735 layer->OnDelegatedFrameDamage(damage_rect); 1737 layer->OnDelegatedFrameDamage(damage_rect);
1736 EXPECT_TRUE(delegate.delegated_frame_damage_called()); 1738 EXPECT_TRUE(delegate.delegated_frame_damage_called());
1737 EXPECT_EQ(damage_rect, delegate.delegated_frame_damage_rect()); 1739 EXPECT_EQ(damage_rect, delegate.delegated_frame_damage_rect());
1738 } 1740 }
1739 1741
1740 } // namespace ui 1742 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor_observer.cc ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698