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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

Issue 2774373002: Use MojoCompositorFrameSink in RendererCompositorFrameSink (Closed)
Patch Set: addressed comments Created 3 years, 8 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
OLDNEW
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 "content/browser/frame_host/render_widget_host_view_child_frame.h" 5 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "cc/test/fake_external_begin_frame_source.h" 24 #include "cc/test/fake_external_begin_frame_source.h"
25 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 25 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
26 #include "content/browser/frame_host/cross_process_frame_connector.h" 26 #include "content/browser/frame_host/cross_process_frame_connector.h"
27 #include "content/browser/gpu/compositor_util.h" 27 #include "content/browser/gpu/compositor_util.h"
28 #include "content/browser/renderer_host/render_widget_host_delegate.h" 28 #include "content/browser/renderer_host/render_widget_host_delegate.h"
29 #include "content/browser/renderer_host/render_widget_host_impl.h" 29 #include "content/browser/renderer_host/render_widget_host_impl.h"
30 #include "content/common/view_messages.h" 30 #include "content/common/view_messages.h"
31 #include "content/public/browser/render_widget_host_view.h" 31 #include "content/public/browser/render_widget_host_view.h"
32 #include "content/public/test/mock_render_process_host.h" 32 #include "content/public/test/mock_render_process_host.h"
33 #include "content/public/test/test_browser_context.h" 33 #include "content/public/test/test_browser_context.h"
34 #include "content/test/fake_renderer_compositor_frame_sink.h"
34 #include "content/test/test_render_view_host.h" 35 #include "content/test/test_render_view_host.h"
35 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
36 #include "ui/compositor/compositor.h" 37 #include "ui/compositor/compositor.h"
37 38
38 namespace content { 39 namespace content {
39 namespace { 40 namespace {
40 41
41 const cc::LocalSurfaceId kArbitraryLocalSurfaceId( 42 const cc::LocalSurfaceId kArbitraryLocalSurfaceId(
42 1, 43 1,
43 base::UnguessableToken::Deserialize(2, 3)); 44 base::UnguessableToken::Deserialize(2, 3));
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 MockRenderProcessHost* process_host = 89 MockRenderProcessHost* process_host =
89 new MockRenderProcessHost(browser_context_.get()); 90 new MockRenderProcessHost(browser_context_.get());
90 int32_t routing_id = process_host->GetNextRoutingID(); 91 int32_t routing_id = process_host->GetNextRoutingID();
91 widget_host_ = 92 widget_host_ =
92 new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false); 93 new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false);
93 view_ = RenderWidgetHostViewChildFrame::Create(widget_host_); 94 view_ = RenderWidgetHostViewChildFrame::Create(widget_host_);
94 95
95 test_frame_connector_ = new MockCrossProcessFrameConnector(); 96 test_frame_connector_ = new MockCrossProcessFrameConnector();
96 view_->SetCrossProcessFrameConnector(test_frame_connector_); 97 view_->SetCrossProcessFrameConnector(test_frame_connector_);
98
99 cc::mojom::MojoCompositorFrameSinkPtr sink;
100 cc::mojom::MojoCompositorFrameSinkRequest sink_request =
101 mojo::MakeRequest(&sink);
102 cc::mojom::MojoCompositorFrameSinkClientRequest client_request =
103 mojo::MakeRequest(&renderer_compositor_frame_sink_ptr_);
104 renderer_compositor_frame_sink_ =
105 base::MakeUnique<FakeRendererCompositorFrameSink>(
106 std::move(sink), std::move(client_request));
107 view_->DidCreateNewRendererCompositorFrameSink(
108 renderer_compositor_frame_sink_ptr_.get());
97 } 109 }
98 110
99 void TearDown() override { 111 void TearDown() override {
100 if (view_) 112 if (view_)
101 view_->Destroy(); 113 view_->Destroy();
102 delete widget_host_; 114 delete widget_host_;
103 delete test_frame_connector_; 115 delete test_frame_connector_;
104 116
105 browser_context_.reset(); 117 browser_context_.reset();
106 118
(...skipping 24 matching lines...) Expand all
131 base::test::ScopedTaskScheduler task_scheduler_; 143 base::test::ScopedTaskScheduler task_scheduler_;
132 144
133 std::unique_ptr<BrowserContext> browser_context_; 145 std::unique_ptr<BrowserContext> browser_context_;
134 MockRenderWidgetHostDelegate delegate_; 146 MockRenderWidgetHostDelegate delegate_;
135 147
136 // Tests should set these to NULL if they've already triggered their 148 // Tests should set these to NULL if they've already triggered their
137 // destruction. 149 // destruction.
138 RenderWidgetHostImpl* widget_host_; 150 RenderWidgetHostImpl* widget_host_;
139 RenderWidgetHostViewChildFrame* view_; 151 RenderWidgetHostViewChildFrame* view_;
140 MockCrossProcessFrameConnector* test_frame_connector_; 152 MockCrossProcessFrameConnector* test_frame_connector_;
153 std::unique_ptr<FakeRendererCompositorFrameSink>
154 renderer_compositor_frame_sink_;
141 155
142 private: 156 private:
157 cc::mojom::MojoCompositorFrameSinkClientPtr
158 renderer_compositor_frame_sink_ptr_;
159
143 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); 160 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest);
144 }; 161 };
145 162
146 cc::CompositorFrame CreateDelegatedFrame(float scale_factor, 163 cc::CompositorFrame CreateDelegatedFrame(float scale_factor,
147 gfx::Size size, 164 gfx::Size size,
148 const gfx::Rect& damage) { 165 const gfx::Rect& damage) {
149 cc::CompositorFrame frame; 166 cc::CompositorFrame frame;
150 frame.metadata.device_scale_factor = scale_factor; 167 frame.metadata.device_scale_factor = scale_factor;
151 frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true); 168 frame.metadata.begin_frame_ack = cc::BeginFrameAck(0, 1, 1, true);
152 169
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // Explicit ack through OnBeginFrameDidNotSwap is forwarded. 286 // Explicit ack through OnBeginFrameDidNotSwap is forwarded.
270 cc::BeginFrameAck ack(source_id, 6, 4, false); 287 cc::BeginFrameAck ack(source_id, 6, 4, false);
271 view_->OnBeginFrameDidNotSwap(ack); 288 view_->OnBeginFrameDidNotSwap(ack);
272 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get())); 289 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get()));
273 } 290 }
274 291
275 view_->SetNeedsBeginFrames(false); 292 view_->SetNeedsBeginFrames(false);
276 } 293 }
277 294
278 } // namespace content 295 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698