Title: [158460] trunk/Source/WebKit2
- Revision
- 158460
- Author
- m...@apple.com
- Date
- 2013-11-01 15:14:38 -0700 (Fri, 01 Nov 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158459 => 158460)
--- trunk/Source/WebKit2/ChangeLog 2013-11-01 22:10:52 UTC (rev 158459)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-01 22:14:38 UTC (rev 158460)
@@ -1,3 +1,13 @@
+2013-11-01 Dan Bernstein <m...@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 <benja...@webkit.org>
[WK2] Create a unique identifier for WebPageGroup if the input name is empty
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm (158459 => 158460)
--- trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm 2013-11-01 22:10:52 UTC (rev 158459)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm 2013-11-01 22:14:38 UTC (rev 158460)
@@ -33,7 +33,7 @@
using namespace WebKit;
@implementation WKObject {
- dispatch_once_t _targetInitializationToken;
+ BOOL _hasInitializedTarget;
NSObject *_target;
}
@@ -47,9 +47,11 @@
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];
}
- (BOOL)isEqual:(id)object
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
