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/public | |
| 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/public')
| -rw-r--r-- | chromium/content/public/browser/content_browser_client.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chromium/content/public/browser/content_browser_client.h b/chromium/content/public/browser/content_browser_client.h index 639998fa5d9..8633105ed1a 100644 --- a/chromium/content/public/browser/content_browser_client.h +++ b/chromium/content/public/browser/content_browser_client.h @@ -45,7 +45,6 @@ class FilePath; } namespace gfx { -class GLShareGroup; class ImageSkia; } @@ -583,10 +582,6 @@ class CONTENT_EXPORT ContentBrowserClient { // information. virtual VibrationProvider* OverrideVibrationProvider(); - // Allow an embedder to provide a share group reimplementation to connect renderer - // GL contexts with the root compositor. - virtual gfx::GLShareGroup* GetInProcessGpuShareGroup() { return 0; } - #if defined(OS_POSIX) && !defined(OS_MACOSX) // Populates |mappings| with all files that need to be mapped before launching // a child process. |