<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[260306] trunk/Source/WebKitLegacy/mac</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/260306">260306</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2020-04-17 20:04:46 -0700 (Fri, 17 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS WK1] -[_WebSafeForwarder asyncForwarder] uses non-static dispatch_once_t predicate
<https://webkit.org/b/210625>

Reviewed by Daniel Bates.

Remove use of dispatch_once to initialize
_WebSafeForwarder._asyncForwarder, and modernize both
_WebSafeForwarder and _WebSafeAsyncForwarder classes.

* WebView/WebView.mm:
(@interface _WebSafeAsyncForwarder):
- Make `_forwarder` weak.  It can't be strong or a retain cycle
  would be created between this object and _WebSafeForwarder.
- Change return type from `id` to `instancetype` for
  -[_WebSafeAsyncForwarder initWithForwarder:].
(@interface _WebSafeForwarder):
- Make `_target` weak and rename from `target`.
- Make `_defaultTarget` weak and rename from `defaultTarget`.
- Rename `_asyncForwarder` from `asyncForwarder`.
- Delete unused `asyncForwarderPred`.
- Replace -asyncForwarder method declaration with a @property
  definition.
(-[_WebSafeForwarder initWithTarget:defaultTarget:]):
- Update for instance variable renames.
- Iniitalize `_asyncForwarder` here.  There are (at most) eight
  _WebSafeForwarder objects created per WebView, so creating
  this object in the constructor seems reasonable.
(-[_WebSafeForwarder asyncForwarder:]):
- Delete this method (and use of dispatch_once, fixing the bug).
  Replace with @synthesize statement.
(-[_WebSafeForwarder dealloc:]):
- Update for instance variable renames, and assign nil to all
  instance variables.
