Title: [188293] branches/safari-601.1.46-branch
- Revision
- 188293
- Author
- [email protected]
- Date
- 2015-08-11 14:13:05 -0700 (Tue, 11 Aug 2015)
Log Message
Rollout r188195. rdar://problem/22102378
Modified Paths
Removed Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (188292 => 188293)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-11 21:04:00 UTC (rev 188292)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-11 21:13:05 UTC (rev 188293)
@@ -1,5 +1,9 @@
2015-08-11 Matthew Hanson <[email protected]>
+ Rollout r188195. rdar://problem/22102378
+
+2015-08-11 Matthew Hanson <[email protected]>
+
Merge r188195. rdar://problem/22102378
2015-08-09 Myles C. Maxfield <[email protected]>
Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text-expected.txt (188292 => 188293)
--- branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text-expected.txt 2015-08-11 21:04:00 UTC (rev 188292)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text-expected.txt 2015-08-11 21:13:05 UTC (rev 188293)
@@ -1,3 +0,0 @@
-This test makes sure we don't crash when encountering some particularly exotic codepoints. The test passes if we do not crash.
-
-ܘ̈
Deleted: branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text.html (188292 => 188293)
--- branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text.html 2015-08-11 21:04:00 UTC (rev 188292)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/crash-obscure-text.html 2015-08-11 21:13:05 UTC (rev 188293)
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-<p>This test makes sure we don't crash when encountering some particularly exotic codepoints. The test passes if we do not crash.</p>
-ܘ̈
-</body>
-</html>
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188292 => 188293)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 21:04:00 UTC (rev 188292)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 21:13:05 UTC (rev 188293)
@@ -1,5 +1,9 @@
2015-08-11 Matthew Hanson <[email protected]>
+ Rollout r188195. rdar://problem/22102378
+
+2015-08-11 Matthew Hanson <[email protected]>
+
Merge r188243. rdar://problem/22102378
2015-08-10 Myles C. Maxfield <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (188292 => 188293)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-08-11 21:04:00 UTC (rev 188292)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-08-11 21:13:05 UTC (rev 188293)
@@ -189,11 +189,6 @@
return info->cp + stringIndex;
}
-static inline bool safeCFEqual(CFTypeRef a, CFTypeRef b)
-{
- return (!a && !b) || (a && b && CFEqual(a, b));
-}
-
void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, unsigned length, unsigned stringLocation, const Font* font)
{
if (!font) {
@@ -264,14 +259,14 @@
CTFontRef runCTFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttributes, kCTFontAttributeName));
ASSERT(CFGetTypeID(runCTFont) == CTFontGetTypeID());
RetainPtr<CFTypeRef> runFontEqualityObject = FontPlatformData::objectForEqualityCheck(runCTFont);
- if (!safeCFEqual(runFontEqualityObject.get(), font->platformData().objectForEqualityCheck().get())) {
+ if (!CFEqual(runFontEqualityObject.get(), font->platformData().objectForEqualityCheck().get())) {
// Begin trying to see if runFont matches any of the fonts in the fallback list.
for (unsigned i = 0; !m_font.fallbackRangesAt(i).isNull(); ++i) {
runFont = m_font.fallbackRangesAt(i).fontForCharacter(baseCharacter);
if (!runFont)
continue;
- if (safeCFEqual(runFont->platformData().objectForEqualityCheck().get(), runFontEqualityObject.get()))
+ if (CFEqual(runFont->platformData().objectForEqualityCheck().get(), runFontEqualityObject.get()))
break;
runFont = nullptr;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
