WebCore/ChangeLog

112010-01-05 Adam Barth <abarth@webkit.org>

22

        Reviewed by NOBODY (OOPS!).

        [v8] Move V8DOMWindowShell to ScriptController

        https://bugs.webkit.org/show_bug.cgi?id=33232

        This patch moves V8DOMWindow shell to ScriptController, where the

        window shells live in JSC land.  The next step will be to allow for

        more than one window shell per script controller.

        * bindings/v8/ScriptController.cpp:

        (WebCore::ScriptController::ScriptController):

        (WebCore::ScriptController::~ScriptController):

        (WebCore::ScriptController::updateSecurityOrigin):

        (WebCore::ScriptController::evaluateInIsolatedWorld):

        (WebCore::ScriptController::haveInterpreter):

        (WebCore::ScriptController::mainWorldWindowShell):

        (WebCore::ScriptController::clearWindowShell):

        (WebCore::ScriptController::clearForClose):

        (WebCore::ScriptController::destroyWindowShell):

        (WebCore::ScriptController::updateDocument):

        * bindings/v8/ScriptController.h:

        * bindings/v8/V8DOMWindowShell.cpp:

        (WebCore::V8DOMWindowShell::~V8DOMWindowShell):

        * bindings/v8/V8DOMWindowShell.h:

        (WebCore::V8DOMWindowShell::localHandleForContext):

        * bindings/v8/V8DOMWrapper.cpp:

        (WebCore::V8DOMWrapper::instantiateV8Object):

        (WebCore::V8DOMWrapper::convertDocumentToV8Object):

        (WebCore::V8DOMWrapper::convertNewNodeToV8Object):

        * bindings/v8/V8IsolatedContext.cpp:

        (WebCore::V8IsolatedContext::V8IsolatedContext):

        * bindings/v8/V8Proxy.cpp:

        (WebCore::V8Proxy::V8Proxy):

        (WebCore::V8Proxy::~V8Proxy):

        (WebCore::V8Proxy::handleOutOfMemory):

        (WebCore::V8Proxy::evaluateInIsolatedWorld):

        (WebCore::V8Proxy::setInjectedScriptContextDebugId):

        (WebCore::V8Proxy::context):

        (WebCore::V8Proxy::mainWorldContext):

        (WebCore::V8Proxy::currentContext):

        (WebCore::V8Proxy::setContextDebugId):

        * bindings/v8/V8Proxy.h:

        * bindings/v8/WorldContextHandle.cpp:

        (WebCore::WorldContextHandle::adjustedContext):

2010-01-05  Adam Barth  <abarth@webkit.org>

        Rubber stamped by Dimitri Glazkov.

        Fix namespace indent for ScriptController.

WebCore/bindings/v8/ScriptController.cpp

@@ScriptController::ScriptController(Frame* frame)

    , m_processingTimerCallback(false)

    , m_paused(false)

    , m_proxy(new V8Proxy(frame))

109 , m_windowShell(V8DOMWindowShell::create(frame))

#if ENABLE(NETSCAPE_PLUGIN_API)

    , m_windowScriptNPObject(0)

#endif

@@ScriptController::ScriptController(Frame* frame)

ScriptController::~ScriptController()

{

    m_proxy->disconnectFrame();

120 m_windowShell.clear();

}

void ScriptController::clearScriptObjects()

@@void ScriptController::clearScriptObjects()

void ScriptController::updateSecurityOrigin()

{

143 m_~~proxy->~~windowShell()->updateSecurityOrigin();

145 m_windowShell->updateSecurityOrigin();

}

void ScriptController::updatePlatformScriptObjects()

@@bool ScriptController::anyPageIsProcessingUserGesture() const

void ScriptController::evaluateInIsolatedWorld(unsigned worldID, const Vector<ScriptSourceCode>& sources)

{

210 // FIXME: This will need to get reorganized once we have a windowShell for the isolated world.

211 m_windowShell->initContextIfNeeded();

    m_proxy->evaluateInIsolatedWorld(worldID, sources, 0);

}

