source: webkit/trunk/JavaScriptCore/runtime/JSNotAnObject.cpp@ 54571

Last change on this file since 54571 was 53170, checked in by [email protected], 15 years ago

2010-01-12 Kent Hansen <[email protected]>

Reviewed by Geoffrey Garen.

[ES5] Implement Object.getOwnPropertyNames
https://bugs.webkit.org/show_bug.cgi?id=32242

Add an extra argument to getPropertyNames() and getOwnPropertyNames()
(and all reimplementations thereof) that indicates whether non-enumerable
properties should be added.

  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h: (JSC::::getOwnPropertyNames):
  • JavaScriptCore.exp:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
  • debugger/DebuggerActivation.cpp: (JSC::DebuggerActivation::getOwnPropertyNames):
  • debugger/DebuggerActivation.h:
  • runtime/Arguments.cpp: (JSC::Arguments::getOwnPropertyNames):
  • runtime/Arguments.h:
  • runtime/CommonIdentifiers.h:
  • runtime/JSArray.cpp: (JSC::JSArray::getOwnPropertyNames):
  • runtime/JSArray.h:
  • runtime/JSByteArray.cpp: (JSC::JSByteArray::getOwnPropertyNames):
  • runtime/JSByteArray.h:
  • runtime/JSFunction.cpp: (JSC::JSFunction::getOwnPropertyNames):
  • runtime/JSFunction.h:
  • runtime/JSNotAnObject.cpp: (JSC::JSNotAnObject::getOwnPropertyNames):
  • runtime/JSNotAnObject.h:
  • runtime/JSObject.cpp: (JSC::getClassPropertyNames): (JSC::JSObject::getPropertyNames): (JSC::JSObject::getOwnPropertyNames):
  • runtime/JSObject.h:
  • runtime/JSVariableObject.cpp: (JSC::JSVariableObject::getOwnPropertyNames):
  • runtime/JSVariableObject.h:
  • runtime/ObjectConstructor.cpp: (JSC::ObjectConstructor::ObjectConstructor): (JSC::objectConstructorGetOwnPropertyNames):
  • runtime/RegExpMatchesArray.h: (JSC::RegExpMatchesArray::getOwnPropertyNames):
  • runtime/StringObject.cpp: (JSC::StringObject::getOwnPropertyNames):
  • runtime/StringObject.h:
  • runtime/Structure.cpp: Rename getEnumerablePropertyNames() to getPropertyNames(), which takes an extra argument. (JSC::Structure::getPropertyNames):
  • runtime/Structure.h: (JSC::):

2010-01-12 Kent Hansen <[email protected]>

Reviewed by Geoffrey Garen.

[ES5] Implement Object.getOwnPropertyNames
https://bugs.webkit.org/show_bug.cgi?id=32242

Add new argument to the reimplementation of getOwnPropertyNames().

  • UserObjectImp.cpp: (UserObjectImp::getOwnPropertyNames):
  • UserObjectImp.h:

2010-01-12 Kent Hansen <[email protected]>

Reviewed by Geoffrey Garen.

[ES5] Implement Object.getOwnPropertyNames
https://bugs.webkit.org/show_bug.cgi?id=32242

Add tests for Object.getOwnPropertyNames(o), both standard usage and cross origin.

  • fast/js/Object-getOwnPropertyNames-expected.txt: Added.
  • fast/js/Object-getOwnPropertyNames.html: Added.
  • fast/js/script-tests/Object-getOwnPropertyNames.js: Added.
  • http/tests/security/cross-frame-access-enumeration-expected.txt:
  • http/tests/security/cross-frame-access-enumeration.html:

2010-01-12 Kent Hansen <[email protected]>

Reviewed by Geoffrey Garen.

[ES5] Implement Object.getOwnPropertyNames
https://bugs.webkit.org/show_bug.cgi?id=32242

Add new argument to reimplementations of getPropertyNames()
and getOwnPropertyNames(), and update the JS bindings generator.

Test: fast/js/Object-getOwnPropertyNames.html

  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::getPropertyNames): (WebCore::JSDOMWindow::getOwnPropertyNames):
  • bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::getPropertyNames): (WebCore::JSDOMWindowShell::getOwnPropertyNames):
  • bindings/js/JSDOMWindowShell.h:
  • bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::getOwnPropertyNames):
  • bindings/js/JSLocationCustom.cpp: (WebCore::JSLocation::getOwnPropertyNames):
  • bindings/js/JSQuarantinedObjectWrapper.cpp: (WebCore::JSQuarantinedObjectWrapper::getPropertyNames): (WebCore::JSQuarantinedObjectWrapper::getOwnPropertyNames):
  • bindings/js/JSQuarantinedObjectWrapper.h:
  • bindings/js/JSStorageCustom.cpp: (WebCore::JSStorage::getOwnPropertyNames):
  • bindings/scripts/CodeGeneratorJS.pm:
  • bridge/runtime_array.cpp: (JSC::RuntimeArray::getOwnPropertyNames):
  • bridge/runtime_array.h:
  • bridge/runtime_object.cpp: (JSC::RuntimeObjectImp::getPropertyNames): (JSC::RuntimeObjectImp::getOwnPropertyNames):
  • bridge/runtime_object.h:
File size: 4.3 KB
Line 
1/*
2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29
30#include "config.h"
31#include "JSNotAnObject.h"
32
33#include <wtf/UnusedParam.h>
34
35namespace JSC {
36
37ASSERT_CLASS_FITS_IN_CELL(JSNotAnObject);
38
39// JSValue methods
40JSValue JSNotAnObject::toPrimitive(ExecState* exec, PreferredPrimitiveType) const
41{
42 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
43 return m_exception;
44}
45
46bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValue&)
47{
48 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
49 return false;
50}
51
52bool JSNotAnObject::toBoolean(ExecState* exec) const
53{
54 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
55 return false;
56}
57
58double JSNotAnObject::toNumber(ExecState* exec) const
59{
60 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
61 return NaN;
62}
63
64UString JSNotAnObject::toString(ExecState* exec) const
65{
66 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
67 return "";
68}
69
70JSObject* JSNotAnObject::toObject(ExecState* exec) const
71{
72 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
73 return m_exception;
74}
75
76// Marking
77void JSNotAnObject::markChildren(MarkStack& markStack)
78{
79 JSObject::markChildren(markStack);
80 markStack.append(m_exception);
81}
82
83// JSObject methods
84bool JSNotAnObject::getOwnPropertySlot(ExecState* exec, const Identifier&, PropertySlot&)
85{
86 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
87 return false;
88}
89
90bool JSNotAnObject::getOwnPropertySlot(ExecState* exec, unsigned, PropertySlot&)
91{
92 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
93 return false;
94}
95
96bool JSNotAnObject::getOwnPropertyDescriptor(ExecState* exec, const Identifier&, PropertyDescriptor&)
97{
98 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
99 return false;
100}
101
102void JSNotAnObject::put(ExecState* exec, const Identifier& , JSValue, PutPropertySlot&)
103{
104 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
105}
106
107void JSNotAnObject::put(ExecState* exec, unsigned, JSValue)
108{
109 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
110}
111
112bool JSNotAnObject::deleteProperty(ExecState* exec, const Identifier&)
113{
114 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
115 return false;
116}
117
118bool JSNotAnObject::deleteProperty(ExecState* exec, unsigned)
119{
120 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
121 return false;
122}
123
124void JSNotAnObject::getOwnPropertyNames(ExecState* exec, PropertyNameArray&, EnumerationMode)
125{
126 ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception);
127}
128
129} // namespace JSC
Note: See TracBrowser for help on using the repository browser.