Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 1 insertions, 60 deletions

diff --git a/Source/JavaScriptCore/runtime/JSVariableObject.cpp b/Source/JavaScriptCore/runtime/JSVariableObject.cpp
index 9dcbead34..7210c9b90 100644
--- a/Source/JavaScriptCore/runtime/JSVariableObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSVariableObject.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,12 +29,6 @@
 #include "config.h"
 #include "JSVariableObject.h"
 
-#include "JSActivation.h"
-#include "JSGlobalObject.h"
-#include "JSStaticScopeObject.h"
-#include "PropertyNameArray.h"
-#include "PropertyDescriptor.h"
-
 namespace JSC {
 
 void JSVariableObject::destroy(JSCell* cell)
@@ -42,57 +36,4 @@ void JSVariableObject::destroy(JSCell* cell)
     static_cast<JSVariableObject*>(cell)->JSVariableObject::~JSVariableObject();
 }
 
-bool JSVariableObject::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
-{
-    JSVariableObject* thisObject = jsCast<JSVariableObject*>(cell);
-    if (thisObject->symbolTable().contains(propertyName.publicName()))
-        return false;
-
-    return JSObject::deleteProperty(thisObject, exec, propertyName);
-}
-
-void JSVariableObject::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
-{
-    JSVariableObject* thisObject = jsCast<JSVariableObject*>(object);
-    SymbolTable::const_iterator end = thisObject->symbolTable().end();
-    for (SymbolTable::const_iterator it = thisObject->symbolTable().begin(); it != end; ++it) {
-        if (!(it->second.getAttributes() & DontEnum) || (mode == IncludeDontEnumProperties))
-            propertyNames.add(Identifier(exec, it->first.get()));
-    }
-    
-    JSObject::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
-}
-
-bool JSVariableObject::symbolTableGet(PropertyName propertyName, PropertyDescriptor& descriptor)
-{
-    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
-    if (!entry.isNull()) {
-        descriptor.setDescriptor(registerAt(entry.getIndex()).get(), entry.getAttributes() | DontDelete);
-        return true;
-    }
-    return false;
-}
-
-void JSVariableObject::putDirectVirtual(JSObject*, ExecState*, PropertyName, JSValue, unsigned)
-{
-    ASSERT_NOT_REACHED();
-}
-
-bool JSVariableObject::isDynamicScope(bool& requiresDynamicChecks) const
-{
-    switch (structure()->typeInfo().type()) {
-    case GlobalObjectType:
-        return static_cast<const JSGlobalObject*>(this)->isDynamicScope(requiresDynamicChecks);
-    case ActivationObjectType:
-        return static_cast<const JSActivation*>(this)->isDynamicScope(requiresDynamicChecks);
-    case StaticScopeObjectType:
-        return static_cast<const JSStaticScopeObject*>(this)->isDynamicScope(requiresDynamicChecks);
-    default:
-        ASSERT_NOT_REACHED();
-        break;
-    }
-
-    return false;
-}
-
 } // namespace JSC