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

Side by Side Diff: trunk/src/ui/snapshot/snapshot_aura_unittest.cc

Issue 22648006: Revert 216780 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/snapshot/snapshot.h" 5 #include "ui/snapshot/snapshot.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/aura/test/aura_test_helper.h" 9 #include "ui/aura/test/aura_test_helper.h"
10 #include "ui/aura/test/test_screen.h" 10 #include "ui/aura/test/test_screen.h"
11 #include "ui/aura/test/test_window_delegate.h" 11 #include "ui/aura/test/test_window_delegate.h"
12 #include "ui/aura/test/test_windows.h" 12 #include "ui/aura/test/test_windows.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 #include "ui/compositor/compositor_setup.h"
14 #include "ui/compositor/layer.h" 15 #include "ui/compositor/layer.h"
15 #include "ui/gfx/canvas.h" 16 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/gfx_paths.h" 17 #include "ui/gfx/gfx_paths.h"
17 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
18 #include "ui/gfx/rect.h" 19 #include "ui/gfx/rect.h"
19 #include "ui/gfx/size_conversions.h" 20 #include "ui/gfx/size_conversions.h"
20 #include "ui/gfx/transform.h" 21 #include "ui/gfx/transform.h"
21 #include "ui/gl/gl_implementation.h" 22 #include "ui/gl/gl_implementation.h"
22 23
23 namespace ui { 24 namespace ui {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 gfx::SizeF snapshot_size(test_bounds.size()); 214 gfx::SizeF snapshot_size(test_bounds.size());
214 snapshot_size.Scale(2.0f / kUIScale); 215 snapshot_size.Scale(2.0f / kUIScale);
215 216
216 gfx::Image snapshot = GrabSnapshotForTestWindow(); 217 gfx::Image snapshot = GrabSnapshotForTestWindow();
217 EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(), 218 EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
218 snapshot.Size().ToString()); 219 snapshot.Size().ToString());
219 EXPECT_EQ(0u, GetFailedPixelsCount(snapshot)); 220 EXPECT_EQ(0u, GetFailedPixelsCount(snapshot));
220 } 221 }
221 222
222 } // namespace ui 223 } // namespace ui
OLDNEW
« no previous file with comments | « trunk/src/ui/message_center/test/run_all_unittests.cc ('k') | trunk/src/ui/views/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698