@@void ScriptController::lowMemoryNotification()

bool ScriptController::haveInterpreter() const

{

294 return m_~~proxy->~~windowShell()->isContextInitialized();

298 return m_windowShell->isContextInitialized();

}

bool ScriptController::isEnabled() const

@@NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement

    return npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(v8plugin), window);

}

V8DOMWindowShell* ScriptController::mainWorldWindowShell() const

{

    m_windowShell->initContextIfNeeded();

    return m_windowShell.get();

}

void ScriptController::clearWindowShell()

{

    m_mainWorldScriptState.clear();

451 m_proxy->resetIsolatedWorlds();

442452

443453 // V8 binding expects ScriptController::clearWindowShell only be called

444 // when a frame is loading a new page. V8Pr~~oxy~~::clearForNavigation

454 // when a frame is loading a new page. V8DOMWindowShell::clearForNavigation

445455 // creates a new context for the new page.

446 m_proxy->clearForNavigation();

    m_windowShell->clearForNavigation();

}

void ScriptController::clearForClose()

{

    m_windowShell->clearForClose();

}

void ScriptController::destroyWindowShell()

{

    m_windowShell->clearForClose();

    m_windowShell->destroyGlobal();

}

void ScriptController::attachDebugger(void*)

@@void ScriptController::attachDebugger(void*)

void ScriptController::updateDocument()

{

456 m_~~proxy->~~windowShell()->updateDocument();

477 m_windowShell->updateDocument();

}

} // namespace WebCore

WebCore/bindings/v8/ScriptController.h

@@public:

    // or this accessor should be made JSProxy*

    V8Proxy* proxy() { return m_proxy.get(); }

66 V8DOMWindowShell* mainWorldWindowShell() const;

67

    ScriptValue executeScript(const ScriptSourceCode&);

    ScriptValue executeScript(const String& script, bool forceUserGesture = false);

@@public:

    void clearWindowShell();

    void updateDocument();

    void clearForClose();

    // This is very destructive (e.g., out of memory).

    void destroyWindowShell();

    void updateSecurityOrigin();

    void clearScriptObjects();

    void updatePlatformScriptObjects();

@@private:

    bool m_processingTimerCallback;

    bool m_paused;

192 // FIXME: V8Proxy should eventually be removed.

185193 OwnPtr<V8Proxy> m_proxy;

    // For the moment, we have one of these.  Soon we will have one per DOMWrapperWorld.

    RefPtr<V8DOMWindowShell> m_windowShell;

    typedef HashMap<Widget*, NPObject*> PluginObjectMap;

    // A mapping between Widgets and their corresponding script object.

WebCore/bindings/v8/V8DOMWindowShell.cpp

@@V8DOMWindowShell::V8DOMWindowShell(Frame* frame)

{

}

V8DOMWindowShell::~V8DOMWindowShell()

{

    clearForClose();

    destroyGlobal();

}

bool V8DOMWindowShell::isContextInitialized()

