diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/renderer_host/image_transport_factory_android.h | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/renderer_host/image_transport_factory_android.h')
-rw-r--r-- | chromium/content/browser/renderer_host/image_transport_factory_android.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/content/browser/renderer_host/image_transport_factory_android.h b/chromium/content/browser/renderer_host/image_transport_factory_android.h index 22dc09ef435..54434fc103f 100644 --- a/chromium/content/browser/renderer_host/image_transport_factory_android.h +++ b/chromium/content/browser/renderer_host/image_transport_factory_android.h @@ -12,7 +12,7 @@ namespace gfx { class GLShareGroup; } -namespace WebKit { +namespace blink { class WebGraphicsContext3D; } @@ -39,8 +39,9 @@ class ImageTransportFactoryAndroid { virtual void AcquireTexture( uint32 texture_id, const signed char* mailbox_name) = 0; - virtual WebKit::WebGraphicsContext3D* GetContext3D() = 0; + virtual blink::WebGraphicsContext3D* GetContext3D() = 0; virtual GLHelper* GetGLHelper() = 0; + virtual uint32 GetChannelID() = 0; static void AddObserver(ImageTransportFactoryAndroidObserver* observer); static void RemoveObserver(ImageTransportFactoryAndroidObserver* observer); |