diff options
| author | erikchen <erikchen@chromium.org> | 2016-03-16 15:32:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 22:35:24 +0000 |
| commit | 4e7ecf36fb2af3e3677c085de5b1ea6e7e75f3be (patch) | |
| tree | 13a62ad99cb0ea622967a3fbf958c97752f095f3 /cc | |
| parent | 8ce1943be5284c67fb79cae9bf1576624fba97b6 (diff) | |
| download | chromium_src-4e7ecf36fb2af3e3677c085de5b1ea6e7e75f3be.zip chromium_src-4e7ecf36fb2af3e3677c085de5b1ea6e7e75f3be.tar.gz chromium_src-4e7ecf36fb2af3e3677c085de5b1ea6e7e75f3be.tar.bz2 | |
Re-enable IOSurface Canvas2D.
Previously, WebExternalTextureLayerImpl inferred the size of the texture from
the bounds of the WebLayer, but the two are not necessarily the same. This CL
passes the texture size through WebExternalTextureMailbox.
This CL also adds a pixel test.
BUG=595063
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1804243002
Cr-Commit-Position: refs/heads/master@{#381570}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/blink/web_external_texture_layer_impl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/blink/web_external_texture_layer_impl.cc b/cc/blink/web_external_texture_layer_impl.cc index 03f6e18..e08f9e3 100644 --- a/cc/blink/web_external_texture_layer_impl.cc +++ b/cc/blink/web_external_texture_layer_impl.cc @@ -87,8 +87,10 @@ bool WebExternalTextureLayerImpl::PrepareTextureMailbox( memcpy(&sync_token, client_mailbox.syncToken, sizeof(sync_token)); gfx::Size size; - if (client_mailbox.allowOverlay) - size = gfx::Size(layer_->bounds().width, layer_->bounds().height); + if (client_mailbox.allowOverlay) { + size = gfx::Size(client_mailbox.textureSize.width, + client_mailbox.textureSize.height); + } *mailbox = cc::TextureMailbox(name, sync_token, client_mailbox.textureTarget, size, |