Title: [132458] trunk/Source/WebCore
- Revision
- 132458
- Author
- [email protected]
- Date
- 2012-10-25 01:15:03 -0700 (Thu, 25 Oct 2012)
Log Message
[V8] DOMDataStoreHandle serves no purpose and can be removed
https://bugs.webkit.org/show_bug.cgi?id=100333
Reviewed by Eric Seidel.
After https://bugs.webkit.org/show_bug.cgi?id=100316,
DOMDataStoreHandle is just a glorified OwnPtr.
* bindings/v8/DOMWrapperWorld.h:
(WebCore::DOMWrapperWorld::domDataStore):
(DOMWrapperWorld):
(WebCore::DOMWrapperWorld::DOMWrapperWorld):
* bindings/v8/V8DOMMap.cpp:
* bindings/v8/V8DOMMap.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132457 => 132458)
--- trunk/Source/WebCore/ChangeLog 2012-10-25 07:44:22 UTC (rev 132457)
+++ trunk/Source/WebCore/ChangeLog 2012-10-25 08:15:03 UTC (rev 132458)
@@ -1,3 +1,20 @@
+2012-10-25 Adam Barth <[email protected]>
+
+ [V8] DOMDataStoreHandle serves no purpose and can be removed
+ https://bugs.webkit.org/show_bug.cgi?id=100333
+
+ Reviewed by Eric Seidel.
+
+ After https://bugs.webkit.org/show_bug.cgi?id=100316,
+ DOMDataStoreHandle is just a glorified OwnPtr.
+
+ * bindings/v8/DOMWrapperWorld.h:
+ (WebCore::DOMWrapperWorld::domDataStore):
+ (DOMWrapperWorld):
+ (WebCore::DOMWrapperWorld::DOMWrapperWorld):
+ * bindings/v8/V8DOMMap.cpp:
+ * bindings/v8/V8DOMMap.h:
+
2012-10-25 Elliott Sprehn <[email protected]>
Remove dead Node::isBlockFlowOrBlockTable
Modified: trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h (132457 => 132458)
--- trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h 2012-10-25 07:44:22 UTC (rev 132457)
+++ trunk/Source/WebCore/bindings/v8/DOMWrapperWorld.h 2012-10-25 08:15:03 UTC (rev 132458)
@@ -31,6 +31,7 @@
#ifndef DOMWrapperWorld_h
#define DOMWrapperWorld_h
+#include "DOMDataStore.h"
#include "SecurityOrigin.h"
#include "V8DOMMap.h"
#include <wtf/PassRefPtr.h>
@@ -67,7 +68,7 @@
DOMDataStore* domDataStore() const
{
ASSERT(m_worldId != uninitializedWorldId);
- return m_domDataStore.getStore();
+ return m_domDataStore.get();
}
void deref()
{
@@ -79,19 +80,18 @@
static int isolatedWorldCount;
static PassRefPtr<DOMWrapperWorld> createMainWorld();
static void deallocate(DOMWrapperWorld*);
+
DOMWrapperWorld(int worldId, int extensionGroup)
: m_worldId(worldId)
, m_extensionGroup(extensionGroup)
- , m_domDataStore(worldId != uninitializedWorldId)
{
+ if (worldId != uninitializedWorldId)
+ m_domDataStore = adoptPtr(new DOMDataStore(DOMDataStore::IsolatedWorld));
}
const int m_worldId;
const int m_extensionGroup;
- // 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;
+ OwnPtr<DOMDataStore> m_domDataStore;
friend DOMWrapperWorld* mainThreadNormalWorld();
};
Modified: trunk/Source/WebCore/bindings/v8/V8DOMMap.cpp (132457 => 132458)
--- trunk/Source/WebCore/bindings/v8/V8DOMMap.cpp 2012-10-25 07:44:22 UTC (rev 132457)
+++ trunk/Source/WebCore/bindings/v8/V8DOMMap.cpp 2012-10-25 08:15:03 UTC (rev 132458)
@@ -38,16 +38,6 @@
namespace WebCore {
-DOMDataStoreHandle::DOMDataStoreHandle(bool initialize)
-{
- if (initialize)
- m_store = adoptPtr(new DOMDataStore(DOMDataStore::IsolatedWorld));
-}
-
-DOMDataStoreHandle::~DOMDataStoreHandle()
-{
-}
-
NodeWrapperVisitor::~NodeWrapperVisitor()
{
}
Modified: trunk/Source/WebCore/bindings/v8/V8DOMMap.h (132457 => 132458)
--- trunk/Source/WebCore/bindings/v8/V8DOMMap.h 2012-10-25 07:44:22 UTC (rev 132457)
+++ trunk/Source/WebCore/bindings/v8/V8DOMMap.h 2012-10-25 08:15:03 UTC (rev 132458)
@@ -42,21 +42,6 @@
namespace WebCore {
- class DOMDataStore;
-
- // A utility class to manage the lifetime of set of DOM wrappers.
- class DOMDataStoreHandle {
- public:
- explicit DOMDataStoreHandle(bool initialize);
- ~DOMDataStoreHandle();
-
- DOMDataStore* getStore() const { return m_store.get(); }
-
- private:
- OwnPtr<DOMDataStore> m_store;
- };
-
- // A map from DOM node to its JS wrapper.
DOMWrapperMap<Node>& getDOMNodeMap(v8::Isolate* = 0);
DOMWrapperMap<Node>& getActiveDOMNodeMap(v8::Isolate* = 0);
void visitActiveDOMNodes(DOMWrapperVisitor<Node>*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
