Fixed tile filtering for the software compositor.

cc/software_renderer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/software_renderer.h"
 
 #include "cc/debug_border_draw_quad.h"
 #include "cc/render_pass_draw_quad.h"
@@ skipping 239 matching lines @@
 {
     if (!isSoftwareResource(quad->resourceId())) {
         drawUnsupportedQuad(frame, quad);
         return;
     }
 
     // FIXME: Add support for non-premultiplied alpha.
     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));
+    SkRect skUvRect = toSkRect(uvRect);
+
     if (quad->flipped())
         m_skCurrentCanvas->scale(1, -1);
-    m_skCurrentCanvas->drawBitmapRect(*bitmap, &skUvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
+    m_skCurrentCanvas->drawBitmapRectToRect(*bitmap, &skUvRect,
+                                            toSkRect(quadVertexRect()),
+                                            &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQuad* quad)
 {
     DCHECK(isSoftwareResource(quad->resourceId()));
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->resourceId());
 
-    SkIRect uvRect = toSkIRect(gfx::Rect(gfx::PointAtOffsetFromOrigin(quad->textureOffset()), quad->quadRect().size()));
-    m_skCurrentCanvas->drawBitmapRect(*lock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
+    SkRect uvRect = SkRect::MakeXYWH(
+        quad->textureOffset().x(), quad->textureOffset().y(),
+        quad->quadRect().width(), quad->quadRect().height());
+    if (quad->textureFilter() != GL_NEAREST)
+        m_skCurrentPaint.setFilterBitmap(true);
+    m_skCurrentCanvas->drawBitmapRectToRect(*lock.skBitmap(), &uvRect,
+                                            toSkRect(quadVertexRect()),
+                                            &m_skCurrentPaint);
 }
 
 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad* quad)
 {
     CachedTexture* contentTexture = m_renderPassTextures.get(quad->renderPassId());
     if (!contentTexture || !contentTexture->id())
         return;
 
     DCHECK(isSoftwareResource(contentTexture->id()));
     ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, contentTexture->id());
@@ skipping 72 matching lines @@
 }
 
 void SoftwareRenderer::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }