Changeset 242845 in webkit

Timestamp:

Mar 13, 2019 12:05:38 AM (5 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r242394. rdar://problem/48591282

Cherry-pick r242394. rdar://problem/48591281

Unreviewed build fix after r242378

• UIProcess/ios/EditableImageController.mm: (WebKit::EditableImageController::associateWithAttachment):

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

git-svn-id: ​https://svn.webkit.org/repository/webkit/branches/safari-607.1.40.0-branch@242502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/EditableImageController.mm (modified) (2 diffs)

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-12  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r242502. rdar://problem/48591282
+
+    Cherry-pick r242394. rdar://problem/48591281
+    
+        Unreviewed build fix after r242378
+    
+        * UIProcess/ios/EditableImageController.mm:
+        (WebKit::EditableImageController::associateWithAttachment):
+    
+        git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-607.1.40.0-branch@242502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-05  Kocsen Chung  <kocsen_chung@apple.com>
+
+            Cherry-pick r242394. rdar://problem/48591281
+
+        Unreviewed build fix after r242378
+
+        * UIProcess/ios/EditableImageController.mm:
+        (WebKit::EditableImageController::associateWithAttachment):
+
+        git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+        2019-03-04  Brent Fulgham  <bfulgham@apple.com>
+
+                Unreviewed build fix after r242378
+
+                * UIProcess/ios/EditableImageController.mm:
+                (WebKit::EditableImageController::associateWithAttachment):
+
 2019-03-12  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/UIProcess/ios/EditableImageController.mm

@@ -39 +39 @@
 #import <wtf/RetainPtr.h>
 
-#define MESSAGE_CHECK_VIEWID(embeddedViewID) MESSAGE_CHECK_BASE(m_editableImages.isValidKey(embeddedViewID), connection())
+#define MESSAGE_CHECK_VIEWID(embeddedViewID) MESSAGE_CHECK_BASE(m_editableImages.isValidKey(embeddedViewID), m_webPageProxy->process().connection())
 
 namespace WebKit {
@@ -88 +88 @@
 void EditableImageController::associateWithAttachment(WebCore::GraphicsLayer::EmbeddedViewID embeddedViewID, const String& attachmentID)
 {
-    MESSAGE_CHECK_VIEWID(embeddedViewID);
     if (!m_webPageProxy)
         return;
     auto& page = *m_webPageProxy;
 
+    MESSAGE_CHECK_VIEWID(embeddedViewID);
     page.registerAttachmentIdentifier(attachmentID);
     auto& attachment = *page.attachmentForIdentifier(attachmentID);