Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd

13 files changed, 46 insertions, 3 deletions

diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index f5c66a3e6b..6d86040839 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk
index 749ff01266..3e2989cca4 100644
--- a/skia/skia_chrome.target.darwin-mips.mk
+++ b/skia/skia_chrome.target.darwin-mips.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk
index 210fa9ea09..d55ec3bafe 100644
--- a/skia/skia_chrome.target.darwin-x86.mk
+++ b/skia/skia_chrome.target.darwin-x86.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -207,6 +208,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk
index f5c66a3e6b..6d86040839 100644
--- a/skia/skia_chrome.target.linux-arm.mk
+++ b/skia/skia_chrome.target.linux-arm.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk
index 749ff01266..3e2989cca4 100644
--- a/skia/skia_chrome.target.linux-mips.mk
+++ b/skia/skia_chrome.target.linux-mips.mk
@@ -101,6 +101,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk
index 210fa9ea09..d55ec3bafe 100644
--- a/skia/skia_chrome.target.linux-x86.mk
+++ b/skia/skia_chrome.target.linux-x86.mk
@@ -103,6 +103,7 @@ MY_DEFS_Debug := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -207,6 +208,7 @@ MY_DEFS_Release := \
 	'-DSK_BUILD_FOR_ANDROID' \
 	'-DUSE_CHROMIUM_SKIA' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index 2dca283850..6d3f1c5f3d 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -261,9 +261,10 @@
     }],
     [ 'OS != "ios"', {
       'dependencies': [
-        # FIXME: Add a dependency on
-        # '<(DEPTH)/third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config'
-        # once https://codereview.chromium.org/21137002 rolls into Chromium.
+        '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config',
+      ],
+      'export_dependent_settings': [
+        '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config',
       ],
     }],
     [ 'OS != "mac"', {
diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk
index 7d2cb164cc..86d43ccb8c 100644
--- a/skia/skia_library.target.darwin-arm.mk
+++ b/skia/skia_library.target.darwin-arm.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -107,6 +108,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -246,6 +248,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -431,6 +434,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -553,6 +557,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk
index 34fe6288a7..8365e9c729 100644
--- a/skia/skia_library.target.darwin-mips.mk
+++ b/skia/skia_library.target.darwin-mips.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -107,6 +108,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -246,6 +248,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -429,6 +432,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -550,6 +554,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk
index 69b4e75d16..22fbdae606 100644
--- a/skia/skia_library.target.darwin-x86.mk
+++ b/skia/skia_library.target.darwin-x86.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -108,6 +109,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -247,6 +249,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -432,6 +435,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -556,6 +560,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk
index 7d2cb164cc..86d43ccb8c 100644
--- a/skia/skia_library.target.linux-arm.mk
+++ b/skia/skia_library.target.linux-arm.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -107,6 +108,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -246,6 +248,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -431,6 +434,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -553,6 +557,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
 	'-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk
index 34fe6288a7..8365e9c729 100644
--- a/skia/skia_library.target.linux-mips.mk
+++ b/skia/skia_library.target.linux-mips.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -107,6 +108,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -246,6 +248,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -429,6 +432,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -550,6 +554,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk
index 69b4e75d16..22fbdae606 100644
--- a/skia/skia_library.target.linux-x86.mk
+++ b/skia/skia_library.target.linux-x86.mk
@@ -11,6 +11,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
 
 # Make sure our deps are built first.
 GYP_TARGET_DEPENDENCIES := \
+	$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
 	$(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
 
 GYP_GENERATED_OUTPUTS :=
@@ -108,6 +109,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkFilterShader.cpp \
 	third_party/skia/src/core/SkFlattenable.cpp \
 	third_party/skia/src/core/SkFlattenableBuffers.cpp \
+	third_party/skia/src/core/SkFlattenableSerialization.cpp \
 	third_party/skia/src/core/SkFloat.cpp \
 	third_party/skia/src/core/SkFloatBits.cpp \
 	third_party/skia/src/core/SkFontHost.cpp \
@@ -247,6 +249,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/effects/SkDashPathEffect.cpp \
 	third_party/skia/src/effects/SkDiscretePathEffect.cpp \
 	third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+	third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
 	third_party/skia/src/effects/SkEmbossMask.cpp \
 	third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
 	third_party/skia/src/effects/SkGpuBlurUtils.cpp \
@@ -432,6 +435,7 @@ MY_DEFS_Debug := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \
@@ -556,6 +560,7 @@ MY_DEFS_Release := \
 	'-DSK_GAMMA_EXPONENT=1.4' \
 	'-DSK_GAMMA_CONTRAST=0.0' \
 	'-DSK_USE_POSIX_THREADS' \
+	'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \
 	'-DUSE_STLPORT=1' \