| 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 "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 Loading... |
| 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 Loading... |
| 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::MojoCompositorFrameSinkClientPtr client; |
| 103 cc::mojom::MojoCompositorFrameSinkClientRequest client_request = |
| 104 mojo::MakeRequest(&client); |
| 105 renderer_compositor_frame_sink_ = |
| 106 base::MakeUnique<FakeRendererCompositorFrameSink>( |
| 107 std::move(sink), std::move(client_request)); |
| 108 view_->DidCreateNewRendererCompositorFrameSink( |
| 109 renderer_compositor_frame_sink_.get()); |
| 97 } | 110 } |
| 98 | 111 |
| 99 void TearDown() override { | 112 void TearDown() override { |
| 100 if (view_) | 113 if (view_) |
| 101 view_->Destroy(); | 114 view_->Destroy(); |
| 102 delete widget_host_; | 115 delete widget_host_; |
| 103 delete test_frame_connector_; | 116 delete test_frame_connector_; |
| 104 | 117 |
| 105 browser_context_.reset(); | 118 browser_context_.reset(); |
| 106 | 119 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 131 base::test::ScopedTaskScheduler task_scheduler_; | 144 base::test::ScopedTaskScheduler task_scheduler_; |
| 132 | 145 |
| 133 std::unique_ptr<BrowserContext> browser_context_; | 146 std::unique_ptr<BrowserContext> browser_context_; |
| 134 MockRenderWidgetHostDelegate delegate_; | 147 MockRenderWidgetHostDelegate delegate_; |
| 135 | 148 |
| 136 // Tests should set these to NULL if they've already triggered their | 149 // Tests should set these to NULL if they've already triggered their |
| 137 // destruction. | 150 // destruction. |
| 138 RenderWidgetHostImpl* widget_host_; | 151 RenderWidgetHostImpl* widget_host_; |
| 139 RenderWidgetHostViewChildFrame* view_; | 152 RenderWidgetHostViewChildFrame* view_; |
| 140 MockCrossProcessFrameConnector* test_frame_connector_; | 153 MockCrossProcessFrameConnector* test_frame_connector_; |
| 154 std::unique_ptr<FakeRendererCompositorFrameSink> |
| 155 renderer_compositor_frame_sink_; |
| 141 | 156 |
| 142 private: | 157 private: |
| 143 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); | 158 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); |
| 144 }; | 159 }; |
| 145 | 160 |
| 146 cc::CompositorFrame CreateDelegatedFrame(float scale_factor, | 161 cc::CompositorFrame CreateDelegatedFrame(float scale_factor, |
| 147 gfx::Size size, | 162 gfx::Size size, |
| 148 const gfx::Rect& damage) { | 163 const gfx::Rect& damage) { |
| 149 cc::CompositorFrame frame; | 164 cc::CompositorFrame frame; |
| 150 frame.metadata.device_scale_factor = scale_factor; | 165 frame.metadata.device_scale_factor = scale_factor; |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 // Explicit ack through OnBeginFrameDidNotSwap is forwarded. | 284 // Explicit ack through OnBeginFrameDidNotSwap is forwarded. |
| 270 cc::BeginFrameAck ack(source_id, 6, 4, false); | 285 cc::BeginFrameAck ack(source_id, 6, 4, false); |
| 271 view_->OnBeginFrameDidNotSwap(ack); | 286 view_->OnBeginFrameDidNotSwap(ack); |
| 272 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get())); | 287 EXPECT_EQ(ack, source.LastAckForObserver(view_->support_.get())); |
| 273 } | 288 } |
| 274 | 289 |
| 275 view_->SetNeedsBeginFrames(false); | 290 view_->SetNeedsBeginFrames(false); |
| 276 } | 291 } |
| 277 | 292 |
| 278 } // namespace content | 293 } // namespace content |
| OLD | NEW |