oop: Split viz::ContextProvider interface into GL and Raster interfaces.
viz::ContextProviders currently support both GL and Raster interfaces.
This change splits those interfaces into GL (viz::ContextProvider) and
Raster (viz::RasterContextProvider) interfaces, to prevent invalid
run-time usage of the wrong interface on a 3d context.
All worker contexts in FrameSinks and code below them have been switched to
viz::RasterContextProviders. Also cleaned up related header includes.
BUG=757607
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I7cce7a545f3c77938e0a97570cb468a75d7cb945
Reviewed-on: https://chromium-review.googlesource.com/828079
Reviewed-by: Antoine Labour <[email protected]>
Reviewed-by: Chris Harrelson <[email protected]>
Reviewed-by: Tao Bai <[email protected]>
Reviewed-by: danakj <[email protected]>
Reviewed-by: Sadrul Chowdhury <[email protected]>
Commit-Queue: Victor Miura <[email protected]>
Cr-Commit-Position: refs/heads/master@{#525126}diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index e946142f..998ee16 100644
--- a/cc/layers/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -38,6 +38,7 @@
#include "cc/trees/layer_tree_impl.h"
#include "cc/trees/single_thread_proxy.h"
#include "components/viz/common/gpu/context_provider.h"
+#include "components/viz/common/gpu/raster_context_provider.h"
#include "components/viz/common/resources/returned_resource.h"
#include "components/viz/common/resources/transferable_resource.h"
#include "components/viz/test/test_layer_tree_frame_sink.h"
@@ -493,7 +494,8 @@
const viz::RendererSettings& renderer_settings,
double refresh_rate,
scoped_refptr<viz::ContextProvider> compositor_context_provider,
- scoped_refptr<viz::ContextProvider> worker_context_provider) override {
+ scoped_refptr<viz::RasterContextProvider> worker_context_provider)
+ override {
constexpr bool disable_display_vsync = false;
bool synchronous_composite =
!HasImplThread() &&
