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/ui/gl/gl_share_group.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/ui/gl/gl_share_group.h')
| -rw-r--r-- | chromium/ui/gl/gl_share_group.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/ui/gl/gl_share_group.h b/chromium/ui/gl/gl_share_group.h index f1b03690f34..1deed63c541 100644 --- a/chromium/ui/gl/gl_share_group.h +++ b/chromium/ui/gl/gl_share_group.h @@ -31,7 +31,7 @@ class GL_EXPORT GLShareGroup : public base::RefCounted<GLShareGroup> { // Returns a pointer to any initialized context in the share group // or NULL if there are no initialized contexts in the share group. - virtual GLContext* GetContext(); + GLContext* GetContext(); // Sets and returns the unique shared GL context. Used for context // virtualization. @@ -45,13 +45,10 @@ class GL_EXPORT GLShareGroup : public base::RefCounted<GLShareGroup> { int GetRendererID(); #endif - protected: - virtual ~GLShareGroup(); - virtual void AboutToAddFirstContext() { } - private: friend class base::RefCounted<GLShareGroup>; + ~GLShareGroup(); // References to GLContext are by raw pointer to avoid a reference count // cycle. |