Title: [242502] branches/safari-607.1.40.0-branch/Source/WebKit
- Revision
- 242502
- Author
- kocsen_ch...@apple.com
- Date
- 2019-03-05 13:38:27 -0800 (Tue, 05 Mar 2019)
Log Message
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
Modified Paths
Diff
Modified: branches/safari-607.1.40.0-branch/Source/WebKit/ChangeLog (242501 => 242502)
--- branches/safari-607.1.40.0-branch/Source/WebKit/ChangeLog 2019-03-05 21:38:22 UTC (rev 242501)
+++ branches/safari-607.1.40.0-branch/Source/WebKit/ChangeLog 2019-03-05 21:38:27 UTC (rev 242502)
@@ -1,5 +1,23 @@
2019-03-05 Kocsen Chung <kocsen_ch...@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 <bfulg...@apple.com>
+
+ Unreviewed build fix after r242378
+
+ * UIProcess/ios/EditableImageController.mm:
+ (WebKit::EditableImageController::associateWithAttachment):
+
+2019-03-05 Kocsen Chung <kocsen_ch...@apple.com>
+
Cherry-pick r242378. rdar://problem/48591281
Check contextIDs when handling WebContent messages
Modified: branches/safari-607.1.40.0-branch/Source/WebKit/UIProcess/ios/EditableImageController.mm (242501 => 242502)
--- branches/safari-607.1.40.0-branch/Source/WebKit/UIProcess/ios/EditableImageController.mm 2019-03-05 21:38:22 UTC (rev 242501)
+++ branches/safari-607.1.40.0-branch/Source/WebKit/UIProcess/ios/EditableImageController.mm 2019-03-05 21:38:27 UTC (rev 242502)
@@ -38,7 +38,7 @@
#import <WebCore/GraphicsLayer.h>
#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 {
@@ -87,11 +87,11 @@
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);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
