Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a

16 files changed, 105 insertions, 48 deletions

diff --git a/skia/skia.gyp b/skia/skia.gyp
index 71f41c2800..486c72abe8 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -257,6 +257,7 @@
         'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
 
         'IGNORE_ROT_AA_RECT_OPT',
+        'SK_IGNORE_IMAGE_PRESCALE',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
@@ -685,6 +686,7 @@
             '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
             'ext/convolver_SSE2.cc',
           ],
           'conditions': [
diff --git a/skia/skia.target.darwin-arm.mk b/skia/skia.target.darwin-arm.mk
index 5f178dc6fc..e489c81599 100644
--- a/skia/skia.target.darwin-arm.mk
+++ b/skia/skia.target.darwin-arm.mk
@@ -103,10 +103,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -284,6 +284,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -336,6 +337,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -438,8 +440,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -459,6 +462,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -561,8 +565,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -582,6 +587,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia.target.darwin-mips.mk b/skia/skia.target.darwin-mips.mk
index 550303f913..30d377e354 100644
--- a/skia/skia.target.darwin-mips.mk
+++ b/skia/skia.target.darwin-mips.mk
@@ -103,10 +103,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -284,6 +284,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -336,6 +337,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -438,6 +440,8 @@ MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -457,6 +461,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -559,6 +564,8 @@ MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -578,6 +585,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia.target.darwin-x86.mk b/skia/skia.target.darwin-x86.mk
index 9eeb8fd43b..63e4117a32 100644
--- a/skia/skia.target.darwin-x86.mk
+++ b/skia/skia.target.darwin-x86.mk
@@ -104,10 +104,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -285,6 +285,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -337,6 +338,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -440,8 +442,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -461,6 +464,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -565,8 +569,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -586,6 +591,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia.target.linux-arm.mk b/skia/skia.target.linux-arm.mk
index 5f178dc6fc..e489c81599 100644
--- a/skia/skia.target.linux-arm.mk
+++ b/skia/skia.target.linux-arm.mk
@@ -103,10 +103,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -284,6 +284,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -336,6 +337,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -438,8 +440,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -459,6 +462,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -561,8 +565,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -582,6 +587,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia.target.linux-mips.mk b/skia/skia.target.linux-mips.mk
index 550303f913..30d377e354 100644
--- a/skia/skia.target.linux-mips.mk
+++ b/skia/skia.target.linux-mips.mk
@@ -103,10 +103,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -284,6 +284,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -336,6 +337,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -438,6 +440,8 @@ MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -457,6 +461,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -559,6 +564,8 @@ MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -578,6 +585,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia.target.linux-x86.mk b/skia/skia.target.linux-x86.mk
index 9eeb8fd43b..63e4117a32 100644
--- a/skia/skia.target.linux-x86.mk
+++ b/skia/skia.target.linux-x86.mk
@@ -104,10 +104,10 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkBBoxRecord.cpp \
 	third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
 	third_party/skia/src/core/SkBitmap.cpp \
+	third_party/skia/src/core/SkBitmapFilter.cpp \
 	third_party/skia/src/core/SkBitmapHeap.cpp \
 	third_party/skia/src/core/SkBitmapProcShader.cpp \
 	third_party/skia/src/core/SkBitmapProcState.cpp \
-	third_party/skia/src/core/SkBitmapProcBicubic.cpp \
 	third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
 	third_party/skia/src/core/SkBitmap_scroll.cpp \
 	third_party/skia/src/core/SkBlitMask_D32.cpp \
@@ -285,6 +285,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
 	third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
 	third_party/skia/src/effects/SkLayerDrawLooper.cpp \
 	third_party/skia/src/effects/SkLayerRasterizer.cpp \
@@ -337,6 +338,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/gpu/GrMemory.cpp \
 	third_party/skia/src/gpu/GrMemoryPool.cpp \
 	third_party/skia/src/gpu/GrOvalRenderer.cpp \
+	third_party/skia/src/gpu/GrPaint.cpp \
 	third_party/skia/src/gpu/GrPath.cpp \
 	third_party/skia/src/gpu/GrPathRendererChain.cpp \
 	third_party/skia/src/gpu/GrPathRenderer.cpp \
@@ -440,8 +442,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -461,6 +464,7 @@ MY_DEFS_Debug := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
@@ -565,8 +569,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -586,6 +591,7 @@ MY_DEFS_Release := \
 	'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
 	'-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
 	'-DIGNORE_ROT_AA_RECT_OPT' \
+	'-DSK_IGNORE_IMAGE_PRESCALE' \
 	'-DSK_GAMMA_APPLY_TO_A8' \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
diff --git a/skia/skia_opts.target.darwin-arm.mk b/skia/skia_opts.target.darwin-arm.mk
index f8af117c88..73233b487f 100644
--- a/skia/skia_opts.target.darwin-arm.mk
+++ b/skia/skia_opts.target.darwin-arm.mk
@@ -69,8 +69,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -162,8 +163,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts.target.darwin-mips.mk b/skia/skia_opts.target.darwin-mips.mk
index 0ef2a840a1..a095d2aef3 100644
--- a/skia/skia_opts.target.darwin-mips.mk
+++ b/skia/skia_opts.target.darwin-mips.mk
@@ -72,6 +72,8 @@ MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -162,6 +164,8 @@ MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts.target.darwin-x86.mk b/skia/skia_opts.target.darwin-x86.mk
index f7d9c11635..ff32e2e0bd 100644
--- a/skia/skia_opts.target.darwin-x86.mk
+++ b/skia/skia_opts.target.darwin-x86.mk
@@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp \
 	third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp \
 	third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp \
-	third_party/skia/src/opts/SkUtils_opts_SSE2.cpp
+	third_party/skia/src/opts/SkUtils_opts_SSE2.cpp \
+	third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
 
 
 # Flags passed to both C and C++ files.
@@ -73,8 +74,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -166,8 +168,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts.target.linux-arm.mk b/skia/skia_opts.target.linux-arm.mk
index f8af117c88..73233b487f 100644
--- a/skia/skia_opts.target.linux-arm.mk
+++ b/skia/skia_opts.target.linux-arm.mk
@@ -69,8 +69,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -162,8 +163,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts.target.linux-mips.mk b/skia/skia_opts.target.linux-mips.mk
index 0ef2a840a1..a095d2aef3 100644
--- a/skia/skia_opts.target.linux-mips.mk
+++ b/skia/skia_opts.target.linux-mips.mk
@@ -72,6 +72,8 @@ MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -162,6 +164,8 @@ MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts.target.linux-x86.mk b/skia/skia_opts.target.linux-x86.mk
index f7d9c11635..ff32e2e0bd 100644
--- a/skia/skia_opts.target.linux-x86.mk
+++ b/skia/skia_opts.target.linux-x86.mk
@@ -29,7 +29,8 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp \
 	third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp \
 	third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp \
-	third_party/skia/src/opts/SkUtils_opts_SSE2.cpp
+	third_party/skia/src/opts/SkUtils_opts_SSE2.cpp \
+	third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
 
 
 # Flags passed to both C and C++ files.
@@ -73,8 +74,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -166,8 +168,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk
index 13c1f1663b..881b5561a8 100644
--- a/skia/skia_opts_neon.target.darwin-arm.mk
+++ b/skia/skia_opts_neon.target.darwin-arm.mk
@@ -70,8 +70,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -158,8 +159,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_opts_neon.target.linux-arm.mk b/skia/skia_opts_neon.target.linux-arm.mk
index 13c1f1663b..881b5561a8 100644
--- a/skia/skia_opts_neon.target.linux-arm.mk
+++ b/skia/skia_opts_neon.target.linux-arm.mk
@@ -70,8 +70,9 @@ MY_CFLAGS_Debug := \
 MY_DEFS_Debug := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
@@ -158,8 +159,9 @@ MY_CFLAGS_Release := \
 MY_DEFS_Release := \
 	'-DANGLE_DX11' \
 	'-D_FILE_OFFSET_BITS=64' \
-	'-DUSE_LINUX_BREAKPAD' \
 	'-DNO_TCMALLOC' \
+	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index b923fc2130..14d681eb14 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -48,26 +48,19 @@
 #
 # START OVERRIDES HERE
 
-# These failures are likely due to r209827 or r209833, but snuck in during the
-# Mesa upgrade suppressions, and will have to be rebaselined again.
-crbug.com/238755 compositing/3d-corners.html [ ImageOnlyFailure ]
-crbug.com/238755 compositing/perpendicular-layer-sorting.html [ ImageOnlyFailure ]
-crbug.com/238755 [ Win ] compositing/flat-with-transformed-child.html [ ImageOnlyFailure ]
-crbug.com/238755 compositing/geometry/layer-due-to-layer-children-deep.html [ ImageOnlyFailure ]
-crbug.com/238755 compositing/geometry/layer-due-to-layer-children.html [ ImageOnlyFailure ]
-crbug.com/238755 [ MountainLion ] css3/filters/effect-brightness-hw.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/general/perspective-units.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping-2.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping-3.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping-deep.html [ ImageOnlyFailure Slow ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping-origins.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ ImageOnlyFailure ]
-crbug.com/238755 transforms/3d/point-mapping/3d-point-mapping.html [ ImageOnlyFailure ]
+# r9928 fixed arc end capping but caused some minor image differences
+# in the following 6 layout tests  
+crbug.com/258850 svg/W3C-SVG-1.1/paths-data-10-t.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/W3C-SVG-1.1/struct-group-03-t.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/as-background-image/svg-as-background-6.html [ ImageOnlyFailure ]
+crbug.com/258850 svg/custom/marker-opacity.svg [ ImageOnlyFailure ]
 
-# Still need rebaselines due to Mesa upgrade.
-crbug.com/238755 [ Linux ] fast/canvas/webgl/uniform-location.html [ Failure ]
-crbug.com/238755 [ Linux ] fast/canvas/webgl/gl-uniform-arrays.html [ Failure ]
-crbug.com/238755 [ Linux ] virtual/gpu/fast/canvas/webgl/point-size.html [ Failure ]
-crbug.com/238755 [ Linux ] css3/filters/custom/effect-custom-combined-missing.html [ ImageOnlyFailure ]
+crbug.com/258850 svg/batik/text/smallFonts.svg [ ImageOnlyFailure ]
+crbug.com/258850 svg/batik/text/textFeatures.svg [ ImageOnlyFailure ]
+
+# The Skia DEPS roll to r10025 introduced 1 new image difference
+# due to changes to the image resizing code in r9980 
+# (fix bug with awesome filtered images sometimes being slightly offset)
+crbug.com/260153 virtual/deferred/fast/images/webp-color-profile-lossy.html [ ImageOnlyFailure ]
 
 # END OVERRIDES HERE (this line ensures that the file is newline-terminated)