Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388

10 files changed, 14 insertions, 30 deletions

diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index 3ef2cffaea..9e2bc82379 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -99,9 +99,7 @@ SK_API size_t PlatformCanvasStrideForWidth(unsigned width);
 // clip. In practice, this is usually either the top layer or nothing, since
 // we usually set the clip to new layers when we make them.
 //
-// If there is no layer that is not all clipped out, this will return a
-// dummy device so callers do not have to check. If you are concerned about
-// performance, check the clip before doing any painting.
+// This may return NULL, so callers need to check.
 //
 // This is different than SkCanvas' getDevice, because that returns the
 // bottommost device.
diff --git a/skia/ext/platform_device.cc b/skia/ext/platform_device.cc
index 83a191862d..c7f156516f 100644
--- a/skia/ext/platform_device.cc
+++ b/skia/ext/platform_device.cc
@@ -39,12 +39,13 @@ void SetPlatformDevice(SkDevice* device, PlatformDevice* platform_behaviour) {
 }
 
 PlatformDevice* GetPlatformDevice(SkDevice* device) {
-  SkMetaData& meta_data = device->getMetaData();
-  PlatformDevice* device_behaviour = NULL;
-  if (meta_data.findPtr(kDevicePlatformBehaviour,
-                        reinterpret_cast<void**>(&device_behaviour)))
-    return device_behaviour;
-
+  if (device) {
+    SkMetaData& meta_data = device->getMetaData();
+    PlatformDevice* device_behaviour = NULL;
+    if (meta_data.findPtr(kDevicePlatformBehaviour,
+                          reinterpret_cast<void**>(&device_behaviour)))
+      return device_behaviour;
+  }
   return NULL;
 }
 
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 8f5d2bfd2d..243231002d 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -259,7 +259,6 @@
         'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
 
         'IGNORE_ROT_AA_RECT_OPT',
-        'SK_IGNORE_IMAGE_PRESCALE',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
@@ -515,9 +514,6 @@
           ],
         }],
         [ 'OS == "win"', {
-          'defines': [
-            'SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS'
-          ],
           'sources!': [
             '../third_party/skia/src/ports/SkOSFile_posix.cpp',
             '../third_party/skia/src/ports/SkThread_pthread.cpp',
diff --git a/skia/skia.target.darwin-arm.mk b/skia/skia.target.darwin-arm.mk
index f471e05021..8145a1e6ac 100644
--- a/skia/skia.target.darwin-arm.mk
+++ b/skia/skia.target.darwin-arm.mk
@@ -166,6 +166,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -464,7 +465,6 @@ 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' \
@@ -589,7 +589,6 @@ 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 72061a20a5..5e2ef97d9a 100644
--- a/skia/skia.target.darwin-mips.mk
+++ b/skia/skia.target.darwin-mips.mk
@@ -166,6 +166,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -463,7 +464,6 @@ 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' \
@@ -587,7 +587,6 @@ 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 58ce82f5d9..e79c2bc943 100644
--- a/skia/skia.target.darwin-x86.mk
+++ b/skia/skia.target.darwin-x86.mk
@@ -167,6 +167,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -466,7 +467,6 @@ 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' \
@@ -593,7 +593,6 @@ 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 f471e05021..8145a1e6ac 100644
--- a/skia/skia.target.linux-arm.mk
+++ b/skia/skia.target.linux-arm.mk
@@ -166,6 +166,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -464,7 +465,6 @@ 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' \
@@ -589,7 +589,6 @@ 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 72061a20a5..5e2ef97d9a 100644
--- a/skia/skia.target.linux-mips.mk
+++ b/skia/skia.target.linux-mips.mk
@@ -166,6 +166,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -463,7 +464,6 @@ 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' \
@@ -587,7 +587,6 @@ 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 58ce82f5d9..e79c2bc943 100644
--- a/skia/skia.target.linux-x86.mk
+++ b/skia/skia.target.linux-x86.mk
@@ -167,6 +167,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkMath.cpp \
 	third_party/skia/src/core/SkMatrix.cpp \
 	third_party/skia/src/core/SkMetaData.cpp \
+	third_party/skia/src/core/SkMipMap.cpp \
 	third_party/skia/src/core/SkOrderedReadBuffer.cpp \
 	third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
 	third_party/skia/src/core/SkPackBits.cpp \
@@ -466,7 +467,6 @@ 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' \
@@ -593,7 +593,6 @@ 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_test_expectations.txt b/skia/skia_test_expectations.txt
index 14d681eb14..559db8c40a 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -58,9 +58,4 @@ crbug.com/258850 svg/custom/marker-opacity.svg [ 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)