diff options
| author | jscholler@chromium.org <jscholler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 00:13:21 +0000 |
|---|---|---|
| committer | jscholler@chromium.org <jscholler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-18 00:13:21 +0000 |
| commit | 1fd555bac29e0c828fe90beda3af9274d60eefa1 (patch) | |
| tree | 2e06a677141329a2877a24ad2ff29cad0f607b3e /content | |
| parent | 62b3ef56542045729e6c19185af00930906f3803 (diff) | |
| download | chromium_src-1fd555bac29e0c828fe90beda3af9274d60eefa1.zip chromium_src-1fd555bac29e0c828fe90beda3af9274d60eefa1.tar.gz chromium_src-1fd555bac29e0c828fe90beda3af9274d60eefa1.tar.bz2 | |
Putting back: Add point-based UV coordinate on TextureLayer
Revert "Revert 177288"
TBR=ilevy@chromium.org
This reverts commit 3543975945a5667aa3fb48c6d0e1b6312d1ed293.
BUG=168927
Review URL: https://chromiumcodereview.appspot.com/11902005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/cc_messages.h | 3 | ||||
| -rw-r--r-- | content/common/cc_messages_unittest.cc | 3 | ||||
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin_compositing_helper.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h index 1a7bcc0..d0d1da6 100644 --- a/content/common/cc_messages.h +++ b/content/common/cc_messages.h @@ -176,7 +176,8 @@ IPC_STRUCT_TRAITS_BEGIN(cc::TextureDrawQuad) IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad) IPC_STRUCT_TRAITS_MEMBER(resource_id) IPC_STRUCT_TRAITS_MEMBER(premultiplied_alpha) - IPC_STRUCT_TRAITS_MEMBER(uv_rect) + IPC_STRUCT_TRAITS_MEMBER(uv_top_left) + IPC_STRUCT_TRAITS_MEMBER(uv_bottom_right) IPC_STRUCT_TRAITS_MEMBER(flipped) IPC_STRUCT_TRAITS_END() diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc index 7261439..efa840d 100644 --- a/content/common/cc_messages_unittest.cc +++ b/content/common/cc_messages_unittest.cc @@ -144,7 +144,8 @@ class CCMessagesTest : public testing::Test { void Compare(const TextureDrawQuad* a, const TextureDrawQuad* b) { EXPECT_EQ(a->resource_id, b->resource_id); EXPECT_EQ(a->premultiplied_alpha, b->premultiplied_alpha); - EXPECT_EQ(a->uv_rect, b->uv_rect); + EXPECT_EQ(a->uv_top_left, b->uv_top_left); + EXPECT_EQ(a->uv_bottom_right, b->uv_bottom_right); EXPECT_EQ(a->flipped, b->flipped); } diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc index dd7d84f..df54f1a 100644 --- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc +++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc @@ -94,7 +94,7 @@ void BrowserPluginCompositingHelper::UpdateUVRect() { uv_rect.set_height(static_cast<float>(container_size_.height()) / static_cast<float>(buffer_size_.height())); } - texture_layer_->setUVRect(uv_rect); + texture_layer_->setUV(uv_rect.origin(), uv_rect.bottom_right()); } } // namespace content |