Changeset 158460 in webkit

Timestamp:

Nov 1, 2013, 3:14:38 PM (12 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] WKObject seems to be initializing its target in a thread-safe manner, but really is not
​https://bugs.webkit.org/show_bug.cgi?id=123640

Reviewed by Darin Adler.

• Shared/Cocoa/WKObject.mm:

(initializeTargetIfNeeded): Removed misleading incorrect code.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/WKObject.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-01  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] WKObject seems to be initializing its target in a thread-safe manner, but really is not
+        https://bugs.webkit.org/show_bug.cgi?id=123640
+
+        Reviewed by Darin Adler.
+
+        * Shared/Cocoa/WKObject.mm:
+        (initializeTargetIfNeeded): Removed misleading incorrect code.
+
 2013-11-01  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm

@@ -34 +34 @@
 
 @implementation WKObject {
-    dispatch_once_t _targetInitializationToken;
+    BOOL _hasInitializedTarget;
     NSObject *_target;
 }
@@ -48 +48 @@
 static inline void initializeTargetIfNeeded(WKObject *self)
 {
-    dispatch_once(&self->_targetInitializationToken, ^{
-        self->_target = [self _web_createTarget];
-    });
+    if (self->_hasInitializedTarget)
+        return;
+
+    self->_hasInitializedTarget = YES;
+    self->_target = [self _web_createTarget];
 }