Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Unified Diff: cc/CCRendererSoftware.cpp

Issue 10989028: cc: Remove WebCore dependecies from CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/CCRendererSoftware.cpp
diff --git a/cc/CCRendererSoftware.cpp b/cc/CCRendererSoftware.cpp
index c6994fa86458e7fab55b5cc0cc018e4a664455b5..414dd5fc1836da61c6142b521c6e2914be22fa2b 100644
--- a/cc/CCRendererSoftware.cpp
+++ b/cc/CCRendererSoftware.cpp
@@ -227,10 +227,12 @@ void CCRendererSoftware::drawTextureQuad(const DrawingFrame& frame, const CCText
return;
}
+ IntRect quadRect = quad->quadRect();
+
// FIXME: Add support for non-premultiplied alpha.
CCResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
FloatRect uvRect = quad->uvRect();
- uvRect.scale(quad->quadRect().width(), quad->quadRect().height());
+ uvRect.scale(quadRect.width(), quadRect.height());
SkIRect skUvRect = toSkIRect(enclosingIntRect(uvRect));
if (quad->flipped())
m_skCurrentCanvas->scale(1, -1);
@@ -242,7 +244,7 @@ void CCRendererSoftware::drawTileQuad(const DrawingFrame& frame, const CCTileDra
ASSERT(isSoftwareResource(quad->resourceId()));
CCResourceProvider::ScopedReadLockSoftware quadResourceLock(m_resourceProvider, quad->resourceId());
- SkIRect uvRect = toSkIRect(IntRect(quad->textureOffset(), quad->quadRect().size()));
+ SkIRect uvRect = toSkIRect(IntRect(quad->textureOffset(), static_cast<IntRect>(quad->quadRect()).size()));
m_skCurrentCanvas->drawBitmapRect(*quadResourceLock.skBitmap(), &uvRect, toSkRect(quadVertexRect()), &m_skCurrentPaint);
}
« no previous file with comments | « cc/CCRendererGLTest.cpp ('k') | cc/CCRendererSoftwareTest.cpp » ('j') | cc/scoped_ptr_hash_map.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698