diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2> | 2013-11-15 17:51:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-15 17:51:52 -0800 |
| commit | 1940731af14148e5a80066fe0ff471f40b9182a5 (patch) | |
| tree | f173a13643cc06cbb28b9a4abb094d1d17fcb7ac | |
| parent | 5f3a011304cff9ce0f67e21db4fb9d306812d176 (diff) | |
| parent | e31b3128a419654fd14003d6117caa8da32697e7 (diff) | |
| download | chromium_org-1940731af14148e5a80066fe0ff471f40b9182a5.tar.gz | |
am e31b3128: Cherry-pick: [Android WebView] Fix in-line video part 1
* commit 'e31b3128a419654fd14003d6117caa8da32697e7':
Cherry-pick: [Android WebView] Fix in-line video part 1
| -rw-r--r-- | content/browser/android/in_process/synchronous_compositor_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc index aa34ba4f8c..c3540856fb 100644 --- a/content/browser/android/in_process/synchronous_compositor_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc @@ -250,7 +250,9 @@ scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider> SynchronousCompositorFactoryImpl::TryCreateStreamTextureFactory() { scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider> context_provider; - if (CanCreateMainThreadContext() && offscreen_context_for_main_thread_) { + if (CanCreateMainThreadContext() && + GetOffscreenContextProviderForMainThread()) { + DCHECK(offscreen_context_for_main_thread_); DCHECK(wrapped_gl_context_for_main_thread_); context_provider = new VideoContextProvider(offscreen_context_for_main_thread_, |