Changeset 109064 in webkit


Ignore:
Timestamp:
Feb 27, 2012 7:31:02 PM (12 years ago)
Author:
koz@chromium.org
Message:

[chromium] Plumb extensionGroup into didCreateScriptContext().
​https://bugs.webkit.org/show_bug.cgi?id=79072

Reviewed by Darin Fisher.

Source/WebCore:

  • bindings/v8/V8DOMWindowShell.cpp:

(WebCore::V8DOMWindowShell::initContextIfNeeded):

  • bindings/v8/V8IsolatedContext.cpp:

(WebCore::V8IsolatedContext::V8IsolatedContext):

  • loader/EmptyClients.h:

(WebCore::EmptyFrameLoaderClient::didCreateScriptContext):

  • loader/FrameLoaderClient.h:

(FrameLoaderClient):

Source/WebKit/chromium:

  • public/WebFrameClient.h:

(WebKit::WebFrameClient::didCreateScriptContext):

  • src/FrameLoaderClientImpl.cpp:

(WebKit::FrameLoaderClientImpl::didCreateScriptContext):

  • src/FrameLoaderClientImpl.h:

(FrameLoaderClientImpl):

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109062 r109064  
     12012-02-27  James Kozianski  <koz@chromium.org>
     2
     3        [chromium] Plumb extensionGroup into didCreateScriptContext().
     4        https://bugs.webkit.org/show_bug.cgi?id=79072
     5
     6        Reviewed by Darin Fisher.
     7
     8        * bindings/v8/V8DOMWindowShell.cpp:
     9        (WebCore::V8DOMWindowShell::initContextIfNeeded):
     10        * bindings/v8/V8IsolatedContext.cpp:
     11        (WebCore::V8IsolatedContext::V8IsolatedContext):
     12        * loader/EmptyClients.h:
     13        (WebCore::EmptyFrameLoaderClient::didCreateScriptContext):
     14        * loader/FrameLoaderClient.h:
     15        (FrameLoaderClient):
     16
    1172012-02-27  Huang Dongsung  <luxtella@company100.net>
    218

  • trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

    r108780 r109064  
    340340    setSecurityToken();
    341341
    342     m_frame->loader()->client()->didCreateScriptContext(m_context, 0);
     342    m_frame->loader()->client()->didCreateScriptContext(m_context, 0, 0);
    343343
    344344    // FIXME: This is wrong. We should actually do this for the proper world once

  • trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp

    r103195 r109064  
    7676    m_context->get()->UseDefaultSecurityToken();
    7777
    78     m_frame->loader()->client()->didCreateScriptContext(context(), m_world->id());
     78    m_frame->loader()->client()->didCreateScriptContext(context(), extensionGroup, m_world->id());
    7979}
    8080

  • trunk/Source/WebCore/loader/EmptyClients.h

    r108957 r109064  
    395395
    396396#if USE(V8)
    397     virtual void didCreateScriptContext(v8::Handle<v8::Context>, int worldId) { }
     397    virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId) { }
    398398    virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) { }
    399399    virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) { return false; }

  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r106492 r109064  
    281281
    282282#if USE(V8)
    283         virtual void didCreateScriptContext(v8::Handle<v8::Context>, int worldId) = 0;
     283        virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId) = 0;
    284284        virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) = 0;
    285285        virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) = 0;

  • trunk/Source/WebKit/chromium/ChangeLog

    r109043 r109064  
     12012-02-27  James Kozianski  <koz@chromium.org>
     2
     3        [chromium] Plumb extensionGroup into didCreateScriptContext().
     4        https://bugs.webkit.org/show_bug.cgi?id=79072
     5
     6        Reviewed by Darin Fisher.
     7
     8        * public/WebFrameClient.h:
     9        (WebKit::WebFrameClient::didCreateScriptContext):
     10        * src/FrameLoaderClientImpl.cpp:
     11        (WebKit::FrameLoaderClientImpl::didCreateScriptContext):
     12        * src/FrameLoaderClientImpl.h:
     13        (FrameLoaderClientImpl):
     14
    1152012-02-27  Adrienne Walker  <enne@google.com>
    216

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

    r105469 r109064  
    298298    // This is similar to didClearWindowObject but only called once per
    299299    // frame context.
    300     virtual void didCreateScriptContext(WebFrame*, v8::Handle<v8::Context>, int worldId) { }
     300    virtual void didCreateScriptContext(WebFrame*, v8::Handle<v8::Context>, int extensionGroup, int worldId) { }
    301301
    302302    // WebKit is about to release its reference to a v8 context for a frame.

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

    r105964 r109064  
    146146
    147147#if USE(V8)
    148 void FrameLoaderClientImpl::didCreateScriptContext(v8::Handle<v8::Context> context, int worldId)
    149 {
    150     if (m_webFrame->client())
    151         m_webFrame->client()->didCreateScriptContext(m_webFrame, context, worldId);
     148void FrameLoaderClientImpl::didCreateScriptContext(v8::Handle<v8::Context> context, int extensionGroup, int worldId)
     149{
     150    if (m_webFrame->client())
     151        m_webFrame->client()->didCreateScriptContext(m_webFrame, context, extensionGroup, worldId);
    152152}
    153153

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

    r105469 r109064  
    6363
    6464#if USE(V8)
    65     virtual void didCreateScriptContext(v8::Handle<v8::Context>, int worldId);
     65    virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId);
    6666    virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId);
    6767#endif
Note: See TracChangeset for help on using the changeset viewer.