Changeset 87469 in webkit


Ignore:
Timestamp:
May 26, 2011 10:29:45 PM (13 years ago)
Author:
mihaip@chromium.org
Message:

2011-05-26 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

Fix worldID and destinationDomain argument names
​https://bugs.webkit.org/show_bug.cgi?id=61571

As part of working on r87423, I noticed a couple of inconsistencies in
argument names:

  • We would use worldId in .h files but worldID in .cpp files. Standardize on the latter
  • SecurityOrigin::addOriginAccessWhitelistEntry would take a destinationDomains argument, even though the actual parameter was for a single domain (renamed to be singular).
  • bindings/v8/ScriptController.h:
  • bindings/v8/V8Proxy.h:
  • page/SecurityOrigin.cpp: (WebCore::SecurityOrigin::addOriginAccessWhitelistEntry): (WebCore::SecurityOrigin::removeOriginAccessWhitelistEntry):
  • page/SecurityOrigin.h:

2011-05-26 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

Fix worldID and destinationDomain argument names
​https://bugs.webkit.org/show_bug.cgi?id=61571

As part of working on r87423, I noticed a couple of inconsistencies in
argument names:

  • We would use worldId in .h files but worldID in .cpp files. Standardize on the latter
  • SecurityOrigin::addOriginAccessWhitelistEntry would take a destinationDomains argument, even though the actual parameter was for a single domain (renamed to be singular).
  • public/WebFrame.h:
  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::executeScriptInIsolatedWorld): (WebKit::WebFrameImpl::setIsolatedWorldSecurityOrigin):
  • src/WebFrameImpl.h:

2011-05-26 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Adam Barth.

Fix worldID and destinationDomain argument names
​https://bugs.webkit.org/show_bug.cgi?id=61571

