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

Side by Side Diff: content/browser/compositor/test/no_transport_image_transport_factory.h

Issue 2688593002: WIP: Towards merging OffscreenCanvas and Mus code
Patch Set: Fix reflector unit test Created 3 years, 10 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 #ifndef CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
6 #define CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "cc/ipc/display_compositor.mojom.h"
12 #include "cc/surfaces/surface_manager.h" 13 #include "cc/surfaces/surface_manager.h"
14 #include "components/display_compositor/display_compositor.h"
13 #include "content/browser/compositor/image_transport_factory.h" 15 #include "content/browser/compositor/image_transport_factory.h"
16 #include "mojo/public/cpp/bindings/binding.h"
14 17
15 namespace cc { 18 namespace cc {
16 class ContextProvider; 19 class ContextProvider;
17 } 20 }
18 21
19 namespace ui { 22 namespace ui {
20 class InProcessContextFactory; 23 class InProcessContextFactory;
21 } 24 }
22 25
23 namespace content { 26 namespace content {
24 27
25 // An ImageTransportFactory that disables transport. 28 // An ImageTransportFactory that disables transport.
26 class NoTransportImageTransportFactory : public ImageTransportFactory { 29 class NoTransportImageTransportFactory
30 : public ImageTransportFactory,
31 public cc::mojom::DisplayCompositorClient {
27 public: 32 public:
28 NoTransportImageTransportFactory(); 33 NoTransportImageTransportFactory();
29 ~NoTransportImageTransportFactory() override; 34 ~NoTransportImageTransportFactory() override;
30 35
31 // ImageTransportFactory implementation. 36 // ImageTransportFactory implementation.
32 ui::ContextFactory* GetContextFactory() override; 37 ui::ContextFactory* GetContextFactory() override;
33 ui::ContextFactoryPrivate* GetContextFactoryPrivate() override; 38 ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
34 display_compositor::GLHelper* GetGLHelper() override; 39 display_compositor::GLHelper* GetGLHelper() override;
35 void SetGpuChannelEstablishFactory( 40 void SetGpuChannelEstablishFactory(
36 gpu::GpuChannelEstablishFactory* factory) override; 41 gpu::GpuChannelEstablishFactory* factory) override;
37 #if defined(OS_MACOSX) 42 #if defined(OS_MACOSX)
38 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor, 43 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
39 bool suspended) override {} 44 bool suspended) override {}
40 #endif 45 #endif
41 46
47 // cc::mojom::DisplayCompositorClient:
48 void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
49
42 private: 50 private:
43 std::unique_ptr<cc::SurfaceManager> surface_manager_; 51 mojo::Binding<cc::mojom::DisplayCompositorClient>
52 display_compositor_client_binding_;
53 cc::mojom::DisplayCompositorPtr display_compositor_ptr_;
54 std::unique_ptr<display_compositor::DisplayCompositor> display_compositor_;
55
44 std::unique_ptr<ui::InProcessContextFactory> context_factory_; 56 std::unique_ptr<ui::InProcessContextFactory> context_factory_;
45 scoped_refptr<cc::ContextProvider> context_provider_; 57 scoped_refptr<cc::ContextProvider> context_provider_;
46 std::unique_ptr<display_compositor::GLHelper> gl_helper_; 58 std::unique_ptr<display_compositor::GLHelper> gl_helper_;
47 59
48 DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory); 60 DISALLOW_COPY_AND_ASSIGN(NoTransportImageTransportFactory);
49 }; 61 };
50 62
51 } // namespace content 63 } // namespace content
52 64
53 #endif // CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_ H_ 65 #endif // CONTENT_BROWSER_COMPOSITOR_TEST_NO_TRANSPORT_IMAGE_TRANSPORT_FACTORY_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698