Diff
Modified: trunk/Source/WebCore/ChangeLog (125716 => 125717)
--- trunk/Source/WebCore/ChangeLog 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/ChangeLog 2012-08-15 22:37:00 UTC (rev 125717)
@@ -1,3 +1,41 @@
+2012-08-15 Dan Carney <[email protected]>
+
+ Refactor away IsolatedWorld
+ https://bugs.webkit.org/show_bug.cgi?id=93971
+
+ Reviewed by Adam Barth.
+
+ Remove IsolatedWorld class as it was 1:1 with DOMWrapperWorld.
+ This paves the way towards a JSC-like use of DOMWrapperWorld.
+
+ No tests. No change in functionality.
+
+ * UseV8.cmake:
+ * WebCore.gypi:
+ * bindings/v8/DOMWrapperWorld.cpp:
+ (WebCore):
+ (WebCore::mainThreadNormalWorld):
+ * bindings/v8/DOMWrapperWorld.h:
+ (WebCore):
+ (DOMWrapperWorld):
+ (WebCore::DOMWrapperWorld::create):
+ (WebCore::DOMWrapperWorld::~DOMWrapperWorld):
+ (WebCore::DOMWrapperWorld::count):
+ (WebCore::DOMWrapperWorld::worldId):
+ (WebCore::DOMWrapperWorld::domDataStore):
+ (WebCore::DOMWrapperWorld::DOMWrapperWorld):
+ * bindings/v8/IsolatedWorld.cpp: Removed.
+ * bindings/v8/IsolatedWorld.h: Removed.
+ * bindings/v8/V8DOMWrapper.h:
+ (WebCore::V8DOMWrapper::getCachedWrapper):
+ * bindings/v8/V8IsolatedContext.cpp:
+ (WebCore::V8IsolatedContext::V8IsolatedContext):
+ (WebCore::V8IsolatedContext::destroy):
+ * bindings/v8/V8IsolatedContext.h:
+ (WebCore::V8IsolatedContext::getEntered):
+ (WebCore::V8IsolatedContext::world):
+ (V8IsolatedContext):
+
2012-08-15 Bruno de Oliveira Abinader <[email protected]>
[css3-text] Add CSS3 Text decoration compile flag
Modified: trunk/Source/WebCore/UseV8.cmake (125716 => 125717)
--- trunk/Source/WebCore/UseV8.cmake 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/UseV8.cmake 2012-08-15 22:37:00 UTC (rev 125717)
@@ -25,7 +25,6 @@
bindings/v8/DateExtension.cpp
bindings/v8/IDBBindingUtilities.cpp
bindings/v8/IDBCustomBindings.cpp
- bindings/v8/IsolatedWorld.cpp
bindings/v8/Dictionary.cpp
bindings/v8/PageScriptDebugServer.cpp
bindings/v8/RetainedDOMInfo.cpp
Modified: trunk/Source/WebCore/WebCore.gypi (125716 => 125717)
--- trunk/Source/WebCore/WebCore.gypi 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/WebCore.gypi 2012-08-15 22:37:00 UTC (rev 125717)
@@ -2174,8 +2174,6 @@
'bindings/v8/IDBBindingUtilities.h',
'bindings/v8/IDBCustomBindings.cpp',
'bindings/v8/IntrusiveDOMWrapperMap.h',
- 'bindings/v8/IsolatedWorld.cpp',
- 'bindings/v8/IsolatedWorld.h',
'bindings/v8/_javascript_CallFrame.cpp',
'bindings/v8/_javascript_CallFrame.h',
'bindings/v8/NPObjectWrapper.cpp',
Modified: trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.cpp (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.cpp 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.cpp 2012-08-15 22:37:00 UTC (rev 125717)
@@ -36,15 +36,12 @@
namespace WebCore {
-DOMWrapperWorld::DOMWrapperWorld()
-{
- // This class is pretty boring, huh?
-}
+int DOMWrapperWorld::isolatedWorldCount = 0;
DOMWrapperWorld* mainThreadNormalWorld()
{
ASSERT(isMainThread());
- DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, cachedNormalWorld, (DOMWrapperWorld::create()));
+ DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, cachedNormalWorld, (DOMWrapperWorld::create(DOMWrapperWorld::mainWorldId)));
return cachedNormalWorld.get();
}
Modified: trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h 2012-08-15 22:37:00 UTC (rev 125717)
@@ -31,6 +31,7 @@
#ifndef DOMWrapperWorld_h
#define DOMWrapperWorld_h
+#include "DOMDataStore.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -38,15 +39,35 @@
namespace WebCore {
// This class represent a collection of DOM wrappers for a specific world.
-// The base class is pretty boring because the wrappers are actually stored
-// statically in V8DOMMap and garbage collected by V8 itself.
class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
public:
- static PassRefPtr<DOMWrapperWorld> create() { return adoptRef(new DOMWrapperWorld()); }
- virtual ~DOMWrapperWorld() {}
+ static const int mainWorldId = -1;
+ static PassRefPtr<DOMWrapperWorld> create(int worldId = mainWorldId) { return adoptRef(new DOMWrapperWorld(worldId)); }
+ ~DOMWrapperWorld()
+ {
+ if (m_worldId != mainWorldId)
+ isolatedWorldCount--;
+ }
+ static int count() { return isolatedWorldCount; }
-protected:
- DOMWrapperWorld();
+ int worldId() const { return m_worldId; }
+ DOMDataStore* domDataStore() const { return m_domDataStore.getStore(); }
+
+private:
+
+ DOMWrapperWorld(int worldId): m_worldId(worldId)
+ {
+ if (m_worldId != mainWorldId)
+ isolatedWorldCount++;
+ }
+
+ // The backing store for the isolated world's DOM wrappers. This class
+ // doesn't have visibility into the wrappers. This handle simply helps
+ // manage their lifetime.
+ DOMDataStoreHandle m_domDataStore;
+
+ const int m_worldId;
+ static int isolatedWorldCount;
};
DOMWrapperWorld* mainThreadNormalWorld();
Deleted: trunk/Source/WebCore/bindings/v8/IsolatedWorld.cpp (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/IsolatedWorld.cpp 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/IsolatedWorld.cpp 2012-08-15 22:37:00 UTC (rev 125717)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "IsolatedWorld.h"
-
-namespace WebCore {
-
-int IsolatedWorld::isolatedWorldCount = 0;
-
-IsolatedWorld::IsolatedWorld(int id)
-{
- ++isolatedWorldCount;
- m_id = id;
-}
-
-IsolatedWorld::~IsolatedWorld()
-{
- --isolatedWorldCount;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/bindings/v8/IsolatedWorld.h (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/IsolatedWorld.h 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/IsolatedWorld.h 2012-08-15 22:37:00 UTC (rev 125717)
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IsolatedWorld_h
-#define IsolatedWorld_h
-
-#include "DOMWrapperWorld.h"
-#include "V8DOMMap.h"
-
-namespace WebCore {
-
-// An DOMWrapperWorld other than the thread's normal world.
-class IsolatedWorld : public DOMWrapperWorld {
-public:
- static PassRefPtr<IsolatedWorld> create(int id) { return adoptRef(new IsolatedWorld(id)); }
- static int count() { return isolatedWorldCount; }
-
- int id() const { return m_id; }
- DOMDataStore* domDataStore() const { return m_domDataStore.getStore(); }
-
-protected:
- explicit IsolatedWorld(int id);
- ~IsolatedWorld();
-
-private:
- int m_id;
-
- // The backing store for the isolated world's DOM wrappers. This class
- // doesn't have visibility into the wrappers. This handle simply helps
- // manage their lifetime.
- DOMDataStoreHandle m_domDataStore;
-
- static int isolatedWorldCount;
-};
-
-} // namespace WebCore
-
-#endif // IsolatedWorld_h
Modified: trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h 2012-08-15 22:37:00 UTC (rev 125717)
@@ -33,7 +33,6 @@
#include "DOMDataStore.h"
#include "Event.h"
-#include "IsolatedWorld.h"
#include "Node.h"
#include "NodeFilter.h"
#include "PlatformString.h"
@@ -130,7 +129,7 @@
static v8::Handle<v8::Object> getCachedWrapper(Node* node)
{
ASSERT(isMainThread());
- if (LIKELY(!IsolatedWorld::count())) {
+ if (LIKELY(!DOMWrapperWorld::count())) {
v8::Persistent<v8::Object>* wrapper = node->wrapper();
if (LIKELY(!!wrapper))
return *wrapper;
Modified: trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/V8IsolatedContext.cpp 2012-08-15 22:37:00 UTC (rev 125717)
@@ -66,7 +66,7 @@
}
V8IsolatedContext::V8IsolatedContext(V8Proxy* proxy, int extensionGroup, int worldId)
- : m_world(IsolatedWorld::create(worldId)),
+ : m_world(DOMWrapperWorld::create(worldId)),
m_frame(proxy->frame())
{
v8::HandleScope scope;
@@ -75,7 +75,7 @@
return;
// FIXME: We should be creating a new V8DOMWindowShell here instead of riping out the context.
- m_context = SharedPersistent<v8::Context>::create(proxy->windowShell()->createNewContext(v8::Handle<v8::Object>(), extensionGroup, m_world->id()));
+ m_context = SharedPersistent<v8::Context>::create(proxy->windowShell()->createNewContext(v8::Handle<v8::Object>(), extensionGroup, m_world->worldId()));
if (m_context->get().IsEmpty())
return;
@@ -101,13 +101,13 @@
// changes.
m_context->get()->UseDefaultSecurityToken();
- m_frame->loader()->client()->didCreateScriptContext(context(), extensionGroup, m_world->id());
+ m_frame->loader()->client()->didCreateScriptContext(context(), extensionGroup, m_world->worldId());
}
void V8IsolatedContext::destroy()
{
m_perContextData.clear();
- m_frame->loader()->client()->willReleaseScriptContext(context(), m_world->id());
+ m_frame->loader()->client()->willReleaseScriptContext(context(), m_world->worldId());
m_context->get().MakeWeak(this, &contextWeakReferenceCallback);
m_frame = 0;
}
Modified: trunk/Source/WebCore/bindings/v8/V8IsolatedContext.h (125716 => 125717)
--- trunk/Source/WebCore/bindings/v8/V8IsolatedContext.h 2012-08-15 22:31:26 UTC (rev 125716)
+++ trunk/Source/WebCore/bindings/v8/V8IsolatedContext.h 2012-08-15 22:37:00 UTC (rev 125717)
@@ -31,7 +31,7 @@
#ifndef V8IsolatedContext_h
#define V8IsolatedContext_h
-#include "IsolatedWorld.h"
+#include "DOMWrapperWorld.h"
#include "ScriptSourceCode.h" // for WebCore::ScriptSourceCode
#include "SharedPersistent.h"
#include "V8Utilities.h"
@@ -82,7 +82,7 @@
// V8 team to add a real property to v8::Context for isolated worlds.
// Until then, we optimize the common case of not having any isolated
// worlds at all.
- if (!IsolatedWorld::count())
+ if (!DOMWrapperWorld::count())
return 0;
if (!v8::Context::InContext())
return 0;
@@ -92,7 +92,7 @@
v8::Handle<v8::Context> context() { return m_context->get(); }
PassRefPtr<SharedPersistent<v8::Context> > sharedContext() { return m_context; }
- IsolatedWorld* world() const { return m_world.get(); }
+ DOMWrapperWorld* world() const { return m_world.get(); }
SecurityOrigin* securityOrigin() const { return m_securityOrigin.get(); }
void setSecurityOrigin(PassRefPtr<SecurityOrigin>);
@@ -115,7 +115,7 @@
// long as |m_context| has not been garbage collected.
RefPtr<SharedPersistent<v8::Context> > m_context;
- RefPtr<IsolatedWorld> m_world;
+ RefPtr<DOMWrapperWorld> m_world;
RefPtr<SecurityOrigin> m_securityOrigin;
