Changeset 249146 in webkit

Timestamp:

Aug 27, 2019, 9:19:37 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r249140. rdar://problem/54749102

Image pasted from screenshot into Mail compose window via share sheet has the wrong aspect ratio
​https://bugs.webkit.org/show_bug.cgi?id=201171
<rdar://problem/54671275>

Reviewed by Tim Horton.

Augments an existing app-specific hack to include the Mail composition service, in addition to Mail.

• platform/RuntimeApplicationChecks.h:
• platform/cocoa/RuntimeApplicationChecksCocoa.mm: (WebCore::IOSApplication::isMailCompositionService):

Add a new bundle checking method for the Mail composition service (com.apple.MailCompositionService).

• platform/ios/PlatformPasteboardIOS.mm: (WebCore::PlatformPasteboard::informationForItemAtIndex):

Only plumb the preferred presentation height through to the web process if the application is neither Mail nor
the Mail composition service. In the future, we should consider putting this hack behind SPI, or maybe only
expose the preferred presentation width in all apps (it isn't difficult to imagine a use case where a "Mail-
compose-like" web app has img { max-width: 100%; } in their stylesheet).

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@249140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/RuntimeApplicationChecks.h (modified) (1 diff)
• platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)
• platform/ios/PlatformPasteboardIOS.mm (modified) (1 diff)

branches/safari-608-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r249140. rdar://problem/54749102
+
+    Image pasted from screenshot into Mail compose window via share sheet has the wrong aspect ratio
+    https://bugs.webkit.org/show_bug.cgi?id=201171
+    <rdar://problem/54671275>
+    
+    Reviewed by Tim Horton.
+    
+    Augments an existing app-specific hack to include the Mail composition service, in addition to Mail.
+    
+    * platform/RuntimeApplicationChecks.h:
+    * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+    (WebCore::IOSApplication::isMailCompositionService):
+    
+    Add a new bundle checking method for the Mail composition service (com.apple.MailCompositionService).
+    
+    * platform/ios/PlatformPasteboardIOS.mm:
+    (WebCore::PlatformPasteboard::informationForItemAtIndex):
+    
+    Only plumb the preferred presentation height through to the web process if the application is neither Mail nor
+    the Mail composition service. In the future, we should consider putting this hack behind SPI, or maybe only
+    expose the preferred presentation width in all apps (it isn't difficult to imagine a use case where a "Mail-
+    compose-like" web app has `img { max-width: 100%; }` in their stylesheet).
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249140 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-08-27  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Image pasted from screenshot into Mail compose window via share sheet has the wrong aspect ratio
+            https://bugs.webkit.org/show_bug.cgi?id=201171
+            <rdar://problem/54671275>
+
+            Reviewed by Tim Horton.
+
+            Augments an existing app-specific hack to include the Mail composition service, in addition to Mail.
+
+            * platform/RuntimeApplicationChecks.h:
+            * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+            (WebCore::IOSApplication::isMailCompositionService):
+
+            Add a new bundle checking method for the Mail composition service (com.apple.MailCompositionService).
+
+            * platform/ios/PlatformPasteboardIOS.mm:
+            (WebCore::PlatformPasteboard::informationForItemAtIndex):
+
+            Only plumb the preferred presentation height through to the web process if the application is neither Mail nor
+            the Mail composition service. In the future, we should consider putting this hack behind SPI, or maybe only
+            expose the preferred presentation width in all apps (it isn't difficult to imagine a use case where a "Mail-
+            compose-like" web app has `img { max-width: 100%; }` in their stylesheet).
+
 2019-08-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-608-branch/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -78 +78 @@
 
 WEBCORE_EXPORT bool isMobileMail();
+WEBCORE_EXPORT bool isMailCompositionService();
 WEBCORE_EXPORT bool isMobileSafari();
 WEBCORE_EXPORT bool isIMDb();

branches/safari-608-branch/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm

@@ -203 +203 @@
 }
 
+bool IOSApplication::isMailCompositionService()
+{
+    static bool isMailCompositionService = applicationBundleIsEqualTo("com.apple.MailCompositionService"_s);
+    return isMailCompositionService;
+}
+
 bool IOSApplication::isMobileSafari()
 {

branches/safari-608-branch/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

@@ -159 +159 @@
     if (!CGSizeEqualToSize(itemProvider.preferredPresentationSize, CGSizeZero)) {
         auto adjustedPreferredPresentationHeight = [](auto height) -> Optional<double> {
-            if (!IOSApplication::isMobileMail())
+            if (!IOSApplication::isMobileMail() && !IOSApplication::isMailCompositionService())
                 return { height };
             // Mail's max-width: 100%; default style is in conflict with the preferred presentation size and can lead to unexpectedly stretched images. Not setting the height forces layout to preserve the aspect ratio.