Merge third_party/skia/include from https://chromium.googlesource.com/external/skia/include.git at 2f8d8f8b6d7acd9d0ebdc0a35f25fbb41999a37f
This commit was generated by merge_from_chromium.py.
Change-Id: I5a60db7f05da0f6ac0cab03c208e4e079dd3aad9
diff --git a/core/SkFixed.h b/core/SkFixed.h
index abeeccc..acfbe9a 100644
--- a/core/SkFixed.h
+++ b/core/SkFixed.h
@@ -190,7 +190,7 @@
#define SkFixedSquare(a) SkFixedSquare_longlong(a)
#endif
-#if defined(SK_CPU_ARM) && !defined(__thumb__)
+#if defined(SK_CPU_ARM)
/* This guy does not handle NaN or other obscurities, but is faster than
than (int)(x*65536)
*/
@@ -203,6 +203,7 @@
"mov %2, %3, lsl #8 \n"
"orr %2, %2, #0x80000000 \n"
"mov %1, %2, lsr %1 \n"
+ "it cs \n"
"rsbcs %1, %1, #0 \n"
: "=r"(x), "=&r"(y), "=&r"(z)
: "r"(x)
diff --git a/core/SkPreConfig.h b/core/SkPreConfig.h
index 11cb223..a59ead1 100644
--- a/core/SkPreConfig.h
+++ b/core/SkPreConfig.h
@@ -195,13 +195,8 @@
//////////////////////////////////////////////////////////////////////
-/**
- * THUMB is the only known config where we avoid small branches in
- * favor of more complex math.
- */
-#if !(defined(__arm__) && defined(__thumb__))
- #define SK_CPU_HAS_CONDITIONAL_INSTR
-#endif
+// TODO(mtklein): propagate this through the codebase and remove
+#define SK_CPU_HAS_CONDITIONAL_INSTR
//////////////////////////////////////////////////////////////////////
diff --git a/core/SkTypeface.h b/core/SkTypeface.h
index 0fd2ddb..429a24b 100644
--- a/core/SkTypeface.h
+++ b/core/SkTypeface.h
@@ -225,6 +225,13 @@
int getUnitsPerEm() const;
/**
+ * Return the family name for this typeface. It will always be returned
+ * encoded as UTF8, but the language of the name is whatever the host
+ * platform chooses.
+ */
+ void getFamilyName(SkString* name) const;
+
+ /**
* Return a stream for the contents of the font data, or NULL on failure.
* If ttcIndex is not null, it is set to the TrueTypeCollection index
* of this typeface within the stream, or 0 if the stream is not a