diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-25 01:19:36 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-25 01:19:36 +0000 |
| commit | 7ba5f4b68a7e0f9aa27231b20126a3e102ae3741 (patch) | |
| tree | 75690017a6fc9e74b9044aeb0d6310ff3ba8d61b /ui/aura/bench | |
| parent | 6e37150ca64536fb8a511b133bba6c3711eaf465 (diff) | |
| download | chromium_src-7ba5f4b68a7e0f9aa27231b20126a3e102ae3741.zip chromium_src-7ba5f4b68a7e0f9aa27231b20126a3e102ae3741.tar.gz chromium_src-7ba5f4b68a7e0f9aa27231b20126a3e102ae3741.tar.bz2 | |
Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient
This is basically a revert of r151181 which partially reverted r146621 (but
rebased on the necessary fixes).
BUG=136012
Review URL: https://chromiumcodereview.appspot.com/10879076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index fcc70c9..bcb03e7 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -147,6 +147,10 @@ class WebGLTexture : public ui::Texture { GL_RGBA, GL_UNSIGNED_BYTE, NULL); } + virtual WebGraphicsContext3D* HostContext3D() OVERRIDE { + return context_; + } + private: virtual ~WebGLTexture() { context_->deleteTexture(texture_id()); |