diff options
| author | erikchen <erikchen@chromium.org> | 2016-03-08 19:26:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 03:28:26 +0000 |
| commit | f91405b7e7487119f446e2af01117fdd6e611410 (patch) | |
| tree | f65879e391fc554567e2d91a3fb767c391d3aae1 /cc | |
| parent | 221c2764da319c67a3157b76b1b8a5c3534452fd (diff) | |
| download | chromium_src-f91405b7e7487119f446e2af01117fdd6e611410.zip chromium_src-f91405b7e7487119f446e2af01117fdd6e611410.tar.gz chromium_src-f91405b7e7487119f446e2af01117fdd6e611410.tar.bz2 | |
Fix a bug in Resource construction from TextureMailboxes.
When the mailbox is an overlay candidate, the size of the texture needs to be
passed to the Resource.
BUG=579664
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1771043005
Cr-Commit-Position: refs/heads/master@{#380053}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/resources/resource_provider.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index d4a7087..759c244 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -596,7 +596,8 @@ ResourceId ResourceProvider::CreateResourceFromTextureMailbox( if (mailbox.IsTexture()) { resource = InsertResource( id, - Resource(0, gfx::Size(), Resource::EXTERNAL, mailbox.target(), + Resource(0, mailbox.size_in_pixels(), Resource::EXTERNAL, + mailbox.target(), mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR, TEXTURE_HINT_IMMUTABLE, RESOURCE_TYPE_GL_TEXTURE, RGBA_8888)); } else { |