Changeset 194987 in webkit


Ignore:
Timestamp:
Jan 13, 2016 3:00:14 PM (8 years ago)
Author:
Chris Dumez
Message:

Unreviewed, rolling out r194900.

Roll back in as this did not actually regress PLT

Reverted changeset:

"Unreviewed, rolling out r194826."
​https://bugs.webkit.org/show_bug.cgi?id=153020
​http://trac.webkit.org/changeset/194900

Location:
trunk/Source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r194985 r194987  
     12016-01-13  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed, rolling out r194900.
     4
     5        Roll back in as this did not actually regress PLT
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r194826."
     10        https://bugs.webkit.org/show_bug.cgi?id=153020
     11        http://trac.webkit.org/changeset/194900
     12
    1132016-01-13  Konstantin Tokarev  <annulen@yandex.ru>
    214

  • trunk/Source/WebCore/html/track/VTTRegion.cpp

    r194900 r194987  
    334334const AtomicString& VTTRegion::textTrackCueContainerShadowPseudoId()
    335335{
    336     DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, trackRegionCueContainerPseudoId,
    337         ("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral));
     336    static NeverDestroyed<const AtomicString> trackRegionCueContainerPseudoId("-webkit-media-text-track-region-container", AtomicString::ConstructFromLiteral);
    338337
    339338    return trackRegionCueContainerPseudoId;
    … …  
    342341const AtomicString& VTTRegion::textTrackRegionShadowPseudoId()
    343342{
    344     DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, trackRegionShadowPseudoId,
    345         ("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral));
     343    static NeverDestroyed<const AtomicString> trackRegionShadowPseudoId("-webkit-media-text-track-region", AtomicString::ConstructFromLiteral);
    346344
    347345    return trackRegionShadowPseudoId;

  • trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h

    r194900 r194987  
    9090#define DEFINE_ANIMATED_PROPERTY(AnimatedPropertyTypeEnum, OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
    9191const SVGPropertyInfo* OwnerType::LowerProperty##PropertyInfo() { \
    92     DEPRECATED_DEFINE_STATIC_LOCAL(const SVGPropertyInfo, s_propertyInfo, \
     92    static NeverDestroyed<const SVGPropertyInfo> s_propertyInfo = SVGPropertyInfo \
    9393                        (AnimatedPropertyTypeEnum, \
    9494                         PropertyIsReadWrite, \
    … …  
    9696                         SVGDOMAttributeIdentifier, \
    9797                         &OwnerType::synchronize##UpperProperty, \
    98                          &OwnerType::lookupOrCreate##UpperProperty##Wrapper)); \
    99     return &s_propertyInfo; \
     98                         &OwnerType::lookupOrCreate##UpperProperty##Wrapper); \
     99    return &s_propertyInfo.get(); \
    100100}
    101101

  • trunk/Source/WebKit/ChangeLog

    r194900 r194987  
     12016-01-13  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed, rolling out r194900.
     4
     5        Roll back in as this did not actually regress PLT
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r194826."
     10        https://bugs.webkit.org/show_bug.cgi?id=153020
     11        http://trac.webkit.org/changeset/194900
     12
    1132016-01-12  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Source/WebKit/Storage/StorageThread.cpp

    r194900 r194987  
    2828#include <wtf/AutodrainedPool.h>
    2929#include <wtf/MainThread.h>
     30#include <wtf/NeverDestroyed.h>
    3031
    3132namespace WebCore {
    … …  
    3435{
    3536    ASSERT(isMainThread());
    36     DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<StorageThread*>, threads, ());
     37    static NeverDestroyed<HashSet<StorageThread*>> threads;
    3738    return threads;
    3839}

  • trunk/Source/WebKit/ios/ChangeLog

    r194900 r194987  
     12016-01-13  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed, rolling out r194900.
     4
     5        Roll back in as this did not actually regress PLT
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r194826."
     10        https://bugs.webkit.org/show_bug.cgi?id=153020
     11        http://trac.webkit.org/changeset/194900
     12
    1132016-01-12  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Source/WebKit/ios/WebCoreSupport/WebFixedPositionContent.mm

    r194900 r194987  
    3838
    3939#import <wtf/HashMap.h>
     40#import <wtf/NeverDestroyed.h>
    4041#import <wtf/RetainPtr.h>
    4142#import <wtf/StdLibExtras.h>
    … …  
    5152static Lock& WebFixedPositionContentDataLock()
    5253{
    53     DEPRECATED_DEFINE_STATIC_LOCAL(Lock, mutex, ());
     54    static NeverDestroyed<Lock> mutex;
    5455    return mutex;
    5556}

  • trunk/Source/WebKit/mac/ChangeLog

    r194921 r194987  
     12016-01-13  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed, rolling out r194900.
     4
     5        Roll back in as this did not actually regress PLT
     6
     7        Reverted changeset:
     8
     9        "Unreviewed, rolling out r194826."
     10        https://bugs.webkit.org/show_bug.cgi?id=153020
     11        http://trac.webkit.org/changeset/194900
     12
    1132016-01-12  Ryosuke Niwa  <rniwa@webkit.org>
    214

  • trunk/Source/WebKit/mac/History/WebBackForwardList.mm

    r194900 r194987  
    4949#import <wtf/Assertions.h>
    5050#import <wtf/MainThread.h>
     51#import <wtf/NeverDestroyed.h>
    5152#import <wtf/RetainPtr.h>
    5253#import <wtf/RunLoop.h>
    … …  
    6162static BackForwardListMap& backForwardLists()
    6263{
    63     DEPRECATED_DEFINE_STATIC_LOCAL(BackForwardListMap, staticBackForwardLists, ());
     64    static NeverDestroyed<BackForwardListMap> staticBackForwardLists;
    6465    return staticBackForwardLists;
    6566}

  • trunk/Source/WebKit/mac/History/WebHistoryItem.mm

    r194900 r194987  
    5252#import <wtf/Assertions.h>
    5353#import <wtf/MainThread.h>
     54#import <wtf/NeverDestroyed.h>
    5455#import <wtf/RunLoop.h>
    5556#import <wtf/StdLibExtras.h>
    … …  
    103104static HistoryItemMap& historyItemWrappers()
    104105{
    105     DEPRECATED_DEFINE_STATIC_LOCAL(HistoryItemMap, historyItemWrappers, ());
     106    static NeverDestroyed<HistoryItemMap> historyItemWrappers;
    106107    return historyItemWrappers;
    107108}

  • trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm

    r194900 r194987  
    6161+ (NSArray *)_web_writableTypesForURL
    6262{
    63     DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, ([[NSArray alloc] initWithObjects:
     63    static NSArray *types = [[NSArray alloc] initWithObjects:
    6464        WebURLsWithTitlesPboardType,
    6565        NSURLPboardType,
    … …  
    6767        WebURLNamePboardType,
    6868        NSStringPboardType,
    69         nil]));
    70     return types.get();
     69        nil];
     70    return types;
    7171}
    7272
    … …  
    8080static NSArray *_writableTypesForImageWithoutArchive (void)
    8181{
    82     DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, (_createWritableTypesForImageWithoutArchive()));
    83     return types.get();
     82    static NSArray *types = _createWritableTypesForImageWithoutArchive();
     83    return types;
    8484}
    8585
    … …  
    9494static NSArray *_writableTypesForImageWithArchive (void)
    9595{
    96     DEPRECATED_DEFINE_STATIC_LOCAL(RetainPtr<NSArray>, types, (_createWritableTypesForImageWithArchive()));
    97     return types.get();
     96    static NSArray *types = _createWritableTypesForImageWithArchive();
     97    return types;
    9898}
    9999

  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h

    r194900 r194987  
    3131#import <wtf/HashMap.h>
    3232#import <wtf/PassRefPtr.h>
     33#import <wtf/NeverDestroyed.h>
    3334#import <wtf/text/StringHash.h>
    3435#import <wtf/text/WTFString.h>
    … …  
    5455
    5556private:
     57    friend class NeverDestroyed<NetscapePluginHostManager>;
    5658    NetscapePluginHostProxy* hostForPlugin(const String& pluginPath, cpu_type_t pluginArchitecture, const String& bundleIdentifier);
    5759

  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.mm

    r194900 r194987  
    3838#import <spawn.h>
    3939#import <wtf/Assertions.h>
     40#import <wtf/NeverDestroyed.h>
    4041#import <wtf/RetainPtr.h>
    4142#import <wtf/StdLibExtras.h>
    … …  
    5253NetscapePluginHostManager& NetscapePluginHostManager::singleton()
    5354{
    54     DEPRECATED_DEFINE_STATIC_LOCAL(NetscapePluginHostManager, pluginHostManager, ());
    55    
     55    static NeverDestroyed<NetscapePluginHostManager> pluginHostManager;
    5656    return pluginHostManager;
    5757}

  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm

    r194900 r194987  
    4141#import <WebCore/IdentifierRep.h>
    4242#import <WebCore/ScriptController.h>
     43#import <wtf/NeverDestroyed.h>
    4344
    4445extern "C" {
    … …  
    8586static PluginProxyMap& pluginProxyMap()
    8687{
    87     DEPRECATED_DEFINE_STATIC_LOCAL(PluginProxyMap, pluginProxyMap, ());
    88    
     88    static NeverDestroyed<PluginProxyMap> pluginProxyMap;
    8989    return pluginProxyMap;
    9090}

  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r194900 r194987  
    6565#import <mach/mach.h>
    6666#import <utility>
     67#import <wtf/NeverDestroyed.h>
    6768#import <wtf/RefCountedLeakCounter.h>
    6869#import <wtf/text/CString.h>
    … …  
    16641665static String& globalExceptionString()
    16651666{
    1666     DEPRECATED_DEFINE_STATIC_LOCAL(String, exceptionString, ());
     1667    static NeverDestroyed<String> exceptionString;
    16671668    return exceptionString;
    16681669}

  • trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm

    r194900 r194987  
    3737#import <runtime/FunctionPrototype.h>
    3838#import <runtime/PropertyNameArray.h>
     39#import <wtf/NeverDestroyed.h>
    3940
    4041extern "C" {
    … …  
    6667static ProxyClass* proxyClass()
    6768{
    68     DEPRECATED_DEFINE_STATIC_LOCAL(ProxyClass, proxyClass, ());
    69     return &proxyClass;
     69    static NeverDestroyed<ProxyClass> proxyClass;
     70    return &proxyClass.get();
    7071}
    7172   

  • trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm

    r194900 r194987  
    5555#import <runtime/JSLock.h>
    5656#import <wtf/HashMap.h>
     57#import <wtf/NeverDestroyed.h>
    5758#import <wtf/StdLibExtras.h>
    5859
    … …  
    8485static StreamMap& streams()
    8586{
    86     DEPRECATED_DEFINE_STATIC_LOCAL(StreamMap, staticStreams, ());
     87    static NeverDestroyed<StreamMap> staticStreams;
    8788    return staticStreams;
    8889}

  • trunk/Source/WebKit/mac/Storage/WebDatabaseManager.mm

    r194900 r194987  
    3535#import <WebCore/DatabaseManager.h>
    3636#import <WebCore/SecurityOrigin.h>
     37#import <wtf/NeverDestroyed.h>
    3738
    3839#if PLATFORM(IOS)
    … …  
    229230static Lock& transactionBackgroundTaskIdentifierLock()
    230231{
    231     DEPRECATED_DEFINE_STATIC_LOCAL(Lock, mutex, ());
     232    static NeverDestroyed<Lock> mutex;
    232233    return mutex;
    233234}

  • trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm

    r194900 r194987  
    8383static UserMediaCheckMap& userMediaCheckMap()
    8484{
    85     DEPRECATED_DEFINE_STATIC_LOCAL(UserMediaCheckMap, requests, ());
     85    static NeverDestroyed<UserMediaCheckMap> requests;
    8686    return requests;
    8787}

  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

    r194900 r194987  
    6363#import <yarr/RegularExpression.h>
    6464#import <wtf/Assertions.h>
     65#import <wtf/NeverDestroyed.h>
    6566#import <wtf/StdLibExtras.h>
    6667#import <wtf/text/StringBuilder.h>
    … …  
    364365    static const unsigned int regExpCacheSize = 4;
    365366    static NSMutableArray* regExpLabels = nil;
    366     DEPRECATED_DEFINE_STATIC_LOCAL(Vector<RegularExpression*>, regExps, ());
    367     DEPRECATED_DEFINE_STATIC_LOCAL(RegularExpression, wordRegExp, ("\\w", TextCaseSensitive));
     367    static NeverDestroyed<Vector<RegularExpression*>> regExps;
     368    static NeverDestroyed<RegularExpression> wordRegExp("\\w", TextCaseSensitive);
    368369
    369370    RegularExpression* result;
    … …  
    372373    CFIndex cacheHit = [regExpLabels indexOfObject:labels];
    373374    if (cacheHit != NSNotFound)
    374         result = regExps.at(cacheHit);
     375        result = regExps.get().at(cacheHit);
    375376    else {
    376377        StringBuilder pattern;
    … …  
    384385            bool endsWithWordChar = false;
    385386            if (label.length() != 0) {
    386                 startsWithWordChar = wordRegExp.match(label.substring(0, 1)) >= 0;
    387                 endsWithWordChar = wordRegExp.match(label.substring(label.length() - 1, 1)) >= 0;
     387                startsWithWordChar = wordRegExp.get().match(label.substring(0, 1)) >= 0;
     388                endsWithWordChar = wordRegExp.get().match(label.substring(label.length() - 1, 1)) >= 0;
    388389            }
    389390           
    … …  
    408409            // remove from old spot
    409410            [regExpLabels removeObjectAtIndex:cacheHit];
    410             regExps.remove(cacheHit);
     411            regExps.get().remove(cacheHit);
    411412        }
    412413        // add to start
    413414        [regExpLabels insertObject:labels atIndex:0];
    414         regExps.insert(0, result);
     415        regExps.get().insert(0, result);
    415416        // trim if too big
    416417        if ([regExpLabels count] > regExpCacheSize) {
    417418            [regExpLabels removeObjectAtIndex:regExpCacheSize];
    418             RegularExpression* last = regExps.last();
    419             regExps.removeLast();
     419            RegularExpression* last = regExps.get().last();
     420            regExps.get().removeLast();
    420421            delete last;
    421422        }

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r194900 r194987  
    68076807        }
    68086808        else if (object->inherits(JSArray::info())) {
    6809             DEPRECATED_DEFINE_STATIC_LOCAL(HashSet<JSObject*>, visitedElems, ());
    6810             if (!visitedElems.contains(object)) {
    6811                 visitedElems.add(object);
     6809            static NeverDestroyed<HashSet<JSObject*>> visitedElems;
     6810            if (!visitedElems.get().contains(object)) {
     6811                visitedElems.get().add(object);
    68126812               
    68136813                JSArray* array = static_cast<JSArray*>(object);
    … …  
    68176817                    [aeDesc insertDescriptor:aeDescFromJSValue(exec, array->get(exec, i)) atIndex:0];
    68186818               
    6819                 visitedElems.remove(object);
     6819                visitedElems.get().remove(object);
    68206820                return aeDesc;
    68216821            }
Note: See TracChangeset for help on using the changeset viewer.