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

Unified Diff: content/browser/android/in_process/synchronous_compositor_factory_impl.h

Issue 1844843002: android: Remove in-process video path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove commented out code + rebase again Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/in_process/synchronous_compositor_factory_impl.h
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
index 372c617b499b29f48b5aa82d2c13f7ad649ce650..013175f4a3beba7c6291ffc17bb1be4a41876a0f 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
@@ -5,32 +5,14 @@
#ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_
#define CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_
-#include "base/lazy_instance.h"
#include "base/synchronization/lock.h"
#include "cc/blink/context_provider_web_context.h"
#include "content/browser/android/in_process/synchronous_input_event_filter.h"
#include "content/common/gpu/client/command_buffer_metrics.h"
#include "content/renderer/android/synchronous_compositor_factory.h"
-#include "content/renderer/media/android/stream_texture_factory_synchronous_impl.h"
-#include "gpu/command_buffer/service/in_process_command_buffer.h"
-
-namespace base {
-class Thread;
-}
-
-namespace gpu {
-class GLInProcessContext;
-}
-
-namespace gpu_blink {
-class WebGraphicsContext3DInProcessCommandBufferImpl;
-}
namespace content {
-class InProcessChildThreadParams;
-class ContextProviderCommandBuffer;
-
class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
public:
SynchronousCompositorFactoryImpl();
@@ -59,40 +41,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
SynchronousInputEventFilter synchronous_input_event_filter_;
};
-class SynchronousCompositorStreamTextureFactoryImpl {
- public:
- static SynchronousCompositorStreamTextureFactoryImpl* GetInstance();
-
- scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory();
- void SetDeferredGpuService(
- scoped_refptr<gpu::InProcessCommandBuffer::Service> service);
- void CompositorInitializedHardwareDraw();
- void CompositorReleasedHardwareDraw();
-
- private:
- friend struct base::DefaultLazyInstanceTraits<
- SynchronousCompositorStreamTextureFactoryImpl>;
-
- SynchronousCompositorStreamTextureFactoryImpl();
- ~SynchronousCompositorStreamTextureFactoryImpl();
-
- bool CanCreateMainThreadContext();
- scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
- TryCreateStreamTextureFactory();
- void RestoreContextOnMainThread();
-
- scoped_refptr<gpu::InProcessCommandBuffer::Service> android_view_service_;
-
- class VideoContextProvider;
- scoped_refptr<VideoContextProvider> video_context_provider_;
-
- // |num_hardware_compositor_lock_| is updated on UI thread only but can be
- // read on renderer main thread.
- base::Lock num_hardware_compositor_lock_;
- unsigned int num_hardware_compositors_;
- scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
-};
-
} // namespace content
#endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SYNCHRONOUS_COMPOSITOR_FACTORY_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698