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

Side by Side Diff: content/browser/compositor/gpu_process_transport_factory.h

Issue 1963263002: Fix Mac resize, delete more Mac code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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_GPU_PROCESS_TRANSPORT_FACTORY_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 // ImageTransportFactory implementation. 70 // ImageTransportFactory implementation.
71 ui::ContextFactory* GetContextFactory() override; 71 ui::ContextFactory* GetContextFactory() override;
72 cc::SurfaceManager* GetSurfaceManager() override; 72 cc::SurfaceManager* GetSurfaceManager() override;
73 display_compositor::GLHelper* GetGLHelper() override; 73 display_compositor::GLHelper* GetGLHelper() override;
74 void AddObserver(ImageTransportFactoryObserver* observer) override; 74 void AddObserver(ImageTransportFactoryObserver* observer) override;
75 void RemoveObserver(ImageTransportFactoryObserver* observer) override; 75 void RemoveObserver(ImageTransportFactoryObserver* observer) override;
76 #if defined(OS_MACOSX) 76 #if defined(OS_MACOSX)
77 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor, 77 void SetCompositorSuspendedForRecycle(ui::Compositor* compositor,
78 bool suspended) override; 78 bool suspended) override;
79 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle(
80 gpu::SurfaceHandle surface_handle) const override;
81 #endif 79 #endif
82 80
83 private: 81 private:
84 struct PerCompositorData; 82 struct PerCompositorData;
85 83
86 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor); 84 PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
87 std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice( 85 std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
88 ui::Compositor* compositor); 86 ui::Compositor* compositor);
89 void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor, 87 void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor,
90 bool create_gpu_output_surface, 88 bool create_gpu_output_surface,
(...skipping 15 matching lines...) Expand all
106 std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; 104 std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
107 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; 105 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_;
108 106
109 bool shared_vulkan_context_provider_initialized_ = false; 107 bool shared_vulkan_context_provider_initialized_ = false;
110 scoped_refptr<cc::VulkanInProcessContextProvider> 108 scoped_refptr<cc::VulkanInProcessContextProvider>
111 shared_vulkan_context_provider_; 109 shared_vulkan_context_provider_;
112 110
113 #if defined(OS_WIN) 111 #if defined(OS_WIN)
114 std::unique_ptr<OutputDeviceBacking> software_backing_; 112 std::unique_ptr<OutputDeviceBacking> software_backing_;
115 #endif 113 #endif
116
117 #if defined(OS_MACOSX)
118 // The contents of this map and its methods may only be used on the compositor
119 // thread. This is used on Mac to lookup the output surface based on the
120 // surface_handle, in response to the
121 // GpuHostMsg_AcceleratedSurfaceBuffersSwapped message.
122 IDMap<BrowserCompositorOutputSurface> output_surface_map_;
123 #endif
124
125 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; 114 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_;
126 115
127 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); 116 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory);
128 }; 117 };
129 118
130 } // namespace content 119 } // namespace content
131 120
132 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ 121 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698