diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 18:24:25 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 16:32:40 +0200 |
commit | 4ce69f7403811819800e7c5ae1318b2647e778d1 (patch) | |
tree | 2ec3a98b5abef002670a0916354eb7e0abfe2aa2 /chromium/content/gpu/gpu_child_thread.h | |
parent | a6dd70e0328d155d5df8d6df48afbab690b08fb6 (diff) | |
download | qtwebengine-chromium-4ce69f7403811819800e7c5ae1318b2647e778d1.tar.gz |
Update Chromium snapshot to stable version 33.0.1750.170
This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.
Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/content/gpu/gpu_child_thread.h')
-rw-r--r-- | chromium/content/gpu/gpu_child_thread.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chromium/content/gpu/gpu_child_thread.h b/chromium/content/gpu/gpu_child_thread.h index 82bb32a67aa..ff0c9258cd1 100644 --- a/chromium/content/gpu/gpu_child_thread.h +++ b/chromium/content/gpu/gpu_child_thread.h @@ -56,10 +56,6 @@ 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(); @@ -98,8 +94,6 @@ 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); }; |