Changeset 224048 in webkit

Timestamp:

Oct 26, 2017 2:07:01 PM (6 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/HTMLConverter.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-26  Dan Bernstein  <mitz@apple.com>
+
+        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  <graouts@apple.com>
 

trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

@@ -1356 +1356 @@
     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;