Fixed mask positioning and texture UVs bugs in

the software compositor.

Layout tests that pass with this patch:

  platform/chromium/virtual/softwarecompositing/masks/layer-mask-placement.html
  platform/chromium/virtual/softwarecompositing/masks/mask-of-clipped-layer.html


BUG=124671

Review URL: https://chromiumcodereview.appspot.com/11313017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164950 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 30 insertions, 24 deletions

diff --git a/cc/render_surface_impl.cc b/cc/render_surface_impl.cc
index 54ff6b1..ece1d10 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/render_surface_impl.cc
@@ -233,8 +233,8 @@ void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQ
 
     float maskTexCoordScaleX = 1;
     float maskTexCoordScaleY = 1;
-    float maskTexCoordOffsetX = 1;
-    float maskTexCoordOffsetY = 1;
+    float maskTexCoordOffsetX = 0;
+    float maskTexCoordOffsetY = 0;
     if (maskLayer) {
         maskTexCoordScaleX = static_cast<float>(contentRect().width()) / maskLayer->contentBounds().width();
         maskTexCoordScaleY = static_cast<float>(contentRect().height()) / maskLayer->contentBounds().height();
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 312d873..3d0b60e 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -254,8 +254,8 @@ void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD
     }
 
     // FIXME: Add support for non-premultiplied alpha.
-    ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
-    const SkBitmap* bitmap = quadResourceLock.skBitmap();
+    ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->resourceId());
+    const SkBitmap* bitmap = lock.skBitmap();
     gfx::RectF uvRect = gfx::ScaleRect(quad->uvRect(), bitmap->width(), bitmap->height());
     SkIRect skUvRect = toSkIRect(gfx::ToEnclosingRect(uvRect));
     if (quad->flipped())
@@ -266,46 +266,52 @@ void SoftwareRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureD
 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* quad)
 {
     DCHECK(isSoftwareResource(quad->resourceId()));
-    ResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
+    ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->resourceId());
 
     SkIRect uvRect = toSkIRect(gfx::Rect(quad->textureOffset(), quad->quadRect().size()));
-    m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
+    m_skCurrentCanvas->drawBitmapRect(*lock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad* quad)
 {
-    CachedTexture* contentsTexture = m_renderPassTextures.get(quad->renderPassId());
-    if (!contentsTexture || !contentsTexture->id())
+    CachedTexture* contentTexture = m_renderPassTextures.get(quad->renderPassId());
+    if (!contentTexture || !contentTexture->id())
         return;
 
-    DCHECK(isSoftwareResource(contentsTexture->id()));
-    ResourceProvider::ScopedReadLockSoftware contentsTextureLock(m_resourceProvider, contentsTexture->id());
+    DCHECK(isSoftwareResource(contentTexture->id()));
+    ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTexture->id());
 
-    const SkBitmap* bitmap = contentsTextureLock.skBitmap();
+    SkRect destRect = toSkRect(quadVertexRect());
 
-    SkRect sourceRect;
-    bitmap->getBounds(&sourceRect);
+    const SkBitmap* content = lock.skBitmap();
 
-    SkRect destRect = toSkRect(quadVertexRect());
+    SkRect contentRect;
+    content->getBounds(&contentRect);
 
-    SkMatrix matrix;
-    matrix.setRectToRect(sourceRect, destRect, SkMatrix::kFill_ScaleToFit);
+    SkMatrix contentMat;
+    contentMat.setRectToRect(contentRect, destRect, SkMatrix::kFill_ScaleToFit);
 
-    SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(*bitmap,
+    SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(*content,
                                                                SkShader::kClamp_TileMode,
                                                                SkShader::kClamp_TileMode));
-    shader->setLocalMatrix(matrix);
+    shader->setLocalMatrix(contentMat);
     m_skCurrentPaint.setShader(shader);
 
     if (quad->maskResourceId()) {
-        ResourceProvider::ScopedReadLockSoftware maskResourceLock(m_resourceProvider, quad->maskResourceId());
-        const SkBitmap* maskBitmap = maskResourceLock.skBitmap();
+        ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, quad->maskResourceId());
+
+        const SkBitmap* mask = maskLock.skBitmap();
+
+        SkRect maskRect = SkRect::MakeXYWH(
+            quad->maskTexCoordOffsetX() * mask->width(),
+            quad->maskTexCoordOffsetY() * mask->height(),
+            quad->maskTexCoordScaleX() * mask->width(),
+            quad->maskTexCoordScaleY() * mask->height());
 
         SkMatrix maskMat;
-        maskMat.setRectToRect(toSkRect(quad->quadRect()), destRect, SkMatrix::kFill_ScaleToFit);
-        maskMat.postTranslate(quad->maskTexCoordOffsetX(), quad->maskTexCoordOffsetY());
+        maskMat.setRectToRect(maskRect, destRect, SkMatrix::kFill_ScaleToFit);
 
-        SkAutoTUnref<SkShader> maskShader(SkShader::CreateBitmapShader(*maskBitmap,
+        SkAutoTUnref<SkShader> maskShader(SkShader::CreateBitmapShader(*mask,
                                                                        SkShader::kClamp_TileMode,
                                                                        SkShader::kClamp_TileMode));
         maskShader->setLocalMatrix(maskMat);
@@ -319,7 +325,7 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
         m_skCurrentPaint.setRasterizer(maskRasterizer);
         m_skCurrentCanvas->drawRect(destRect, m_skCurrentPaint);
     } else {
-        // FIXME: Apply background filters and blend with contents
+        // FIXME: Apply background filters and blend with content
         m_skCurrentCanvas->drawRect(destRect, m_skCurrentPaint);
     }
 }