summaryrefslogtreecommitdiff
path: root/skia
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-08-08 10:24:53 +0100
committerBen Murdoch <benm@google.com>2013-08-08 10:24:53 +0100
commitbb1529ce867d8845a77ec7cdf3e3003ef1771a40 (patch)
treef78d0de03cc8aed1a934d921636a0beb8d164378 /skia
parentc95505573d864f17cabf515e32f5b8e0831ae237 (diff)
downloadchromium_org-bb1529ce867d8845a77ec7cdf3e3003ef1771a40.tar.gz
Merge from Chromium at DEPS revision r216370
This commit was generated by merge_to_master.py. Change-Id: I739228187a6f1df6c28c5761160e593a49891113
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/convolver_unittest.cc8
-rw-r--r--skia/skia_library.gypi2
-rw-r--r--skia/skia_library.target.darwin-arm.mk2
-rw-r--r--skia/skia_library.target.darwin-mips.mk2
-rw-r--r--skia/skia_library.target.darwin-x86.mk2
-rw-r--r--skia/skia_library.target.linux-arm.mk2
-rw-r--r--skia/skia_library.target.linux-mips.mk2
-rw-r--r--skia/skia_library.target.linux-x86.mk2
8 files changed, 21 insertions, 1 deletions
diff --git a/skia/ext/convolver_unittest.cc b/skia/ext/convolver_unittest.cc
index f99bf78c00..8d0c852a16 100644
--- a/skia/ext/convolver_unittest.cc
+++ b/skia/ext/convolver_unittest.cc
@@ -212,7 +212,13 @@ TEST(Convolver, AddFilter) {
ASSERT_EQ(0, filter_length);
}
-TEST(Convolver, SIMDVerification) {
+#if defined(THREAD_SANITIZER)
+// Times out under ThreadSanitizer, http://crbug.com/134400.
+#define MAYBE_SIMDVerification DISABLED_SIMDVerification
+#else
+#define MAYBE_SIMDVerification SIMDVerification
+#endif
+TEST(Convolver, MAYBE_SIMDVerification) {
int source_sizes[][2] = {
{1,1}, {1,2}, {1,3}, {1,4}, {1,5},
{2,1}, {2,2}, {2,3}, {2,4}, {2,5},
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index e91bfcb785..2dca283850 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -127,6 +127,8 @@
'../third_party/skia/src/ports/SkTLS_pthread.cpp',
'../third_party/skia/src/ports/SkTLS_win.cpp',
+ '../third_party/skia/src/sfnt/SkOTTable_name.cpp',
+ '../third_party/skia/src/sfnt/SkOTTable_name.h',
'../third_party/skia/src/sfnt/SkOTUtils.cpp',
'../third_party/skia/src/sfnt/SkOTUtils.h',
diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk
index 52cf5d45fc..7d2cb164cc 100644
--- a/skia/skia_library.target.darwin-arm.mk
+++ b/skia/skia_library.target.darwin-arm.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -240,6 +241,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk
index 115fb00941..34fe6288a7 100644
--- a/skia/skia_library.target.darwin-mips.mk
+++ b/skia/skia_library.target.darwin-mips.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -240,6 +241,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk
index bf9b65e484..69b4e75d16 100644
--- a/skia/skia_library.target.darwin-x86.mk
+++ b/skia/skia_library.target.darwin-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -241,6 +242,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk
index 52cf5d45fc..7d2cb164cc 100644
--- a/skia/skia_library.target.linux-arm.mk
+++ b/skia/skia_library.target.linux-arm.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -240,6 +241,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk
index 115fb00941..34fe6288a7 100644
--- a/skia/skia_library.target.linux-mips.mk
+++ b/skia/skia_library.target.linux-mips.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -240,6 +241,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk
index bf9b65e484..69b4e75d16 100644
--- a/skia/skia_library.target.linux-x86.mk
+++ b/skia/skia_library.target.linux-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/ports/SkThread_pthread.cpp \
third_party/skia/src/ports/SkTime_Unix.cpp \
third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
third_party/skia/src/sfnt/SkOTUtils.cpp \
third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
@@ -241,6 +242,7 @@ LOCAL_SRC_FILES := \
third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
third_party/skia/src/effects/SkColorMatrix.cpp \
third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
third_party/skia/src/effects/SkCornerPathEffect.cpp \
third_party/skia/src/effects/SkDashPathEffect.cpp \
third_party/skia/src/effects/SkDiscretePathEffect.cpp \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 23:42:37 +0000