summaryrefslogtreecommitdiffstats
path: root/cc/texture_layer_impl.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:29:09 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 22:29:09 +0000
commitab5a94478fe4d9f6e9c32a525eea652b7e743014 (patch)
tree705e2570e91130301a187d0b5386694c35589e26 /cc/texture_layer_impl.cc
parent695e0d4c84455f13115b9822e25f7ec3c857a6e1 (diff)
downloadchromium_src-ab5a94478fe4d9f6e9c32a525eea652b7e743014.zip
chromium_src-ab5a94478fe4d9f6e9c32a525eea652b7e743014.tar.gz
chromium_src-ab5a94478fe4d9f6e9c32a525eea652b7e743014.tar.bz2
Revert 171850
> This patch makes quad-clipping to a scissor window an explicit operation at quad-generation time. If the transform for the quad is a scale and or a transform clipping is a simple bounding box intersection and uv-recomputation. > > BUG=161871 > > > Review URL: https://chromiumcodereview.appspot.com/11418297 TBR=whunt@chromium.org BUG=164997 Review URL: https://codereview.chromium.org/11517007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_layer_impl.cc')
-rw-r--r--cc/texture_layer_impl.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index c45aa14..57e06a5 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -45,12 +45,7 @@ void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQu
gfx::Rect opaqueRect(contentsOpaque() ? quadRect : gfx::Rect());
scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
quad->SetNew(sharedQuadState, quadRect, opaqueRect, m_externalTextureResource, m_premultipliedAlpha, m_uvRect, m_flipped);
-
- // Perform explicit clipping on a quad to avoid setting a scissor later.
- if (sharedQuadState->is_clipped && quad->PerformClipping())
- sharedQuadState->is_clipped = false;
- if (!quad->rect.IsEmpty())
- quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
+ quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
}
void TextureLayerImpl::didDraw(ResourceProvider* resourceProvider)