summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorsievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 13:51:43 +0000
committersievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 13:51:43 +0000
commit6f80f0fe119f0783ef63ec372aa201e10b14e2f6 (patch)
tree54ee20a32847860649ab5009d2efaa77fd67ef66 /gpu
parent208e089500e9a6efb419f1a07698cd31ff3177a0 (diff)
downloadchromium_src-6f80f0fe119f0783ef63ec372aa201e10b14e2f6.zip
chromium_src-6f80f0fe119f0783ef63ec372aa201e10b14e2f6.tar.gz
chromium_src-6f80f0fe119f0783ef63ec372aa201e10b14e2f6.tar.bz2
Android Webview: Skip managed resources in mailbox sync
BUG=399226 NOTRY=True Review URL: https://codereview.chromium.org/429983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/mailbox_synchronizer.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/mailbox_synchronizer.cc b/gpu/command_buffer/service/mailbox_synchronizer.cc
index d25368a..eac31f9 100644
--- a/gpu/command_buffer/service/mailbox_synchronizer.cc
+++ b/gpu/command_buffer/service/mailbox_synchronizer.cc
@@ -166,6 +166,11 @@ void MailboxSynchronizer::PushTextureUpdates(MailboxManager* manager) {
UpdateTextureLocked(texture, texture_version);
} else {
+ // Skip compositor resources/tile textures.
+ // TODO: Remove this, see crbug.com/399226.
+ if (texture->pool() == GL_TEXTURE_POOL_MANAGED_CHROMIUM)
+ continue;
+
linked_ptr<TextureGroup> group = make_linked_ptr(new TextureGroup(
TextureDefinition(target_name.target, texture, 1, NULL)));