OLD | NEW |
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 "content/public/test/layouttest_support.h" | 5 #include "content/public/test/layouttest_support.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 gpu_channel_ = gpu_channel; | 343 gpu_channel_ = gpu_channel; |
344 | 344 |
345 auto* task_runner = deps->GetCompositorImplThreadTaskRunner().get(); | 345 auto* task_runner = deps->GetCompositorImplThreadTaskRunner().get(); |
346 bool synchronous_composite = !task_runner; | 346 bool synchronous_composite = !task_runner; |
347 if (!task_runner) | 347 if (!task_runner) |
348 task_runner = base::ThreadTaskRunnerHandle::Get().get(); | 348 task_runner = base::ThreadTaskRunnerHandle::Get().get(); |
349 | 349 |
350 ScreenInfo dummy_screen_info; | 350 ScreenInfo dummy_screen_info; |
351 cc::LayerTreeSettings settings = | 351 cc::LayerTreeSettings settings = |
352 RenderWidgetCompositor::GenerateLayerTreeSettings( | 352 RenderWidgetCompositor::GenerateLayerTreeSettings( |
353 *base::CommandLine::ForCurrentProcess(), deps, 1.f, | 353 *base::CommandLine::ForCurrentProcess(), deps, 1.f, false, |
354 dummy_screen_info); | 354 dummy_screen_info); |
355 | 355 |
356 auto compositor_frame_sink = base::MakeUnique<cc::TestCompositorFrameSink>( | 356 auto compositor_frame_sink = base::MakeUnique<cc::TestCompositorFrameSink>( |
357 std::move(compositor_context_provider), | 357 std::move(compositor_context_provider), |
358 std::move(worker_context_provider), nullptr /* shared_bitmap_manager */, | 358 std::move(worker_context_provider), nullptr /* shared_bitmap_manager */, |
359 gpu_memory_buffer_manager, settings.renderer_settings, task_runner, | 359 gpu_memory_buffer_manager, settings.renderer_settings, task_runner, |
360 synchronous_composite, false /* force_disable_reclaim_resources */); | 360 synchronous_composite, false /* force_disable_reclaim_resources */); |
361 compositor_frame_sink->SetClient(this); | 361 compositor_frame_sink->SetClient(this); |
362 compositor_frame_sinks_[routing_id] = compositor_frame_sink.get(); | 362 compositor_frame_sinks_[routing_id] = compositor_frame_sink.get(); |
363 return std::move(compositor_frame_sink); | 363 return std::move(compositor_frame_sink); |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
604 } | 604 } |
605 } | 605 } |
606 | 606 |
607 bool IsNavigationInitiatedByRenderer(const blink::WebURLRequest& request) { | 607 bool IsNavigationInitiatedByRenderer(const blink::WebURLRequest& request) { |
608 RequestExtraData* extra_data = | 608 RequestExtraData* extra_data = |
609 static_cast<RequestExtraData*>(request.GetExtraData()); | 609 static_cast<RequestExtraData*>(request.GetExtraData()); |
610 return extra_data && extra_data->navigation_initiated_by_renderer(); | 610 return extra_data && extra_data->navigation_initiated_by_renderer(); |
611 } | 611 } |
612 | 612 |
613 } // namespace content | 613 } // namespace content |
OLD | NEW |