Title: [229568] tags/Safari-606.1.9/Source/WebCore
- Revision
- 229568
- Author
- [email protected]
- Date
- 2018-03-12 18:54:14 -0700 (Mon, 12 Mar 2018)
Log Message
Cherry-pick r229564. rdar://problem/38395317
Modified Paths
Diff
Modified: tags/Safari-606.1.9/Source/WebCore/ChangeLog (229567 => 229568)
--- tags/Safari-606.1.9/Source/WebCore/ChangeLog 2018-03-13 01:38:34 UTC (rev 229567)
+++ tags/Safari-606.1.9/Source/WebCore/ChangeLog 2018-03-13 01:54:14 UTC (rev 229568)
@@ -1,3 +1,23 @@
+2018-03-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r229564. rdar://problem/38395317
+
+ 2018-03-12 Brian Burg <[email protected]>
+
+ Ignore some deprecation warnings encountered when compiling with newer versions of ICU
+ https://bugs.webkit.org/show_bug.cgi?id=183584
+ <rdar://problem/38395317>
+
+ Reviewed by Daniel Bates.
+
+ Ignore new deprecation warnings. Where a function has more than one
+ deprecation warning, mark out the entire function so it remains readable.
+
+ * editing/TextIterator.cpp:
+ * platform/graphics/SurrogatePairAwareTextIterator.cpp:
+ (WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks):
+ * platform/text/TextEncoding.cpp:
+
2018-03-12 Javier Fernandez <[email protected]>
Remove GridLayout runtime flag
Modified: tags/Safari-606.1.9/Source/WebCore/editing/TextIterator.cpp (229567 => 229568)
--- tags/Safari-606.1.9/Source/WebCore/editing/TextIterator.cpp 2018-03-13 01:38:34 UTC (rev 229567)
+++ tags/Safari-606.1.9/Source/WebCore/editing/TextIterator.cpp 2018-03-13 01:54:14 UTC (rev 229568)
@@ -1999,6 +1999,12 @@
return false;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+// NOTE: ICU's unorm_normalize function is deprecated in some SDKs.
+
static void normalizeCharacters(const UChar* characters, unsigned length, Vector<UChar>& buffer)
{
ASSERT(length);
@@ -2020,6 +2026,10 @@
ASSERT(status == U_STRING_NOT_TERMINATED_WARNING);
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
static bool isNonLatin1Separator(UChar32 character)
{
ASSERT_ARG(character, character >= 256);
Modified: tags/Safari-606.1.9/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp (229567 => 229568)
--- tags/Safari-606.1.9/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp 2018-03-13 01:38:34 UTC (rev 229567)
+++ tags/Safari-606.1.9/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp 2018-03-13 01:54:14 UTC (rev 229568)
@@ -69,6 +69,12 @@
return true;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+// NOTE: ICU's unorm_normalize function is deprecated in some SDKs.
+
UChar32 SurrogatePairAwareTextIterator::normalizeVoicingMarks()
{
// According to http://www.unicode.org/Public/UNIDATA/UCD.html#Canonical_Combining_Class_Values
@@ -89,4 +95,8 @@
return 0;
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
}
Modified: tags/Safari-606.1.9/Source/WebCore/platform/text/TextEncoding.cpp (229567 => 229568)
--- tags/Safari-606.1.9/Source/WebCore/platform/text/TextEncoding.cpp 2018-03-13 01:38:34 UTC (rev 229567)
+++ tags/Safari-606.1.9/Source/WebCore/platform/text/TextEncoding.cpp 2018-03-13 01:54:14 UTC (rev 229568)
@@ -69,6 +69,12 @@
return newTextCodec(*this)->decode(data, length, true, stopOnError, sawError);
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+// NOTE: ICU's unorm_quickCheck and unorm_normalize functions are deprecated in some SDKs.
+
Vector<uint8_t> TextEncoding::encode(StringView text, UnencodableHandling handling) const
{
if (!m_name || text.isEmpty())
@@ -106,6 +112,10 @@
return newTextCodec(*this)->encode(StringView { source, sourceLength }, handling);
}
+#if COMPILER(CLANG)
+#pragma clang diagnostic pop
+#endif
+
const char* TextEncoding::domName() const
{
if (noExtendedTextEncodingNameUsed())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