{

    // m_context, m_global, and m_wrapperBoilerplates should

WebCore/bindings/v8/V8DOMWindowShell.h

@@class V8DOMWindowShell : public RefCounted<V8DOMWindowShell> {

public:

    static PassRefPtr<V8DOMWindowShell> create(Frame*);

49 ~V8DOMWindowShell();

50

4951 v8::Handle<v8::Context> context() const { return m_context; }

5052

    // This method is slower than |context()|, but sometimes we need local handles.

    v8::Local<v8::Context> localHandleForContext() const { return v8::Local<v8::Context>::New(m_context); }

    // Update document object of the frame.

    void updateDocument();

@@public:

    void clearForNavigation();

    void clearForClose();

68

    void destroyGlobal();

    static v8::Handle<v8::Value> getHiddenObjectPrototype(v8::Handle<v8::Context>);

WebCore/bindings/v8/V8DOMWrapper.cpp

@@v8::Local<v8::Object> V8DOMWrapper::instantiateV8Object(V8Proxy* proxy, V8ClassI

    v8::Local<v8::Object> instance;

    if (proxy)

        // FIXME: Fix this to work properly with isolated worlds (see above).

805 instance = proxy->windowShell()->createWrapperFromCache(descriptorType);

805 instance = proxy->frame()->script()->mainWorldWindowShell()->createWrapperFromCache(descriptorType);

    else {

        v8::Local<v8::Function> function = getTemplate(descriptorType)->GetFunction();

        instance = SafeAllocation::newInstance(function);

@@v8::Handle<v8::Value> V8DOMWrapper::convertDocumentToV8Object(Document* document

    // instantiate a document wrapper.  Therefore, we get the proxy before

    // checking if the node already has a wrapper.

    V8Proxy* proxy = V8Proxy::retrieve(document->frame());

1207 if (proxy)

1208 proxy->windowShell()->initContextIfNeeded();

    if (proxy) {

        // This code looks wacky:

        // 1) The test for |proxy| above is really a test whether JavaScript

        //    is enabled in this frame.  I have no idea if that's needed.

        // 2) Calling initContextIfNeeded here is redundant becase just

        //    grabbing mainWorldWindowShell() already calls initContextIfNeeded.

        // FIXME: I be we can clean this up a bit!

        proxy->frame()->script()->mainWorldWindowShell()->initContextIfNeeded();

    }

    DOMWrapperMap<Node>& domNodeMap = getDOMNodeMap();

    v8::Handle<v8::Object> wrapper = domNodeMap.get(document);

@@v8::Handle<v8::Value> V8DOMWrapper::convertNewNodeToV8Object(Node* node, V8Proxy

    domNodeMap.set(node, v8::Persistent<v8::Object>::New(result));

    if (isDocument) {

1297 if (proxy)

1298 proxy->windowShell()->updateDocumentWrapper(result);

        if (proxy) {

            // FIXME: Don't we need to do this for every world?

            proxy->frame()->script()->mainWorldWindowShell()->updateDocumentWrapper(result);

        }

        if (type == V8ClassIndex::HTMLDOCUMENT) {

            // Create marker object and insert it in two internal fields.

WebCore/bindings/v8/V8IsolatedContext.cpp

@@void V8IsolatedContext::contextWeakReferenceCallback(v8::Persistent<v8::Value> o

V8IsolatedContext::V8IsolatedContext(V8Proxy* proxy, int extensionGroup)

    : m_world(IsolatedWorld::create())

{

    // FIXME: None of this code belongs here! Basically, ScriptController

    // should create a new DOMWrapperWorld and a new windowShell and then

    // evaluate the script.

    V8DOMWindowShell* mainWorldWindowShell = proxy->frame()->script()->mainWorldWindowShell();

5662 v8::HandleScope scope;

5763 // FIXME: We should be creating a new V8DOMWindowShell here instead of riping out the context.

58 m_context = SharedPersistent<v8::Context>::create(p~~roxy->w~~indowShell()->createNewContext(v8::Handle<v8::Object>(), extensionGroup));

64 m_context = SharedPersistent<v8::Context>::create(mainWorldWindowShell->createNewContext(v8::Handle<v8::Object>(), extensionGroup));

    if (m_context->get().IsEmpty())

        return;

@@V8IsolatedContext::V8IsolatedContext(V8Proxy* proxy, int extensionGroup)

    V8DOMWindowShell::installHiddenObjectPrototype(m_context->get());

    // FIXME: This will go away once we have a windowShell for the isolated world.

69 p~~roxy->w~~indowShell()->installDOMWindow(m_context->get(), proxy->frame()->domWindow());

75 mainWorldWindowShell->installDOMWindow(m_context->get(), proxy->frame()->domWindow());

    // Using the default security token means that the canAccess is always

    // called, which is slow.

WebCore/bindings/v8/V8Proxy.cpp

@@static void handleFatalErrorInV8()

V8Proxy::V8Proxy(Frame* frame)

    : m_frame(frame)

216 , m_windowShell(V8DOMWindowShell::create(frame))

    , m_inlineCode(false)

    , m_timerCallback(false)

    , m_recursion(0)

@@V8Proxy::V8Proxy(Frame* frame)

V8Proxy::~V8Proxy()

{

225 clearForClose();

226 windowShell()->destroyGlobal();

224 resetIsolatedWorlds();

}

v8::Handle<v8::Script> V8Proxy::compileScript(v8::Handle<v8::String> code, const String& fileName, int baseLine)

@@bool V8Proxy::handleOutOfMemory()

    // Warning, error, disable JS for this frame?

    Frame* frame = V8Proxy::retrieveFrame(context);

    V8Proxy* proxy = V8Proxy::retrieve(frame);

    if (proxy) {

        // Clean m_context, and event handlers.

        proxy->clearForClose();

        proxy->windowShell()->destroyGlobal();

    }

247 frame->script()->destroyWindowShell();

    ChromiumBridge::notifyJSOutOfMemory(frame);

@@bool V8Proxy::handleOutOfMemory()

void V8Proxy::evaluateInIsolatedWorld(int worldID, const Vector<ScriptSourceCode>& sources, int extensionGroup)

{

    // FIXME: This will need to get reorganized once we have a windowShell for the isolated world.

    windowShell()->initContextIfNeeded();

    v8::HandleScope handleScope;

    V8IsolatedContext* isolatedContext = 0;

@@bool V8Proxy::setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetCont

{

    // Setup context id for JS debugger.

    v8::Context::Scope contextScope(targetContext);

317 v8::Handle<v8::Context> context = windowShell()->context();

306 v8::Handle<v8::Context> context = m_frame->script()->mainWorldWindowShell()->localHandleForContext();

    if (context.IsEmpty())

        return false;

    int debugId = contextDebugId(context);

@@void V8Proxy::resetIsolatedWorlds()

    m_isolatedWorlds.clear();

}

void V8Proxy::clearForClose()

{

    resetIsolatedWorlds();

    windowShell()->clearForClose();

}

void V8Proxy::clearForNavigation()

{

    resetIsolatedWorlds();

    windowShell()->clearForNavigation();

}

void V8Proxy::setDOMException(int exceptionCode)

{

    if (exceptionCode <= 0)

@@v8::Handle<v8::Value> V8Proxy::throwError(ErrorType type, const char* message)

v8::Local<v8::Context> V8Proxy::context(Frame* frame)

{

635 // FIXME: Move this function to ScriptController.

    v8::Local<v8::Context> context = V8Proxy::mainWorldContext(frame);

    if (context.IsEmpty())

        return v8::Local<v8::Context>();

@@v8::Local<v8::Context> V8Proxy::context(Frame* frame)

v8::Local<v8::Context> V8Proxy::context()

{

651 // FIXME: Move this function to ScriptController.

    if (V8IsolatedContext* isolatedContext = V8IsolatedContext::getEntered()) {

        RefPtr<SharedPersistent<v8::Context> > context = isolatedContext->sharedContext();

        if (m_frame != V8Proxy::retrieveFrame(context->get()))

            return v8::Local<v8::Context>();

        return v8::Local<v8::Context>::New(context->get());

    }

    return mainWorldContext();

}

v8::Local<v8::Context> V8Proxy::mainWorldContext()

{

    windowShell()->initContextIfNeeded();

    return v8::Local<v8::Context>::New(windowShell()->context());

658 return m_frame->script()->mainWorldWindowShell()->localHandleForContext();

}

v8::Local<v8::Context> V8Proxy::mainWorldContext(Frame* frame)

{

690 ~~V8Proxy* proxy = retrieve(frame);~~

691 if (!~~proxy~~)

663 // FIXME: Move this function to ScriptController.

664 if (!frame->script()->isEnabled())

692665 return v8::Local<v8::Context>();

693666

694 return ~~proxy~~->mainWorldContext();

667 return frame->script()->mainWorldWindowShell()->localHandleForContext();

}

v8::Local<v8::Context> V8Proxy::currentContext()

{

672 // FIXME: Why does this function exist?

    return v8::Context::GetCurrent();

}

@@void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup)

bool V8Proxy::setContextDebugId(int debugId)

{

    ASSERT(debugId > 0);

833 v8::H~~and~~le<v8::Context> context = windowShell()->context();

807 v8::Local<v8::Context> context = m_frame->script()->mainWorldWindowShell()->localHandleForContext();

    if (context.IsEmpty())

        return false;

    v8::HandleScope scope;

WebCore/bindings/v8/V8Proxy.h

@@namespace WebCore {

        Frame* frame() { return m_frame; }

        void clearForNavigation();

        void clearForClose();

        // FIXME: Need comment. User Gesture related.

        bool inlineCode() const { return m_inlineCode; }

        void setInlineCode(bool value) { m_inlineCode = value; }

@@namespace WebCore {

        static bool sourceName(String& result);

        v8::Local<v8::Context> context();

        v8::Local<v8::Context> mainWorldContext();

        // FIXME: This should eventually take DOMWrapperWorld argument!

        V8DOMWindowShell* windowShell() const { return m_windowShell.get(); }

        bool setContextDebugId(int id);

        static int contextDebugId(v8::Handle<v8::Context>);

@@namespace WebCore {

        // Report an unsafe attempt to access the given frame on the console.

        static void reportUnsafeAccessTo(Frame* target, DelayReporting delay);

        // FIXME: This should move to ScriptController.

        void resetIsolatedWorlds();

    private:

        // If m_recursionCount is 0, let LocalStorage know so we can release

        // the storage mutex.

        void releaseStorageMutex();

343 void resetIsolatedWorlds();

344

        // Returns false when we're out of memory in V8.

        bool setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetContext);

@@namespace WebCore {

        Frame* m_frame;

        // For the moment, we have one of these.  Soon we will have one per DOMWrapperWorld.

        RefPtr<V8DOMWindowShell> m_windowShell;

        // Utility context holding JavaScript functions used internally.

        static v8::Persistent<v8::Context> m_utilityContext;

WebCore/bindings/v8/WorldContextHandle.cpp

#include "config.h"

#include "WorldContextHandle.h"

34#include "Frame.h"

#include "V8IsolatedContext.h"

namespace WebCore {

@@WorldContextHandle::WorldContextHandle(WorldToUse worldToUse)

v8::Local<v8::Context> WorldContextHandle::adjustedContext(V8Proxy* proxy) const

{

    if (m_worldToUse == UseMainWorld)

51 return proxy->mainWorldContext();

52 return proxy->frame()->script()->mainWorldWindowShell()->localHandleForContext();

    if (!m_context || m_context->get().IsEmpty())

        return proxy->context();

    return v8::Local<v8::Context>::New(m_context->get());

WebKit/chromium/ChangeLog

2010-01-05  Adam Barth  <abarth@webkit.org>

        Reviewed by NOBODY (OOPS!).

        [v8] Move V8DOMWindowShell to ScriptController

        https://bugs.webkit.org/show_bug.cgi?id=33232

        Update FrameLoaderClientImpl.cpp to call clearForClose on

        ScriptController instead of on V8Proxy.

        * src/FrameLoaderClientImpl.cpp:

        (WebKit::FrameLoaderClientImpl::detachedFromParent3):

2010-01-04  Maciej Stachowiak  <mjs@apple.com>

        Reviewed by Darin Fisher.

WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@void FrameLoaderClientImpl::detachedFromParent3()

    // will cause a crash.  If you remove/modify this, just ensure that you can

    // go to a page and then navigate to a new page without getting any asserts

    // or crashes.

218 m_webFrame->frame()->script()->~~proxy()->~~clearForClose();

219

218 m_webFrame->frame()->script()->clearForClose();

219

    // Stop communicating with the WebFrameClient at this point since we are no

    // longer associated with the Page.

    m_webFrame->dropClient();