diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:55:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 17:20:36 +0100 |
| commit | 25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch) | |
| tree | 4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /patches/chromium/0012-Add-accessors-for-the-Qt-delegated-renderer-integrat.patch | |
| parent | 175dba21885a5bcbd031c1cbc394825b5fbb783e (diff) | |
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
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.patch | 6 |
1 files changed, 3 insertions, 3 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 index 3a9052ff2..f6fb05d79 100644 --- 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 @@ -12,10 +12,10 @@ SyncPointManager of the GPU in-process host. 3 files changed, 14 insertions(+) diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h -index f01a1c5..e41a548 100644 +index eb4d224..1ab04d9 100644 --- a/content/common/gpu/gpu_channel_manager.h +++ b/content/common/gpu/gpu_channel_manager.h -@@ -89,6 +89,8 @@ class GpuChannelManager : public IPC::Listener, +@@ -90,6 +90,8 @@ class GpuChannelManager : public IPC::Listener, gpu::gles2::ProgramCache* program_cache(); @@ -23,7 +23,7 @@ index f01a1c5..e41a548 100644 + GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; } - GpuChannel* LookupChannel(int32 client_id); + 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 |