Title: [101419] trunk/Source/WebCore
- Revision
- 101419
- Author
- wei...@apple.com
- Date
- 2011-11-29 13:47:11 -0800 (Tue, 29 Nov 2011)
Log Message
Remove unused JSDOMWrapperOwner
https://bugs.webkit.org/show_bug.cgi?id=73357
Reviewed by Adam Barth.
* bindings/js/DOMWrapperWorld.cpp:
(WebCore::DOMWrapperWorld::DOMWrapperWorld):
* bindings/js/DOMWrapperWorld.h:
(WebCore::DOMWrapperWorld::globalData):
Remove JSDOMWrapperOwner. It is unused.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101418 => 101419)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 21:33:55 UTC (rev 101418)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 21:47:11 UTC (rev 101419)
@@ -1,3 +1,16 @@
+2011-11-29 Sam Weinig <s...@webkit.org>
+
+ Remove unused JSDOMWrapperOwner
+ https://bugs.webkit.org/show_bug.cgi?id=73357
+
+ Reviewed by Adam Barth.
+
+ * bindings/js/DOMWrapperWorld.cpp:
+ (WebCore::DOMWrapperWorld::DOMWrapperWorld):
+ * bindings/js/DOMWrapperWorld.h:
+ (WebCore::DOMWrapperWorld::globalData):
+ Remove JSDOMWrapperOwner. It is unused.
+
2011-11-29 Anders Carlsson <ander...@apple.com>
Use contentsToRootView when converting the mouse coordinates for the context menu key event
Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp (101418 => 101419)
--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2011-11-29 21:33:55 UTC (rev 101418)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2011-11-29 21:47:11 UTC (rev 101419)
@@ -30,13 +30,6 @@
namespace WebCore {
-void JSDOMWrapperOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
-{
- JSDOMWrapper* wrapper = static_cast<JSDOMWrapper*>(handle.get().asCell());
- void* domObject = context;
- uncacheWrapper(m_world, domObject, wrapper);
-}
-
void JSStringOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
{
JSString* jsString = static_cast<JSString*>(handle.get().asCell());
@@ -48,7 +41,6 @@
DOMWrapperWorld::DOMWrapperWorld(JSC::JSGlobalData* globalData, bool isNormal)
: m_globalData(globalData)
, m_isNormal(isNormal)
- , m_defaultWrapperOwner(this)
, m_stringWrapperOwner(this)
{
JSGlobalData::ClientData* clientData = m_globalData->clientData;
Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h (101418 => 101419)
--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2011-11-29 21:33:55 UTC (rev 101418)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h 2011-11-29 21:47:11 UTC (rev 101419)
@@ -36,20 +36,6 @@
typedef HashMap<void*, JSC::Weak<JSDOMWrapper> > DOMObjectWrapperMap;
typedef HashMap<StringImpl*, JSC::Weak<JSC::JSString> > JSStringCache;
-class JSDOMWrapperOwner : public JSC::WeakHandleOwner {
-public:
- JSDOMWrapperOwner(DOMWrapperWorld*);
- virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
-
-private:
- DOMWrapperWorld* m_world;
-};
-
-inline JSDOMWrapperOwner::JSDOMWrapperOwner(DOMWrapperWorld* world)
- : m_world(world)
-{
-}
-
class JSStringOwner : public JSC::WeakHandleOwner {
public:
JSStringOwner(DOMWrapperWorld*);
@@ -86,7 +72,6 @@
bool isNormal() const { return m_isNormal; }
JSC::JSGlobalData* globalData() const { return m_globalData; }
- JSDOMWrapperOwner* defaultWrapperOwner() { return &m_defaultWrapperOwner; }
JSStringOwner* stringWrapperOwner() { return &m_stringWrapperOwner; }
protected:
@@ -96,7 +81,6 @@
JSC::JSGlobalData* m_globalData;
HashSet<ScriptController*> m_scriptControllersWithWindowShells;
bool m_isNormal;
- JSDOMWrapperOwner m_defaultWrapperOwner;
JSStringOwner m_stringWrapperOwner;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
