tree 3eef0de0da4c913bec6f0d4015806e14a4c896da
parent 246be068530a88747ff941b76ff500872ffe8c2b
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1386942074 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1386942074 +0000

Revert "Revert of https://codereview.chromium.org/112783004/"

This reverts commit 3293fe57a7507541e9040eab880dcd82c43881f4.

Conflicts:
	src/core/SkScaledImageCache.cpp

BUG=

Review URL: https://codereview.chromium.org/108613005

git-svn-id: http://skia.googlecode.com/svn/trunk/src@12663 2bbb7eff-a529-9590-31e7-b0007b416f81