As part of working on r87423, I noticed a couple of inconsistencies in
argument names:

  • We would use worldId in .h files but worldID in .cpp files. Standardize on the latter
  • SecurityOrigin::addOriginAccessWhitelistEntry would take a destinationDomains argument, even though the actual parameter was for a single domain (renamed to be singular).
  • DumpRenderTree/LayoutTestController.h:
  • DumpRenderTree/wx/LayoutTestControllerWx.cpp: (LayoutTestController::evaluateScriptInIsolatedWorld):
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r87467 r87469  
     12011-05-26  Mihai Parparita  <mihaip@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix worldID and destinationDomain argument names
     6        https://bugs.webkit.org/show_bug.cgi?id=61571
     7
     8        As part of working on r87423, I noticed a couple of inconsistencies in
     9        argument names:
     10        - We would use worldId in .h files but worldID in .cpp files.
     11          Standardize on the latter
     12        - SecurityOrigin::addOriginAccessWhitelistEntry would take a
     13          destinationDomains argument, even though the actual parameter was for
     14          a single domain (renamed to be singular).
     15
     16        * bindings/v8/ScriptController.h:
     17        * bindings/v8/V8Proxy.h:
     18        * page/SecurityOrigin.cpp:
     19        (WebCore::SecurityOrigin::addOriginAccessWhitelistEntry):
     20        (WebCore::SecurityOrigin::removeOriginAccessWhitelistEntry):
     21        * page/SecurityOrigin.h:
     22
    1232011-05-26  Emil A Eklund  <eae@chromium.org>
    224

  • trunk/Source/WebCore/bindings/v8/ScriptController.h

    r87423 r87469  
    103103    // origin. XMLHttpRequest instances used in that world will be considered
    104104    // to come from that origin, not the frame's.
    105     void setIsolatedWorldSecurityOrigin(int worldId, PassRefPtr<SecurityOrigin>);
     105    void setIsolatedWorldSecurityOrigin(int worldID, PassRefPtr<SecurityOrigin>);
    106106
    107107    // Masquerade 'this' as the windowShell.

  • trunk/Source/WebCore/bindings/v8/V8Proxy.h

    r87423 r87469  
    160160        // Array, and so-on), and its own wrappers for all DOM nodes and DOM
    161161        // constructors.
    162         void evaluateInIsolatedWorld(int worldId, const Vector<ScriptSourceCode>& sources, int extensionGroup);
     162        void evaluateInIsolatedWorld(int worldID, const Vector<ScriptSourceCode>& sources, int extensionGroup);
    163163       
    164         void setIsolatedWorldSecurityOrigin(int worldId, PassRefPtr<SecurityOrigin>);
     164        void setIsolatedWorldSecurityOrigin(int worldID, PassRefPtr<SecurityOrigin>);
    165165
    166166        // Returns true if the proxy is currently executing a script in V8.

  • trunk/Source/WebCore/page/SecurityOrigin.cpp

    r84099 r87469  
    536536}
    537537
    538 void SecurityOrigin::addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains)
     538void SecurityOrigin::addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains)
    539539{
    540540    ASSERT(isMainThread());
    … …  
    549549
    550550    OriginAccessWhiteList* list = result.first->second;
    551     list->append(OriginAccessEntry(destinationProtocol, destinationDomains, allowDestinationSubdomains ? OriginAccessEntry::AllowSubdomains : OriginAccessEntry::DisallowSubdomains));
    552 }
    553 
    554 void SecurityOrigin::removeOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains)
     551    list->append(OriginAccessEntry(destinationProtocol, destinationDomain, allowDestinationSubdomains ? OriginAccessEntry::AllowSubdomains : OriginAccessEntry::DisallowSubdomains));
     552}
     553
     554void SecurityOrigin::removeOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains)
    555555{
    556556    ASSERT(isMainThread());
    … …  
    566566
    567567    OriginAccessWhiteList* list = it->second;
    568     size_t index = list->find(OriginAccessEntry(destinationProtocol, destinationDomains, allowDestinationSubdomains ? OriginAccessEntry::AllowSubdomains : OriginAccessEntry::DisallowSubdomains));
     568    size_t index = list->find(OriginAccessEntry(destinationProtocol, destinationDomain, allowDestinationSubdomains ? OriginAccessEntry::AllowSubdomains : OriginAccessEntry::DisallowSubdomains));
    569569    if (index == notFound)
    570570        return;

  • trunk/Source/WebCore/page/SecurityOrigin.h

    r84099 r87469  
    190190    static bool allowSubstituteDataAccessToLocal();
    191191
    192     static void addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains);
    193     static void removeOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomains, bool allowDestinationSubdomains);
     192    static void addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains);
     193    static void removeOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains);
    194194    static void resetOriginAccessWhitelists();
    195195

  • trunk/Source/WebKit/chromium/ChangeLog

    r87463 r87469  
     12011-05-26  Mihai Parparita  <mihaip@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix worldID and destinationDomain argument names
     6        https://bugs.webkit.org/show_bug.cgi?id=61571
     7
     8        As part of working on r87423, I noticed a couple of inconsistencies in
     9        argument names:
     10        - We would use worldId in .h files but worldID in .cpp files.
     11          Standardize on the latter
     12        - SecurityOrigin::addOriginAccessWhitelistEntry would take a
     13          destinationDomains argument, even though the actual parameter was for
     14          a single domain (renamed to be singular).
     15
     16        * public/WebFrame.h:
     17        * src/WebFrameImpl.cpp:
     18        (WebKit::WebFrameImpl::executeScriptInIsolatedWorld):
     19        (WebKit::WebFrameImpl::setIsolatedWorldSecurityOrigin):
     20        * src/WebFrameImpl.h:
     21
    1222011-05-26  Leandro Gracia Gil  <leandrogracia@chromium.org>
    223

  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r87423 r87469  
    251251    // WebKit::registerExtension for the corresponding specifier.
    252252    virtual void executeScriptInIsolatedWorld(
    253         int worldId, const WebScriptSource* sources, unsigned numSources,
     253        int worldID, const WebScriptSource* sources, unsigned numSources,
    254254        int extensionGroup) = 0;
    255255
    … …  
    258258    // to come from that origin, not the frame's.
    259259    virtual void setIsolatedWorldSecurityOrigin(
    260         int worldId, const WebSecurityOrigin&) = 0;
     260        int worldID, const WebSecurityOrigin&) = 0;
    261261
    262262    // Logs to the console associated with this frame.

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r87423 r87469  
    776776
    777777void WebFrameImpl::executeScriptInIsolatedWorld(
    778     int worldId, const WebScriptSource* sourcesIn, unsigned numSources,
     778    int worldID, const WebScriptSource* sourcesIn, unsigned numSources,
    779779    int extensionGroup)
    780780{
    … …  
    787787    }
    788788
    789     m_frame->script()->evaluateInIsolatedWorld(worldId, sources, extensionGroup);
    790 }
    791 
    792 void WebFrameImpl::setIsolatedWorldSecurityOrigin(int worldId, const WebSecurityOrigin& securityOrigin)
    793 {
    794     m_frame->script()->setIsolatedWorldSecurityOrigin(worldId, securityOrigin.get());
     789    m_frame->script()->evaluateInIsolatedWorld(worldID, sources, extensionGroup);
     790}
     791
     792void WebFrameImpl::setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOrigin& securityOrigin)
     793{
     794    m_frame->script()->setIsolatedWorldSecurityOrigin(worldID, securityOrigin.get());
    795795}
    796796

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r87423 r87469  
    103103    virtual void executeScript(const WebScriptSource&);
    104104    virtual void executeScriptInIsolatedWorld(
    105         int worldId, const WebScriptSource* sources, unsigned numSources,
     105        int worldID, const WebScriptSource* sources, unsigned numSources,
    106106        int extensionGroup);
    107     virtual void setIsolatedWorldSecurityOrigin(int worldId, const WebSecurityOrigin&);
     107    virtual void setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOrigin&);
    108108    virtual void addMessageToConsole(const WebConsoleMessage&);
    109109    virtual void collectGarbage();

  • trunk/Tools/ChangeLog

    r87464 r87469  
     12011-05-26  Mihai Parparita  <mihaip@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix worldID and destinationDomain argument names
     6        https://bugs.webkit.org/show_bug.cgi?id=61571
     7
     8        As part of working on r87423, I noticed a couple of inconsistencies in
     9        argument names:
     10        - We would use worldId in .h files but worldID in .cpp files.
     11          Standardize on the latter
     12        - SecurityOrigin::addOriginAccessWhitelistEntry would take a
     13          destinationDomains argument, even though the actual parameter was for
     14          a single domain (renamed to be singular).
     15
     16        * DumpRenderTree/LayoutTestController.h:
     17        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
     18        (LayoutTestController::evaluateScriptInIsolatedWorld):
     19
    1202011-05-26  Yuta Kitamura  <yutak@chromium.org>
    221

  • trunk/Tools/DumpRenderTree/LayoutTestController.h

    r86644 r87469  
    304304    void setTimelineProfilingEnabled(bool enabled);
    305305    void evaluateInWebInspector(long callId, JSStringRef script);
    306     void evaluateScriptInIsolatedWorld(unsigned worldId, JSObjectRef globalObject, JSStringRef script);
     306    void evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script);
    307307
    308308    void setPOSIXLocale(JSStringRef locale);

  • trunk/Tools/DumpRenderTree/wx/LayoutTestControllerWx.cpp

    r86644 r87469  
    456456}
    457457
    458 void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldId, JSObjectRef globalObject, JSStringRef script)
     458void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
    459459{
    460460
Note: See TracChangeset for help on using the changeset viewer.