(-[_WebSafeForwarder forwardInvocation:]):
(-[_WebSafeForwarder respondsToSelector:]):
(-[_WebSafeForwarder methodSignatureForSelector:]):
- Update for instance variable renames.
(-[_WebSafeForwarder initWithForwarder:]):
- Change return type from `id` to `instancetype`.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (260305 => 260306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2020-04-18 01:37:23 UTC (rev 260305)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2020-04-18 03:04:46 UTC (rev 260306)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2020-04-17  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS WK1] -[_WebSafeForwarder asyncForwarder] uses non-static dispatch_once_t predicate
+        <https://webkit.org/b/210625>
+
+        Reviewed by Daniel Bates.
+
+        Remove use of dispatch_once to initialize
+        _WebSafeForwarder._asyncForwarder, and modernize both
+        _WebSafeForwarder and _WebSafeAsyncForwarder classes.
+
+        * WebView/WebView.mm:
+        (@interface _WebSafeAsyncForwarder):
+        - Make `_forwarder` weak.  It can't be strong or a retain cycle
+          would be created between this object and _WebSafeForwarder.
+        - Change return type from `id` to `instancetype` for
+          -[_WebSafeAsyncForwarder initWithForwarder:].
+        (@interface _WebSafeForwarder):
+        - Make `_target` weak and rename from `target`.
+        - Make `_defaultTarget` weak and rename from `defaultTarget`.
+        - Rename `_asyncForwarder` from `asyncForwarder`.
+        - Delete unused `asyncForwarderPred`.
+        - Replace -asyncForwarder method declaration with a @property
+          definition.
+        (-[_WebSafeForwarder initWithTarget:defaultTarget:]):
+        - Update for instance variable renames.
+        - Iniitalize `_asyncForwarder` here.  There are (at most) eight
+          _WebSafeForwarder objects created per WebView, so creating
+          this object in the constructor seems reasonable.
+        (-[_WebSafeForwarder asyncForwarder:]):
+        - Delete this method (and use of dispatch_once, fixing the bug).
+          Replace with @synthesize statement.
+        (-[_WebSafeForwarder dealloc:]):
+        - Update for instance variable renames, and assign nil to all
+          instance variables.
+        (-[_WebSafeForwarder forwardInvocation:]):
+        (-[_WebSafeForwarder respondsToSelector:]):
+        (-[_WebSafeForwarder methodSignatureForSelector:]):
+        - Update for instance variable renames.
+        (-[_WebSafeForwarder initWithForwarder:]):
+        - Change return type from `id` to `instancetype`.
+
</ins><span class="cx"> 2020-04-17  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Move allowPlugins to FrameLoader
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (260305 => 260306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-04-18 01:37:23 UTC (rev 260305)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm    2020-04-18 03:04:46 UTC (rev 260306)
</span><span class="lines">@@ -549,25 +549,24 @@
</span><span class="cx"> @class _WebSafeForwarder;
</span><span class="cx"> 
</span><span class="cx"> @interface _WebSafeAsyncForwarder : NSObject {
</span><del>-    _WebSafeForwarder *_forwarder;
</del><ins>+    __weak _WebSafeForwarder *_forwarder;
</ins><span class="cx"> }
</span><del>-- (id)initWithForwarder:(_WebSafeForwarder *)forwarder;
</del><ins>+- (instancetype)initWithForwarder:(_WebSafeForwarder *)forwarder;
</ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> @interface _WebSafeForwarder : NSObject
</span><span class="cx"> {
</span><del>-    id target; // Non-retained. Don't retain delegates.
-    id defaultTarget;
</del><ins>+    __weak id _target;
+    __weak id _defaultTarget;
</ins><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><del>-    _WebSafeAsyncForwarder *asyncForwarder;
-    dispatch_once_t asyncForwarderPred;
</del><ins>+    _WebSafeAsyncForwarder *_asyncForwarder;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> - (instancetype)initWithTarget:(id)target defaultTarget:(id)defaultTarget;
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><ins>+@property (nonatomic, readonly, strong) id asyncForwarder;
</ins><span class="cx"> - (void)clearTarget;
</span><del>-- (id)asyncForwarder;
</del><span class="cx"> #endif
</span><span class="cx"> @end
</span><span class="cx"> 
</span><span class="lines">@@ -5334,34 +5333,34 @@
</span><span class="cx"> 
</span><span class="cx"> // Used to send messages to delegates that implement informal protocols.
</span><span class="cx"> 
</span><del>-- (instancetype)initWithTarget:(id)t defaultTarget:(id)dt
</del><ins>+- (instancetype)initWithTarget:(id)target defaultTarget:(id)defaultTarget
</ins><span class="cx"> {
</span><del>-    self = [super init];
-    if (!self)
</del><ins>+    if (!(self = [super init]))
</ins><span class="cx">         return nil;
</span><del>-    target = t; // Non retained.
-    defaultTarget = dt;
</del><ins>+    _target = target;
+    _defaultTarget = defaultTarget;
+#if PLATFORM(IOS_FAMILY)
+    _asyncForwarder = [[_WebSafeAsyncForwarder alloc] initWithForwarder:self];
+#endif
</ins><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><del>-- (id)asyncForwarder
-{
-    dispatch_once(&asyncForwarderPred, ^{
-        asyncForwarder = [[_WebSafeAsyncForwarder alloc] initWithForwarder:self];
-    });
-    return asyncForwarder;
-}
</del><ins>+@synthesize asyncForwarder=_asyncForwarder;
</ins><span class="cx"> 
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>-    [asyncForwarder release];
</del><ins>+    _target = nil;
+    _defaultTarget = nil;
+    [_asyncForwarder release];
+    _asyncForwarder = nil;
+
</ins><span class="cx">     [super dealloc];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)clearTarget
</span><span class="cx"> {
</span><del>-    target = nil;
</del><ins>+    _target = nil;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -5374,17 +5373,17 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><del>-    if ([target respondsToSelector:[invocation selector]]) {
</del><ins>+    if ([_target respondsToSelector:invocation.selector]) {
</ins><span class="cx">         @try {
</span><del>-            [invocation invokeWithTarget:target];
</del><ins>+            [invocation invokeWithTarget:_target];
</ins><span class="cx">         } @catch(id exception) {
</span><del>-            ReportDiscardedDelegateException([invocation selector], exception);
</del><ins>+            ReportDiscardedDelegateException(invocation.selector, exception);
</ins><span class="cx">         }
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if ([defaultTarget respondsToSelector:[invocation selector]])
-        [invocation invokeWithTarget:defaultTarget];
</del><ins>+    if ([_defaultTarget respondsToSelector:invocation.selector])
+        [invocation invokeWithTarget:_defaultTarget];
</ins><span class="cx"> 
</span><span class="cx">     // Do nothing quietly if method not implemented.
</span><span class="cx"> }
</span><span class="lines">@@ -5392,13 +5391,13 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx"> - (BOOL)respondsToSelector:(SEL)aSelector
</span><span class="cx"> {
</span><del>-    return [defaultTarget respondsToSelector:aSelector];
</del><ins>+    return [_defaultTarget respondsToSelector:aSelector];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
</span><span class="cx"> {
</span><del>-    return [defaultTarget methodSignatureForSelector:aSelector];
</del><ins>+    return [_defaultTarget methodSignatureForSelector:aSelector];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="lines">@@ -5406,7 +5405,7 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx"> @implementation _WebSafeAsyncForwarder
</span><span class="cx"> 
</span><del>-- (id)initWithForwarder:(_WebSafeForwarder *)forwarder
</del><ins>+- (instancetype)initWithForwarder:(_WebSafeForwarder *)forwarder
</ins><span class="cx"> {
</span><span class="cx">     if (!(self = [super init]))
</span><span class="cx">         return nil;
</span></span></pre>
</div>
</div>

</body>
</html>