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

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

Issue 2238693002: Plumb SetVisible from ui::Compositor to the DirectRenderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: setvisible-browser: onemore Created 4 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
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.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 "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 11 matching lines...) Expand all
22 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
24 #include "base/trace_event/trace_event.h" 24 #include "base/trace_event/trace_event.h"
25 #include "cc/layers/layer.h" 25 #include "cc/layers/layer.h"
26 #include "cc/output/copy_output_request.h" 26 #include "cc/output/copy_output_request.h"
27 #include "cc/output/copy_output_result.h" 27 #include "cc/output/copy_output_result.h"
28 #include "cc/surfaces/surface_id.h" 28 #include "cc/surfaces/surface_id.h"
29 #include "cc/surfaces/surface_sequence.h" 29 #include "cc/surfaces/surface_sequence.h"
30 #include "cc/test/pixel_test_utils.h" 30 #include "cc/test/pixel_test_utils.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 #include "third_party/khronos/GLES2/gl2.h"
32 #include "ui/compositor/compositor_observer.h" 33 #include "ui/compositor/compositor_observer.h"
33 #include "ui/compositor/dip_util.h" 34 #include "ui/compositor/dip_util.h"
34 #include "ui/compositor/layer_animation_element.h" 35 #include "ui/compositor/layer_animation_element.h"
35 #include "ui/compositor/layer_animation_observer.h" 36 #include "ui/compositor/layer_animation_observer.h"
36 #include "ui/compositor/layer_animation_sequence.h" 37 #include "ui/compositor/layer_animation_sequence.h"
37 #include "ui/compositor/layer_animator.h" 38 #include "ui/compositor/layer_animator.h"
38 #include "ui/compositor/paint_context.h" 39 #include "ui/compositor/paint_context.h"
39 #include "ui/compositor/paint_recorder.h" 40 #include "ui/compositor/paint_recorder.h"
40 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 41 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
41 #include "ui/compositor/scoped_layer_animation_settings.h" 42 #include "ui/compositor/scoped_layer_animation_settings.h"
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 // The CompositorDelegate (us) should have been told to draw for a resize. 1026 // The CompositorDelegate (us) should have been told to draw for a resize.
1026 WaitForDraw(); 1027 WaitForDraw();
1027 } 1028 }
1028 1029
1029 static void EmptyReleaseCallback(const gpu::SyncToken& sync_token, 1030 static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
1030 bool is_lost) {} 1031 bool is_lost) {}
1031 1032
1032 // Checks that the damage rect for a TextureLayer is empty after a commit. 1033 // Checks that the damage rect for a TextureLayer is empty after a commit.
1033 TEST_F(LayerWithNullDelegateTest, EmptyDamagedRect) { 1034 TEST_F(LayerWithNullDelegateTest, EmptyDamagedRect) {
1034 std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR)); 1035 std::unique_ptr<Layer> root(CreateLayer(LAYER_SOLID_COLOR));
1035 cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), gpu::SyncToken(), 0); 1036 cc::TextureMailbox mailbox(gpu::Mailbox::Generate(), gpu::SyncToken(),
1037 GL_TEXTURE_2D);
1036 root->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create( 1038 root->SetTextureMailbox(mailbox, cc::SingleReleaseCallback::Create(
1037 base::Bind(EmptyReleaseCallback)), 1039 base::Bind(EmptyReleaseCallback)),
1038 gfx::Size(10, 10)); 1040 gfx::Size(10, 10));
1039 compositor()->SetRootLayer(root.get()); 1041 compositor()->SetRootLayer(root.get());
1040 1042
1041 root->SetBounds(gfx::Rect(0, 0, 10, 10)); 1043 root->SetBounds(gfx::Rect(0, 0, 10, 10));
1042 root->SetVisible(true); 1044 root->SetVisible(true);
1043 WaitForCommit(); 1045 WaitForCommit();
1044 1046
1045 gfx::Rect damaged_rect(0, 0, 5, 5); 1047 gfx::Rect damaged_rect(0, 0, 5, 5);
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
2113 root->SetOpacity(0.5f); 2115 root->SetOpacity(0.5f);
2114 WaitForSwap(); 2116 WaitForSwap();
2115 EXPECT_EQ(1u, animation_observer.animation_step_count()); 2117 EXPECT_EQ(1u, animation_observer.animation_step_count());
2116 2118
2117 EXPECT_FALSE(animation_observer.shutdown()); 2119 EXPECT_FALSE(animation_observer.shutdown());
2118 ResetCompositor(); 2120 ResetCompositor();
2119 EXPECT_TRUE(animation_observer.shutdown()); 2121 EXPECT_TRUE(animation_observer.shutdown());
2120 } 2122 }
2121 2123
2122 } // namespace ui 2124 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/compositor.cc ('k') | ui/compositor/test/in_process_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698