Changeset 245936 in webkit

Timestamp:

May 30, 2019, 5:33:38 PM (7 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/51056572

Location:

branches/safari-607-branch

Files:

• Source/WebKit/Shared/API/Cocoa/RemoteObjectRegistry.h (modified) (4 diffs)
• Source/WebKit/Shared/API/Cocoa/RemoteObjectRegistry.mm (modified) (3 diffs)
• Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (modified) (1 diff)
• Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (modified) (2 diffs)
• Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm (modified) (2 diffs)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• Source/WebKit/WebProcess/WebPage/WebPage.h (modified) (3 diffs)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleRetainPagePlugIn.mm (modified) (2 diffs)

branches/safari-607-branch/Source/WebKit/Shared/API/Cocoa/RemoteObjectRegistry.h

@@ -24 +24 @@
  */
 
-#ifndef RemoteObjectRegistry_h
-#define RemoteObjectRegistry_h
+#pragma once
 
 #include "MessageReceiver.h"
 #include "ProcessThrottler.h"
 #include <wtf/Function.h>
+#include <wtf/WeakObjCPtr.h>
+#include <wtf/WeakPtr.h>
 
 OBJC_CLASS _WKRemoteObjectRegistry;
@@ -44 +45 @@
 class WebPageProxy;
 
-class RemoteObjectRegistry final : public IPC::MessageReceiver {
+class RemoteObjectRegistry final : public CanMakeWeakPtr<RemoteObjectRegistry>, public IPC::MessageReceiver {
 public:
     RemoteObjectRegistry(_WKRemoteObjectRegistry *, WebPage&);
@@ -55 +56 @@
     void sendUnusedReply(uint64_t replyID);
 
+    void close();
+    
 private:
     // IPC::MessageReceiver
@@ -64 +67 @@
     void releaseUnusedReplyBlock(uint64_t replyID);
 
-    _WKRemoteObjectRegistry *m_remoteObjectRegistry;
+    WeakObjCPtr<_WKRemoteObjectRegistry> m_remoteObjectRegistry;
     IPC::MessageSender& m_messageSender;
-    WTF::Function<ProcessThrottler::BackgroundActivityToken()> m_takeBackgroundActivityToken;
+    Function<ProcessThrottler::BackgroundActivityToken()> m_takeBackgroundActivityToken;
     HashMap<uint64_t, ProcessThrottler::BackgroundActivityToken> m_pendingReplies;
+    bool m_isRegisteredAsMessageReceiver { false };
+    uint64_t m_messageReceiverID { 0 };
 };
 
 } // namespace WebKit
-
-#endif // RemoteObjectRegistry_h

branches/safari-607-branch/Source/WebKit/Shared/API/Cocoa/RemoteObjectRegistry.mm

@@ -33 +33 @@
 #import "UserData.h"
 #import "WebPage.h"
+#import "WebProcess.h"
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
@@ -43 +44 @@
     , m_messageSender(page)
     , m_takeBackgroundActivityToken([] { return ProcessThrottler::BackgroundActivityToken(); })
+    , m_isRegisteredAsMessageReceiver(true)
+    , m_messageReceiverID(page.pageID())
 {
+    WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_messageReceiverID, *this);
+    page.setRemoteObjectRegistry(*this);
 }
 
@@ -56 +61 @@
 RemoteObjectRegistry::~RemoteObjectRegistry()
 {
+    close();
 }
 
+    void RemoteObjectRegistry::close()
+    {
+        if (m_isRegisteredAsMessageReceiver) {
+            WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), m_messageReceiverID);
+            m_isRegisteredAsMessageReceiver = false;
+        }
+    }
+    
 void RemoteObjectRegistry::sendInvocation(const RemoteObjectInvocation& invocation)
 {

branches/safari-607-branch/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm

@@ -39 +39 @@
 #import "WKRemoteObjectCoder.h"
 #import "WKSharedAPICast.h"
+#import "WebPage.h"
 #import "_WKRemoteObjectInterface.h"
 #import <objc/runtime.h>

branches/safari-607-branch/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

@@ -361 +361 @@
 - (void)dealloc
 {
-    if (_remoteObjectRegistry) {
-        WebKit::WebProcess::singleton().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID());
+    if (_remoteObjectRegistry)
         [_remoteObjectRegistry _invalidate];
-    }
 
     _page->~WebPage();
@@ -427 +425 @@
 - (_WKRemoteObjectRegistry *)_remoteObjectRegistry
 {
-    if (!_remoteObjectRegistry) {
+    if (!_remoteObjectRegistry)
         _remoteObjectRegistry = adoptNS([[_WKRemoteObjectRegistry alloc] _initWithWebPage:*_page]);
-        WebKit::WebProcess::singleton().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
-    }
 
     return _remoteObjectRegistry.get();

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/Cocoa/WebPageCocoa.mm

@@ -30 +30 @@
 #import "LoadParameters.h"
 #import "PluginView.h"
+#import "RemoteObjectRegistry.h"
 #import "WebPageProxyMessages.h"
 #import <WebCore/DictionaryLookup.h>
@@ -186 +187 @@
 }
 
+void WebPage::setRemoteObjectRegistry(RemoteObjectRegistry& registry)
+{
+    m_remoteObjectRegistry = makeWeakPtr(registry);
+}
+
 } // namespace WebKit
 

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -245 +245 @@
 #include "PlaybackSessionManager.h"
 #include "RemoteLayerTreeTransaction.h"
+#include "RemoteObjectRegistry.h"
+#include "RemoteObjectRegistryMessages.h"
 #include "TouchBarMenuData.h"
 #include "TouchBarMenuItemData.h"
@@ -1295 +1297 @@
 
     auto& webProcess = WebProcess::singleton();
+    if (m_remoteObjectRegistry)
+        m_remoteObjectRegistry->close();
 #if ENABLE(ASYNC_SCROLLING)
     if (m_useAsyncScrolling)

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -205 +205 @@
 class PageBanner;
 class PluginView;
+    class RemoteObjectRegistry;
 class RemoteWebInspectorUI;
 class UserMediaPermissionRequestManager;
@@ -1136 +1137 @@
     void didReceiveWebPageMessage(IPC::Connection&, IPC::Decoder&);
 
+    void setRemoteObjectRegistry(RemoteObjectRegistry&);
 private:
     WebPage(uint64_t pageID, WebPageCreationParameters&&);
@@ -1805 +1807 @@
     bool m_isSuspended { false };
     bool m_needsFontAttributes { false };
+#if PLATFORM(COCOA)
+    WeakPtr<RemoteObjectRegistry> m_remoteObjectRegistry;
+#endif
 };
 

branches/safari-607-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/BundleRetainPagePlugIn.mm

@@ -29 +29 @@
 
 #import <WebKit/WKWebProcessPlugIn.h>
+#import <WebKit/WKWebProcessPluginBrowserContextControllerPrivate.h>
 #import <wtf/RetainPtr.h>
 
@@ -39 +40 @@
 {
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5*NSEC_PER_SEC), dispatch_get_main_queue(), [retainedPage = retainPtr(browserContextController)] { });
+    
+    // Instantiate a _WKRemoteObjectRegistry to test that its existence does not conflict with the existence
+    // of the _WKRemoteObjectRegistry from the other WebPage that will be in this process.
+    [browserContextController _remoteObjectRegistry];
 }