Title: [222676] trunk/Source/WebKitLegacy/mac
- Revision
- 222676
- Author
- [email protected]
- Date
- 2017-09-29 19:11:20 -0700 (Fri, 29 Sep 2017)
Log Message
Follow-up to https://trac.webkit.org/r222239 to fix crashes.
rdar://problem/34705779
Addressing review comments that I somehow landed without.
* WebView/WebHTMLView.mm: Undo adding #if guards around -_web_uniqueWebDataURL
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (222675 => 222676)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-09-30 01:16:52 UTC (rev 222675)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-09-30 02:11:20 UTC (rev 222676)
@@ -1,3 +1,12 @@
+2017-09-29 Alexey Proskuryakov <[email protected]>
+
+ Follow-up to https://trac.webkit.org/r222239 to fix crashes.
+ rdar://problem/34705779
+
+ Addressing review comments that I somehow landed without.
+
+ * WebView/WebHTMLView.mm: Undo adding #if guards around -_web_uniqueWebDataURL
+
2017-09-29 Chris Dumez <[email protected]>
Split some logic out of VisitedLinkStore and make it reusable
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (222675 => 222676)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-09-30 01:16:52 UTC (rev 222675)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-09-30 02:11:20 UTC (rev 222676)
@@ -7292,9 +7292,8 @@
@end
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
-// This is used by AppKit/TextKit and is implemented here in part so that WebDataProtocolScheme is only defined once.
-// FIXME: Really should have an @interface for this somewhere in this file or an include. Not sure why it compiles without one.
+// This is used by AppKit/TextKit. It should be possible to remove this once
+// -[NSAttributedString _documentFromRange:document:documentAttributes:subresources:] is removed.
@implementation NSURL (WebDataURL)
+ (NSURL *)_web_uniqueWebDataURL
@@ -7303,7 +7302,6 @@
}
@end
-#endif
#if PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
