Changeset 141658 in webkit


Ignore:
Timestamp:
Feb 1, 2013 4:10:09 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

[WK2] Use light supplement names instead of static AtomicStrings
​https://bugs.webkit.org/show_bug.cgi?id=108570

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-02-01
Reviewed by Anders Carlsson.

Since all the supplement names are just string literals and are all different,
we can just use their pointer as the key in the supplement hashmaps.

This is lighter and faster than using AtomicString. WebCore already moved to this
in Supplementable.

  • NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::addSupplement):
(NetworkProcess):

  • Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::supplementName):

  • Shared/Authentication/AuthenticationManager.h:

(AuthenticationManager):

  • Shared/Network/CustomProtocols/CustomProtocolManager.h:

(CustomProtocolManager):

  • Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:

(WebKit::CustomProtocolManager::supplementName):

  • UIProcess/Notifications/WebNotificationManagerProxy.cpp:

(WebKit::WebNotificationManagerProxy::supplementName):

  • UIProcess/Notifications/WebNotificationManagerProxy.h:

(WebNotificationManagerProxy):

  • UIProcess/WebApplicationCacheManagerProxy.cpp:

(WebKit::WebApplicationCacheManagerProxy::supplementName):

  • UIProcess/WebApplicationCacheManagerProxy.h:

(WebApplicationCacheManagerProxy):

  • UIProcess/WebContext.h:

(WebContext):

  • UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::supplementName):

  • UIProcess/WebCookieManagerProxy.h:

(WebCookieManagerProxy):

  • UIProcess/WebDatabaseManagerProxy.cpp:

(WebKit::WebDatabaseManagerProxy::supplementName):

  • UIProcess/WebDatabaseManagerProxy.h:

(WebDatabaseManagerProxy):

  • UIProcess/WebGeolocationManagerProxy.cpp:

(WebKit::WebGeolocationManagerProxy::supplementName):

  • UIProcess/WebGeolocationManagerProxy.h:

(WebGeolocationManagerProxy):

  • UIProcess/WebKeyValueStorageManagerProxy.cpp:

(WebKit::WebKeyValueStorageManagerProxy::supplementName):

  • UIProcess/WebKeyValueStorageManagerProxy.h:

(WebKeyValueStorageManagerProxy):

  • UIProcess/WebMediaCacheManagerProxy.cpp:

(WebKit::WebMediaCacheManagerProxy::supplementName):

  • UIProcess/WebMediaCacheManagerProxy.h:

(WebMediaCacheManagerProxy):

  • UIProcess/WebResourceCacheManagerProxy.cpp:

(WebKit::WebResourceCacheManagerProxy::supplementName):

  • UIProcess/WebResourceCacheManagerProxy.h:

(WebResourceCacheManagerProxy):

  • UIProcess/soup/WebSoupRequestManagerProxy.cpp:

(WebKit::WebSoupRequestManagerProxy::supplementName):

  • UIProcess/soup/WebSoupRequestManagerProxy.h:

(WebSoupRequestManagerProxy):

  • WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:

(WebKit::WebApplicationCacheManager::supplementName):

  • WebProcess/ApplicationCache/WebApplicationCacheManager.h:

(WebApplicationCacheManager):

  • WebProcess/Cookies/WebCookieManager.cpp:

(WebKit::WebCookieManager::supplementName):

  • WebProcess/Cookies/WebCookieManager.h:

(WebCookieManager):

  • WebProcess/Geolocation/WebGeolocationManager.cpp:

(WebKit::WebGeolocationManager::supplementName):

  • WebProcess/Geolocation/WebGeolocationManager.h:

(WebGeolocationManager):

  • WebProcess/MediaCache/WebMediaCacheManager.cpp:

(WebKit::WebMediaCacheManager::supplementName):

  • WebProcess/MediaCache/WebMediaCacheManager.h:

(WebMediaCacheManager):

  • WebProcess/Notifications/WebNotificationManager.cpp:

(WebKit::WebNotificationManager::supplementName):

  • WebProcess/Notifications/WebNotificationManager.h:

(WebNotificationManager):

  • WebProcess/ResourceCache/WebResourceCacheManager.cpp:

(WebKit::WebResourceCacheManager::supplementName):

  • WebProcess/ResourceCache/WebResourceCacheManager.h:

(WebResourceCacheManager):

  • WebProcess/Storage/WebKeyValueStorageManager.cpp:

(WebKit::WebKeyValueStorageManager::supplementName):

  • WebProcess/Storage/WebKeyValueStorageManager.h:

(WebKeyValueStorageManager):

  • WebProcess/WebCoreSupport/WebDatabaseManager.cpp:

(WebKit::WebDatabaseManager::supplementName):

  • WebProcess/WebCoreSupport/WebDatabaseManager.h:

(WebDatabaseManager):

  • WebProcess/WebProcess.h:

(WebKit::WebProcess::addSupplement):
(WebProcess):

Location:
trunk/Source/WebKit2
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r141656 r141658  
     12013-02-01  Benjamin Poulain  <bpoulain@apple.com>
     2
     3        [WK2] Use light supplement names instead of static AtomicStrings
     4        https://bugs.webkit.org/show_bug.cgi?id=108570
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Since all the supplement names are just string literals and are all different,
     9        we can just use their pointer as the key in the supplement hashmaps.
     10
     11        This is lighter and faster than using AtomicString. WebCore already moved to this
     12        in Supplementable.
     13
     14        * NetworkProcess/NetworkProcess.h:
     15        (WebKit::NetworkProcess::addSupplement):
     16        (NetworkProcess):
     17        * Shared/Authentication/AuthenticationManager.cpp:
     18        (WebKit::AuthenticationManager::supplementName):
     19        * Shared/Authentication/AuthenticationManager.h:
     20        (AuthenticationManager):
     21        * Shared/Network/CustomProtocols/CustomProtocolManager.h:
     22        (CustomProtocolManager):
     23        * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:
     24        (WebKit::CustomProtocolManager::supplementName):
     25        * UIProcess/Notifications/WebNotificationManagerProxy.cpp:
     26        (WebKit::WebNotificationManagerProxy::supplementName):
     27        * UIProcess/Notifications/WebNotificationManagerProxy.h:
     28        (WebNotificationManagerProxy):
     29        * UIProcess/WebApplicationCacheManagerProxy.cpp:
     30        (WebKit::WebApplicationCacheManagerProxy::supplementName):
     31        * UIProcess/WebApplicationCacheManagerProxy.h:
     32        (WebApplicationCacheManagerProxy):
     33        * UIProcess/WebContext.h:
     34        (WebContext):
     35        * UIProcess/WebCookieManagerProxy.cpp:
     36        (WebKit::WebCookieManagerProxy::supplementName):
     37        * UIProcess/WebCookieManagerProxy.h:
     38        (WebCookieManagerProxy):
     39        * UIProcess/WebDatabaseManagerProxy.cpp:
     40        (WebKit::WebDatabaseManagerProxy::supplementName):
     41        * UIProcess/WebDatabaseManagerProxy.h:
     42        (WebDatabaseManagerProxy):
     43        * UIProcess/WebGeolocationManagerProxy.cpp:
     44        (WebKit::WebGeolocationManagerProxy::supplementName):
     45        * UIProcess/WebGeolocationManagerProxy.h:
     46        (WebGeolocationManagerProxy):
     47        * UIProcess/WebKeyValueStorageManagerProxy.cpp:
     48        (WebKit::WebKeyValueStorageManagerProxy::supplementName):
     49        * UIProcess/WebKeyValueStorageManagerProxy.h:
     50        (WebKeyValueStorageManagerProxy):
     51        * UIProcess/WebMediaCacheManagerProxy.cpp:
     52        (WebKit::WebMediaCacheManagerProxy::supplementName):
     53        * UIProcess/WebMediaCacheManagerProxy.h:
     54        (WebMediaCacheManagerProxy):
     55        * UIProcess/WebResourceCacheManagerProxy.cpp:
     56        (WebKit::WebResourceCacheManagerProxy::supplementName):
     57        * UIProcess/WebResourceCacheManagerProxy.h:
     58        (WebResourceCacheManagerProxy):
     59        * UIProcess/soup/WebSoupRequestManagerProxy.cpp:
     60        (WebKit::WebSoupRequestManagerProxy::supplementName):
     61        * UIProcess/soup/WebSoupRequestManagerProxy.h:
     62        (WebSoupRequestManagerProxy):
     63        * WebProcess/ApplicationCache/WebApplicationCacheManager.cpp:
     64        (WebKit::WebApplicationCacheManager::supplementName):
     65        * WebProcess/ApplicationCache/WebApplicationCacheManager.h:
     66        (WebApplicationCacheManager):
     67        * WebProcess/Cookies/WebCookieManager.cpp:
     68        (WebKit::WebCookieManager::supplementName):
     69        * WebProcess/Cookies/WebCookieManager.h:
     70        (WebCookieManager):
     71        * WebProcess/Geolocation/WebGeolocationManager.cpp:
     72        (WebKit::WebGeolocationManager::supplementName):
     73        * WebProcess/Geolocation/WebGeolocationManager.h:
     74        (WebGeolocationManager):
     75        * WebProcess/MediaCache/WebMediaCacheManager.cpp:
     76        (WebKit::WebMediaCacheManager::supplementName):
     77        * WebProcess/MediaCache/WebMediaCacheManager.h:
     78        (WebMediaCacheManager):
     79        * WebProcess/Notifications/WebNotificationManager.cpp:
     80        (WebKit::WebNotificationManager::supplementName):
     81        * WebProcess/Notifications/WebNotificationManager.h:
     82        (WebNotificationManager):
     83        * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
     84        (WebKit::WebResourceCacheManager::supplementName):
     85        * WebProcess/ResourceCache/WebResourceCacheManager.h:
     86        (WebResourceCacheManager):
     87        * WebProcess/Storage/WebKeyValueStorageManager.cpp:
     88        (WebKit::WebKeyValueStorageManager::supplementName):
     89        * WebProcess/Storage/WebKeyValueStorageManager.h:
     90        (WebKeyValueStorageManager):
     91        * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
     92        (WebKit::WebDatabaseManager::supplementName):
     93        * WebProcess/WebCoreSupport/WebDatabaseManager.h:
     94        (WebDatabaseManager):
     95        * WebProcess/WebProcess.h:
     96        (WebKit::WebProcess::addSupplement):
     97        (WebProcess):
     98
    1992013-02-01  Benjamin Poulain  <bpoulain@apple.com>
    2100

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    6262    void addSupplement()
    6363    {
    64         m_supplements.add(T::supplementName(), new T(this));
     64        m_supplements.add(T::supplementName(), adoptPtr<NetworkProcessSupplement>(new T(this)));
    6565    }
    6666
    … …  
    120120    CacheModel m_cacheModel;
    121121
    122     typedef HashMap<AtomicString, NetworkProcessSupplement*> NetworkProcessSupplementMap;
     122    typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*> > NetworkProcessSupplementMap;
    123123    NetworkProcessSupplementMap m_supplements;
    124124};

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5353}
    5454
    55 const AtomicString& AuthenticationManager::supplementName()
     55const char* AuthenticationManager::supplementName()
    5656{
    57     DEFINE_STATIC_LOCAL(AtomicString, name, ("AuthenticationManager", AtomicString::ConstructFromLiteral));
    58     return name;
     57    return "AuthenticationManager";
    5958}
    6059

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5151    explicit AuthenticationManager(ChildProcess*);
    5252
    53     static const AtomicString& supplementName();
     53    static const char* supplementName();
    5454
    5555    // Called for resources in the WebProcess (NetworkProcess disabled)

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    6161    explicit CustomProtocolManager(ChildProcess*);
    6262
    63     static const AtomicString& supplementName();
     63    static const char* supplementName();
    6464
    6565    ChildProcess* childProcess() const { return m_childProcess; }

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm

    r141361 r141658  
    11/*
    2  * Copyright (C) 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    110110namespace WebKit {
    111111
    112 const AtomicString& CustomProtocolManager::supplementName()
    113 {
    114     DEFINE_STATIC_LOCAL(AtomicString, name, ("CustomProtocolManager", AtomicString::ConstructFromLiteral));
    115     return name;
     112const const char* CustomProtocolManager::supplementName()
     113{
     114    return "CustomProtocolManager";
    116115}
    117116

  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4141namespace WebKit {
    4242
    43 const AtomicString& WebNotificationManagerProxy::supplementName()
    44 {
    45     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebNotificationManagerProxy", AtomicString::ConstructFromLiteral));
    46     return name;
     43const char* WebNotificationManagerProxy::supplementName()
     44{
     45    return "WebNotificationManagerProxy";
    4746}
    4847

  • trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4848    static const Type APIType = TypeNotificationManager;
    4949
    50     static const AtomicString& supplementName();
     50    static const char* supplementName();
    5151
    5252    static PassRefPtr<WebNotificationManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3535namespace WebKit {
    3636
    37 const AtomicString& WebApplicationCacheManagerProxy::supplementName()
     37const char* WebApplicationCacheManagerProxy::supplementName()
    3838{
    39     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebApplicationCacheManagerProxy", AtomicString::ConstructFromLiteral));
    40     return name;
     39    return "WebApplicationCacheManagerProxy";
    4140}
    4241

  • trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h

    r141472 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5151    static const Type APIType = TypeApplicationCacheManager;
    5252
    53     static const AtomicString& supplementName();
     53    static const char* supplementName();
    5454
    5555    static PassRefPtr<WebApplicationCacheManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r141510 r141658  
    11/*
    2  * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    425425    RefPtr<StorageManager> m_storageManager;
    426426
    427     typedef HashMap<AtomicString, RefPtr<WebContextSupplement> > WebContextSupplementMap;
     427    typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*> > WebContextSupplementMap;
    428428    WebContextSupplementMap m_supplements;
    429429

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3535namespace WebKit {
    3636
    37 const AtomicString& WebCookieManagerProxy::supplementName()
     37const char* WebCookieManagerProxy::supplementName()
    3838{
    39     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebCookieManagerProxy", AtomicString::ConstructFromLiteral));
    40     return name;
     39    return "WebCookieManagerProxy";
    4140}
    4241

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

    r141472 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5757    static const Type APIType = TypeCookieManager;
    5858
    59     static const AtomicString& supplementName();
     59    static const char* supplementName();
    6060
    6161    static PassRefPtr<WebCookieManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4040namespace WebKit {
    4141
    42 const AtomicString& WebDatabaseManagerProxy::supplementName()
    43 {
    44     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebDatabaseManagerProxy", AtomicString::ConstructFromLiteral));
    45     return name;
     42const char* WebDatabaseManagerProxy::supplementName()
     43{
     44    return "WebDatabaseManagerProxy";
    4645}
    4746

  • trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5151    static const Type APIType = TypeDatabaseManager;
    5252
    53     static const AtomicString& supplementName();
     53    static const char* supplementName();
    5454
    5555    static PassRefPtr<WebDatabaseManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3333namespace WebKit {
    3434
    35 const AtomicString& WebGeolocationManagerProxy::supplementName()
     35const char* WebGeolocationManagerProxy::supplementName()
    3636{
    37     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebGeolocationManagerProxy", AtomicString::ConstructFromLiteral));
    38     return name;
     37    return "WebGeolocationManagerProxy";
    3938}
    4039

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4242    static const Type APIType = TypeGeolocationManager;
    4343
    44     static const AtomicString& supplementName();
     44    static const char* supplementName();
    4545
    4646    static PassRefPtr<WebGeolocationManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3535namespace WebKit {
    3636
    37 const AtomicString& WebKeyValueStorageManagerProxy::supplementName()
     37const char* WebKeyValueStorageManagerProxy::supplementName()
    3838{
    39     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebKeyValueStorageManagerProxy", AtomicString::ConstructFromLiteral));
    40     return name;
     39    return "WebKeyValueStorageManagerProxy";
    4140}
    4241

  • trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4949    static const Type APIType = TypeKeyValueStorageManager;
    5050
    51     static const AtomicString& supplementName();
     51    static const char* supplementName();
    5252
    5353    static PassRefPtr<WebKeyValueStorageManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3434namespace WebKit {
    3535
    36 const AtomicString& WebMediaCacheManagerProxy::supplementName()
     36const char* WebMediaCacheManagerProxy::supplementName()
    3737{
    38     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebMediaCacheManagerProxy", AtomicString::ConstructFromLiteral));
    39     return name;
     38    return "WebMediaCacheManagerProxy";
    4039}
    4140

  • trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4747    static const Type APIType = TypeMediaCacheManager;
    4848
    49     static const AtomicString& supplementName();
     49    static const char* supplementName();
    5050
    5151    static PassRefPtr<WebMediaCacheManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3939namespace WebKit {
    4040
    41 const AtomicString& WebResourceCacheManagerProxy::supplementName()
     41const char* WebResourceCacheManagerProxy::supplementName()
    4242{
    43     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebResourceCacheManagerProxy", AtomicString::ConstructFromLiteral));
    44     return name;
     43    return "WebResourceCacheManagerProxy";
    4544}
    4645

  • trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4949    static const Type APIType = TypeCacheManager;
    5050
    51     static const AtomicString& supplementName();
     51    static const char* supplementName();
    5252
    5353    static PassRefPtr<WebResourceCacheManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp

    r140656 r141658  
    11/*
    22 * Copyright (C) 2012 Igalia S.L.
     3 * Copyright (C) 2013 Apple Inc. All rights reserved.
    34 *
    45 * This library is free software; you can redistribute it and/or
    … …  
    2829namespace WebKit {
    2930
    30 const AtomicString& WebSoupRequestManagerProxy::supplementName()
     31const char* WebSoupRequestManagerProxy::supplementName()
    3132{
    32     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebSoupRequestManagerProxy", AtomicString::ConstructFromLiteral));
    33     return name;
     33    return "WebSoupRequestManagerProxy";
    3434}
    3535

  • trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h

    r141366 r141658  
    11/*
    22 * Copyright (C) 2012 Igalia S.L.
     3 * Copyright (C) 2013 Apple Inc. All rights reserved.
    34 *
    45 * This library is free software; you can redistribute it and/or
    … …  
    3839    static const Type APIType = TypeSoupRequestManager;
    3940
    40     static const AtomicString& supplementName();
     41    static const char* supplementName();
    4142
    4243    static PassRefPtr<WebSoupRequestManagerProxy> create(WebContext*);

  • trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4141namespace WebKit {
    4242
    43 const AtomicString& WebApplicationCacheManager::supplementName()
     43const char* WebApplicationCacheManager::supplementName()
    4444{
    45     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebApplicationCacheManager", AtomicString::ConstructFromLiteral));
    46     return name;
     45    return "WebApplicationCacheManager";
    4746}
    4847

  • trunk/Source/WebKit2/WebProcess/ApplicationCache/WebApplicationCacheManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4242    WebApplicationCacheManager(ChildProcess*);
    4343
    44     static const AtomicString& supplementName();
     44    static const char* supplementName();
    4545
    4646    void deleteAllEntries();

  • trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4444static WebCookieManager* sharedCookieManager;
    4545
    46 const AtomicString& WebCookieManager::supplementName()
     46const char* WebCookieManager::supplementName()
    4747{
    48     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebCookieManager", AtomicString::ConstructFromLiteral));
    49     return name;
     48    return "WebCookieManager";
    5049}
    5150

  • trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4848    WebCookieManager(ChildProcess*);
    4949
    50     static const AtomicString& supplementName();
     50    static const char* supplementName();
    5151
    5252    void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);

  • trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4141namespace WebKit {
    4242
    43 const AtomicString& WebGeolocationManager::supplementName()
     43const char* WebGeolocationManager::supplementName()
    4444{
    45     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebGeolocationManager", AtomicString::ConstructFromLiteral));
    46     return name;
     45    return "WebGeolocationManager";
    4746}
    4847

  • trunk/Source/WebKit2/WebProcess/Geolocation/WebGeolocationManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5050    ~WebGeolocationManager();
    5151
    52     static const AtomicString& supplementName();
     52    static const char* supplementName();
    5353
    5454    void registerWebPage(WebPage*);

  • trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3636namespace WebKit {
    3737
    38 const AtomicString& WebMediaCacheManager::supplementName()
     38const char* WebMediaCacheManager::supplementName()
    3939{
    40     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebMediaCacheManager", AtomicString::ConstructFromLiteral));
    41     return name;
     40    return "WebMediaCacheManager";
    4241}
    4342

  • trunk/Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4242    explicit WebMediaCacheManager(WebProcess*);
    4343
    44     static const AtomicString& supplementName();
     44    static const char* supplementName();
    4545
    4646private:

  • trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5757#endif
    5858
    59 const AtomicString& WebNotificationManager::supplementName()
    60 {
    61     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebNotificationManager", AtomicString::ConstructFromLiteral));
    62     return name;
     59const char* WebNotificationManager::supplementName()
     60{
     61    return "WebNotificationManager";
    6362}
    6463

  • trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5252    ~WebNotificationManager();
    5353
    54     static const AtomicString& supplementName();
     54    static const char* supplementName();
    5555   
    5656    bool show(WebCore::Notification*, WebPage*);

  • trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp

    r140607 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4141namespace WebKit {
    4242
    43 const AtomicString& WebResourceCacheManager::supplementName()
     43const char* WebResourceCacheManager::supplementName()
    4444{
    45     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebResourceCacheManager", AtomicString::ConstructFromLiteral));
    46     return name;
     45    return "WebResourceCacheManager";
    4746}
    4847

  • trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4444    WebResourceCacheManager(WebProcess*);
    4545
    46     static const AtomicString& supplementName();
     46    static const char* supplementName();
    4747
    4848private:

  • trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.cpp

    r140711 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4040namespace WebKit {
    4141
    42 const AtomicString& WebKeyValueStorageManager::supplementName()
     42const char* WebKeyValueStorageManager::supplementName()
    4343{
    44     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebKeyValueStorageManager", AtomicString::ConstructFromLiteral));
    45     return name;
     44    return "WebKeyValueStorageManager";
    4645}
    4746

  • trunk/Source/WebKit2/WebProcess/Storage/WebKeyValueStorageManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4444    explicit WebKeyValueStorageManager(WebProcess*);
    4545
    46     static const AtomicString& supplementName();
     46    static const char* supplementName();
    4747
    4848    const String& localStorageDirectory() const { return m_localStorageDirectory; }

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4343namespace WebKit {
    4444
    45 const AtomicString& WebDatabaseManager::supplementName()
     45const char* WebDatabaseManager::supplementName()
    4646{
    47     DEFINE_STATIC_LOCAL(AtomicString, name, ("WebDatabaseManager", AtomicString::ConstructFromLiteral));
    48     return name;
     47    return "WebDatabaseManager";
    4948}
    5049

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h

    r141361 r141658  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4444    explicit WebDatabaseManager(WebProcess*);
    4545
    46     static const AtomicString& supplementName();
     46    static const char* supplementName();
    4747
    4848    void setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const;

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r141448 r141658  
    110110    void addSupplement()
    111111    {
    112         m_supplements.add(T::supplementName(), new T(this));
     112        m_supplements.add(T::supplementName(), adoptPtr<WebProcessSupplement>(new T(this)));
    113113    }
    114114
    … …  
    319319    HashMap<uint64_t, WebFrame*> m_frameMap;
    320320
    321     typedef HashMap<AtomicString, WebProcessSupplement*> WebProcessSupplementMap;
     321    typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*> > WebProcessSupplementMap;
    322322    WebProcessSupplementMap m_supplements;
    323323
Note: See TracChangeset for help on using the changeset viewer.