Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 4 insertions, 4 deletions

diff --git a/WebCore/bridge/runtime_root.cpp b/WebCore/bridge/runtime_root.cpp
index b179d56..09fd43b 100644
--- a/WebCore/bridge/runtime_root.cpp
+++ b/WebCore/bridge/runtime_root.cpp
@@ -101,8 +101,8 @@ void RootObject::invalidate()
         return;
 
     {
-        HashSet<RuntimeObjectImp*>::iterator end = m_runtimeObjects.end();
-        for (HashSet<RuntimeObjectImp*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
+        HashSet<RuntimeObject*>::iterator end = m_runtimeObjects.end();
+        for (HashSet<RuntimeObject*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
             (*it)->invalidate();
         
         m_runtimeObjects.clear();
@@ -168,7 +168,7 @@ JSGlobalObject* RootObject::globalObject() const
     return m_globalObject;
 }
 
-void RootObject::addRuntimeObject(RuntimeObjectImp* object)
+void RootObject::addRuntimeObject(RuntimeObject* object)
 {
     ASSERT(m_isValid);
     ASSERT(!m_runtimeObjects.contains(object));
@@ -176,7 +176,7 @@ void RootObject::addRuntimeObject(RuntimeObjectImp* object)
     m_runtimeObjects.add(object);
 }        
     
-void RootObject::removeRuntimeObject(RuntimeObjectImp* object)
+void RootObject::removeRuntimeObject(RuntimeObject* object)
 {
     ASSERT(m_isValid);
     ASSERT(m_runtimeObjects.contains(object));