Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c

9 files changed, 17 insertions, 0 deletions

diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc
index 6c3f5ca7d3..29f5adbb68 100644
--- a/skia/ext/analysis_canvas.cc
+++ b/skia/ext/analysis_canvas.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/debug/trace_event.h"
+#include "base/logging.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkDraw.h"
diff --git a/skia/ext/analysis_canvas.h b/skia/ext/analysis_canvas.h
index fa83975959..93e3da3e1f 100644
--- a/skia/ext/analysis_canvas.h
+++ b/skia/ext/analysis_canvas.h
@@ -5,6 +5,7 @@
 #ifndef SKIA_EXT_ANALYSIS_CANVAS_H_
 #define SKIA_EXT_ANALYSIS_CANVAS_H_
 
+#include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkPicture.h"
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 486c72abe8..8f5d2bfd2d 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -116,7 +116,9 @@
         '../third_party/skia/src/ports/SkOSFile_win.cpp', 
         #'../third_party/skia/src/ports/SkThread_none.cpp',
         '../third_party/skia/src/ports/SkThread_pthread.cpp',
+        '../third_party/skia/src/ports/SkTLS_pthread.cpp',
         '../third_party/skia/src/ports/SkThread_win.cpp',
+        '../third_party/skia/src/ports/SkTLS_win.cpp',
         '../third_party/skia/src/ports/SkTime_Unix.cpp',
         #'../third_party/skia/src/ports/SkXMLParser_empty.cpp',
         #'../third_party/skia/src/ports/SkXMLParser_expat.cpp',
@@ -519,6 +521,7 @@
           'sources!': [
             '../third_party/skia/src/ports/SkOSFile_posix.cpp',
             '../third_party/skia/src/ports/SkThread_pthread.cpp',
+            '../third_party/skia/src/ports/SkTLS_pthread.cpp',
             '../third_party/skia/src/ports/SkTime_Unix.cpp',
             'ext/SkThread_chrome.cc',
           ],
diff --git a/skia/skia.target.darwin-arm.mk b/skia/skia.target.darwin-arm.mk
index e489c81599..f471e05021 100644
--- a/skia/skia.target.darwin-arm.mk
+++ b/skia/skia.target.darwin-arm.mk
@@ -80,6 +80,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -143,6 +144,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \
diff --git a/skia/skia.target.darwin-mips.mk b/skia/skia.target.darwin-mips.mk
index 30d377e354..72061a20a5 100644
--- a/skia/skia.target.darwin-mips.mk
+++ b/skia/skia.target.darwin-mips.mk
@@ -80,6 +80,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -143,6 +144,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \
diff --git a/skia/skia.target.darwin-x86.mk b/skia/skia.target.darwin-x86.mk
index 63e4117a32..58ce82f5d9 100644
--- a/skia/skia.target.darwin-x86.mk
+++ b/skia/skia.target.darwin-x86.mk
@@ -81,6 +81,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -144,6 +145,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \
diff --git a/skia/skia.target.linux-arm.mk b/skia/skia.target.linux-arm.mk
index e489c81599..f471e05021 100644
--- a/skia/skia.target.linux-arm.mk
+++ b/skia/skia.target.linux-arm.mk
@@ -80,6 +80,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -143,6 +144,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \
diff --git a/skia/skia.target.linux-mips.mk b/skia/skia.target.linux-mips.mk
index 30d377e354..72061a20a5 100644
--- a/skia/skia.target.linux-mips.mk
+++ b/skia/skia.target.linux-mips.mk
@@ -80,6 +80,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -143,6 +144,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \
diff --git a/skia/skia.target.linux-x86.mk b/skia/skia.target.linux-x86.mk
index 63e4117a32..58ce82f5d9 100644
--- a/skia/skia.target.linux-x86.mk
+++ b/skia/skia.target.linux-x86.mk
@@ -81,6 +81,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/ports/SkOSFile_posix.cpp \
 	third_party/skia/src/ports/SkOSFile_stdio.cpp \
 	third_party/skia/src/ports/SkThread_pthread.cpp \
+	third_party/skia/src/ports/SkTLS_pthread.cpp \
 	third_party/skia/src/ports/SkTime_Unix.cpp \
 	third_party/skia/src/sfnt/SkOTUtils.cpp \
 	third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
@@ -144,6 +145,7 @@ LOCAL_SRC_FILES := \
 	third_party/skia/src/core/SkEdge.cpp \
 	third_party/skia/src/core/SkError.cpp \
 	third_party/skia/src/core/SkFilterProc.cpp \
+	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/SkFloat.cpp \