diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 07:12:37 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-21 07:12:37 +0000 |
| commit | 2e5f3a0fb85bc2dc88317ab7a49096d5b4a489a1 (patch) | |
| tree | ff18e6f9dbdd6ce596804154816405b4a77167ab /mojo/services/native_viewport | |
| parent | e8f8baae705d04eb1ef588711a97b0f00d209c35 (diff) | |
| download | chromium_src-2e5f3a0fb85bc2dc88317ab7a49096d5b4a489a1.zip chromium_src-2e5f3a0fb85bc2dc88317ab7a49096d5b4a489a1.tar.gz chromium_src-2e5f3a0fb85bc2dc88317ab7a49096d5b4a489a1.tar.bz2 | |
Mojo: Fix android build
- revert abarth's change to make gles2 go through a vtbl
- Make NativeViewportService be a component library (static on Android)
- Wait to create gles until there's a non empty surface (on android)
BUG=None
R=abarth
Review URL: https://codereview.chromium.org/115563004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/native_viewport_service.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc index 9e7ad78..b219bd0 100644 --- a/mojo/services/native_viewport/native_viewport_service.cc +++ b/mojo/services/native_viewport/native_viewport_service.cc @@ -66,7 +66,10 @@ class NativeViewportService::NativeViewportImpl void CreateGLES2ContextIfNeeded() { if (widget_ == gfx::kNullAcceleratedWidget || !gles2_) return; - gles2_->CreateContext(widget_, native_viewport_->GetSize()); + gfx::Size size = native_viewport_->GetSize(); + if (size.width() == 0 || size.height() == 0) + return; + gles2_->CreateContext(widget_, size); } virtual bool OnEvent(ui::Event* ui_event) MOJO_OVERRIDE { @@ -121,6 +124,7 @@ class NativeViewportService::NativeViewportImpl } virtual void OnResized(const gfx::Size& size) MOJO_OVERRIDE { + CreateGLES2ContextIfNeeded(); } virtual void OnDestroyed() MOJO_OVERRIDE { |