Changeset 158460 in webkit


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r158457 r158460  
     12013-11-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] WKObject seems to be initializing its target in a thread-safe manner, but really is not
     4        https://bugs.webkit.org/show_bug.cgi?id=123640
     5
     6        Reviewed by Darin Adler.
     7
     8        * Shared/Cocoa/WKObject.mm:
     9        (initializeTargetIfNeeded): Removed misleading incorrect code.
     10
    1112013-11-01  Benjamin Poulain  <benjamin@webkit.org>
    212
  • trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm

    r158340 r158460  
    3434
    3535@implementation WKObject {
    36     dispatch_once_t _targetInitializationToken;
     36    BOOL _hasInitializedTarget;
    3737    NSObject *_target;
    3838}
     
    4848static inline void initializeTargetIfNeeded(WKObject *self)
    4949{
    50     dispatch_once(&self->_targetInitializationToken, ^{
    51         self->_target = [self _web_createTarget];
    52     });
     50    if (self->_hasInitializedTarget)
     51        return;
     52
     53    self->_hasInitializedTarget = YES;
     54    self->_target = [self _web_createTarget];
    5355}
    5456
Note: See TracChangeset for help on using the changeset viewer.