| OLD | NEW | 
|     1 // Copyright 2014 The Chromium Authors. All rights reserved. |     1 // Copyright 2014 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 <stddef.h> |     5 #include <stddef.h> | 
|     6 #include <stdint.h> |     6 #include <stdint.h> | 
|     7  |     7  | 
|     8 #include "base/bind.h" |     8 #include "base/bind.h" | 
|     9 #include "base/macros.h" |     9 #include "base/macros.h" | 
|    10 #include "base/memory/ptr_util.h" |    10 #include "base/memory/ptr_util.h" | 
| (...skipping 2193 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2204   client_request = mojo::MakeRequest(&surface_client_ptr); |  2204   client_request = mojo::MakeRequest(&surface_client_ptr); | 
|  2205   wt2()->AttachCompositorFrameSink(window_2_101, |  2205   wt2()->AttachCompositorFrameSink(window_2_101, | 
|  2206                                    mojo::MakeRequest(&surface_ptr), |  2206                                    mojo::MakeRequest(&surface_ptr), | 
|  2207                                    std::move(surface_client_ptr)); |  2207                                    std::move(surface_client_ptr)); | 
|  2208   cc::CompositorFrame compositor_frame; |  2208   cc::CompositorFrame compositor_frame; | 
|  2209   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create(); |  2209   std::unique_ptr<cc::RenderPass> render_pass = cc::RenderPass::Create(); | 
|  2210   gfx::Rect frame_rect(0, 0, 100, 100); |  2210   gfx::Rect frame_rect(0, 0, 100, 100); | 
|  2211   render_pass->SetNew(1, frame_rect, frame_rect, gfx::Transform()); |  2211   render_pass->SetNew(1, frame_rect, frame_rect, gfx::Transform()); | 
|  2212   compositor_frame.render_pass_list.push_back(std::move(render_pass)); |  2212   compositor_frame.render_pass_list.push_back(std::move(render_pass)); | 
|  2213   compositor_frame.metadata.device_scale_factor = 1.f; |  2213   compositor_frame.metadata.device_scale_factor = 1.f; | 
|  2214   compositor_frame.metadata.begin_frame_ack = |  2214   compositor_frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true); | 
|  2215       cc::BeginFrameAck(0, 1, 1, 0, true); |  | 
|  2216   cc::LocalSurfaceId local_surface_id(1, base::UnguessableToken::Create()); |  2215   cc::LocalSurfaceId local_surface_id(1, base::UnguessableToken::Create()); | 
|  2217   surface_ptr->SubmitCompositorFrame(local_surface_id, |  2216   surface_ptr->SubmitCompositorFrame(local_surface_id, | 
|  2218                                      std::move(compositor_frame)); |  2217                                      std::move(compositor_frame)); | 
|  2219   // Make sure the parent connection gets the surface ID. |  2218   // Make sure the parent connection gets the surface ID. | 
|  2220   wt_client1()->WaitForChangeCount(1); |  2219   wt_client1()->WaitForChangeCount(1); | 
|  2221   // Verify that the submitted frame is for |window_2_101|. |  2220   // Verify that the submitted frame is for |window_2_101|. | 
|  2222   EXPECT_EQ(window_2_101_in_ws1, |  2221   EXPECT_EQ(window_2_101_in_ws1, | 
|  2223             changes1()->back().surface_id.frame_sink_id().client_id()); |  2222             changes1()->back().surface_id.frame_sink_id().client_id()); | 
|  2224 } |  2223 } | 
|  2225  |  2224  | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2262  |  2261  | 
|  2263 // TODO(sky): make sure coverage of what was |  2262 // TODO(sky): make sure coverage of what was | 
|  2264 // WindowManagerTest.SecondEmbedRoot_InitService and |  2263 // WindowManagerTest.SecondEmbedRoot_InitService and | 
|  2265 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |  2264 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 
|  2266 // manager |  2265 // manager | 
|  2267 // tests. |  2266 // tests. | 
|  2268  |  2267  | 
|  2269 }  // namespace test |  2268 }  // namespace test | 
|  2270 }  // namespace ws |  2269 }  // namespace ws | 
|  2271 }  // namespace ui |  2270 }  // namespace ui | 
| OLD | NEW |