Attachment 346726 Details for Bug 188388 – Patch

[patch] Patch

bug-188388-20180807132954.patch (text/plain), 2.85 KB, created by Alex Christensen on 2018-08-07 13:29:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-07 13:29:55 PDT

Size: 2.85 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234667)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-08-07  Alex Christensen  <achristensen@webkit.org>
>+
>+        REGRESSION(r225765) WKWebViewConfiguration should not keep a strong reference to a WebPageGroup
>+        https://bugs.webkit.org/show_bug.cgi?id=188388
>+        <rdar://problem/42788651>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Doing so caused a reference cycle.  Keep an identifier instead.
>+
>+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
>+        (-[WKWebViewConfiguration copyWithZone:]):
>+        (-[WKWebViewConfiguration _pageGroup]):
>+        (-[WKWebViewConfiguration _setPageGroup:]):
>+
> 2018-08-07  Chris Dumez  <cdumez@apple.com>
> 
>         StorageManager should stop ref'ing IPC::Connections as this is leak-prone
>Index: Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(revision 234663)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	(working copy)
>@@ -31,6 +31,7 @@
> 
> #import "APIPageConfiguration.h"
> #import "VersionChecks.h"
>+#import "WKAPICast.h"
> #import "WKPreferences.h"
> #import "WKProcessPool.h"
> #import "WKRetainPtr.h"
>@@ -38,6 +39,7 @@
> #import "WKWebView.h"
> #import "WKWebViewContentProviderRegistry.h"
> #import "WebKit2Initialize.h"
>+#import "WebPageGroup.h"
> #import "WebURLSchemeHandlerCocoa.h"
> #import "_WKVisitedLinkStore.h"
> #import "_WKWebsiteDataStoreInternal.h"
>@@ -141,7 +143,7 @@ static _WKDragLiftDelay toDragLiftDelay(
>     BOOL _mainContentUserGestureOverrideEnabled;
> 
> #if PLATFORM(MAC)
>-    WKRetainPtr<WKPageGroupRef> _pageGroup;
>+    uint64_t _pageGroupIdentifier;
>     double _cpuLimit;
>     BOOL _showsURLsInToolTips;
>     BOOL _serviceControlsEnabled;
>@@ -392,7 +394,7 @@ - (id)copyWithZone:(NSZone *)zone
>     configuration->_serviceControlsEnabled = self->_serviceControlsEnabled;
>     configuration->_imageControlsEnabled = self->_imageControlsEnabled;
>     configuration->_requiresUserActionForEditingControlsManager = self->_requiresUserActionForEditingControlsManager;
>-    configuration->_pageGroup = self._pageGroup;
>+    configuration->_pageGroupIdentifier = self->_pageGroupIdentifier;
> #endif
> #if ENABLE(DATA_DETECTION) && PLATFORM(IOS)
>     configuration->_dataDetectorTypes = self->_dataDetectorTypes;
>@@ -930,12 +932,12 @@ - (void)_setRequiresUserActionForEditing
> 
> - (WKPageGroupRef)_pageGroup
> {
>-    return _pageGroup.get();
>+    return toAPI(WebKit::WebPageGroup::get(_pageGroupIdentifier));
> }
> 
> - (void)_setPageGroup:(WKPageGroupRef)pageGroup
> {
>-    _pageGroup = pageGroup;
>+    _pageGroupIdentifier = WebKit::toImpl(pageGroup)->pageGroupID();
> }
> 
> - (void)_setCPULimit:(double)cpuLimit

Flags:

achristensen: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 188388: 346726