summaryrefslogtreecommitdiffstats
path: root/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch')
-rw-r--r--patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch b/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
deleted file mode 100644
index f6fb05d79..000000000
--- a/patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-Date: Fri, 20 Sep 2013 15:00:47 +0200
-Subject: Add accessors for the Qt delegated renderer integration.
-
-This is needed to fetch the MessageLoop, the MailboxManager and the
-SyncPointManager of the GPU in-process host.
----
- content/common/gpu/gpu_channel_manager.h | 2 ++
- content/gpu/gpu_child_thread.cc | 6 ++++++
- content/gpu/gpu_child_thread.h | 6 ++++++
- 3 files changed, 14 insertions(+)
-
-diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
-index eb4d224..1ab04d9 100644
---- a/content/common/gpu/gpu_channel_manager.h
-+++ b/content/common/gpu/gpu_channel_manager.h
-@@ -90,6 +90,8 @@ class GpuChannelManager : public IPC::Listener,
-
- gpu::gles2::ProgramCache* program_cache();
-
-+ gpu::gles2::MailboxManager* mailbox_manager() { return mailbox_manager_.get(); }
-+
- GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
-
- GpuEventsDispatcher* gpu_devtools_events_dispatcher() {
-diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
-index 170b364..a84a9e0 100644
---- a/content/gpu/gpu_child_thread.cc
-+++ b/content/gpu/gpu_child_thread.cc
-@@ -40,6 +40,8 @@ bool GpuProcessLogMessageHandler(int severity,
-
- } // namespace
-
-+GpuChildThread* GpuChildThread::instance_ = 0;
-+
- GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
- bool dead_on_arrival,
- const gpu::GPUInfo& gpu_info,
-@@ -53,6 +55,8 @@ GpuChildThread::GpuChildThread(GpuWatchdogThread* watchdog_thread,
- target_services_ = NULL;
- #endif
- g_thread_safe_sender.Get() = thread_safe_sender();
-+
-+ instance_ = this;
- }
-
- GpuChildThread::GpuChildThread(const std::string& channel_id)
-@@ -71,6 +75,8 @@ GpuChildThread::GpuChildThread(const std::string& channel_id)
- VLOG(1) << "gfx::GLSurface::InitializeOneOff()";
- }
- g_thread_safe_sender.Get() = thread_safe_sender();
-+
-+ instance_ = this;
- }
-
- GpuChildThread::~GpuChildThread() {
-diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
-index ff0c925..82bb32a 100644
---- a/content/gpu/gpu_child_thread.h
-+++ b/content/gpu/gpu_child_thread.h
-@@ -56,6 +56,10 @@ class GpuChildThread : public ChildThread {
- virtual bool Send(IPC::Message* msg) OVERRIDE;
- virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
-
-+ GpuChannelManager* ChannelManager() const { return gpu_channel_manager_.get(); }
-+
-+ static GpuChildThread* instance() { return instance_; }
-+
- private:
- // Message handlers.
- void OnInitialize();
-@@ -94,6 +98,8 @@ class GpuChildThread : public ChildThread {
- // Whether the GPU thread is running in the browser process.
- bool in_browser_process_;
-
-+ static GpuChildThread* instance_;
-+
- DISALLOW_COPY_AND_ASSIGN(GpuChildThread);
- };
-