diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 00:34:29 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 00:34:29 +0000 |
| commit | a11e5c2a673d6447737c2f8282cff095e150a43a (patch) | |
| tree | 1a3898a53d6e22107c97d22b006ede45c102c4f2 /webkit/renderer | |
| parent | 48ed2610d757483f2e4ebddda617fd7e92855d5a (diff) | |
| download | chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.zip chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.tar.gz chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.tar.bz2 | |
Revert "Add gpu::MailboxHolder to hold state for a gpu::Mailbox"
This reverts commit 9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.
This patch is the source of the top crash in canary. See the bug
for more details.
TBR=sheu
NOTREECHECKS=true
BUG=336040
Review URL: https://codereview.chromium.org/129873005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/renderer')
| -rw-r--r-- | webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc index 8657b38..e5a33d5f 100644 --- a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc +++ b/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc @@ -13,7 +13,6 @@ #include "third_party/WebKit/public/platform/WebFloatRect.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/khronos/GLES2/gl2.h" #include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" @@ -83,12 +82,10 @@ bool WebExternalTextureLayerImpl::PrepareTextureMailbox( } gpu::Mailbox name; name.SetName(client_mailbox.name); - if (bitmap) { + if (bitmap) *mailbox = cc::TextureMailbox(bitmap->shared_memory(), bitmap->size()); - } else { - *mailbox = - cc::TextureMailbox(name, GL_TEXTURE_2D, client_mailbox.syncPoint); - } + else + *mailbox = cc::TextureMailbox(name, client_mailbox.syncPoint); if (mailbox->IsValid()) { *release_callback = cc::SingleReleaseCallback::Create(base::Bind( |