Title: [224048] trunk/Source/WebCore
- Revision
- 224048
- Author
- [email protected]
- Date
- 2017-10-26 14:07:01 -0700 (Thu, 26 Oct 2017)
Log Message
Account for Mail’s WebMessageDocument class being renamed
https://bugs.webkit.org/show_bug.cgi?id=178881
Reviewed by Sam Weinig.
* editing/cocoa/HTMLConverter.mm:
(_WebMessageDocumentClass): Look up the class by its new name. No longer look it up by the
old old name, because TOT WebKit isn’t going to be used by versions of Mail that have that name.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224047 => 224048)
--- trunk/Source/WebCore/ChangeLog 2017-10-26 20:57:08 UTC (rev 224047)
+++ trunk/Source/WebCore/ChangeLog 2017-10-26 21:07:01 UTC (rev 224048)
@@ -1,3 +1,14 @@
+2017-10-26 Dan Bernstein <[email protected]>
+
+ Account for Mail’s WebMessageDocument class being renamed
+ https://bugs.webkit.org/show_bug.cgi?id=178881
+
+ Reviewed by Sam Weinig.
+
+ * editing/cocoa/HTMLConverter.mm:
+ (_WebMessageDocumentClass): Look up the class by its new name. No longer look it up by the
+ old old name, because TOT WebKit isn’t going to be used by versions of Mail that have that name.
+
2017-10-26 Antoine Quint <[email protected]>
Remove FrameView::serviceScriptedAnimations and Document::serviceScriptedAnimations
Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (224047 => 224048)
--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2017-10-26 20:57:08 UTC (rev 224047)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2017-10-26 21:07:01 UTC (rev 224048)
@@ -1355,11 +1355,12 @@
static BOOL lookedUpClass = NO;
if (!lookedUpClass) {
// If the class is not there, we don't want to try again
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- _WebMessageDocumentClass = objc_lookUpClass("WebMessageDocument");
-#else
- _WebMessageDocumentClass = objc_lookUpClass("MFWebMessageDocument");
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+ _WebMessageDocumentClass = objc_lookUpClass("EditableWebMessageDocument");
#endif
+ if (!_WebMessageDocumentClass)
+ _WebMessageDocumentClass = objc_lookUpClass("WebMessageDocument");
+
if (_WebMessageDocumentClass && ![_WebMessageDocumentClass respondsToSelector:@selector(document:attachment:forURL:)])
_WebMessageDocumentClass = Nil;
lookedUpClass = YES;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
