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

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

Powered by Google App Engine
This is Rietveld 408576698