source: webkit/trunk/JavaScriptCore/kjs/JSVariableObject.cpp@ 32687

Last change on this file since 32687 was 32652, checked in by [email protected], 17 years ago

Reviewed by Darin.

Fix run-webkit-tests --threading
and provisionally fix <https://bugs.webkit.org/show_bug.cgi?id=18661>
Proxy server issue in Sunday's Nightly

Changed ClassInfo objects for built-in objects to hold a getter function returning
a per-thread instance. This makes it safe to share these ClassInfo objects between threads -
and these are the only ones that need to be shared.

  • Property svn:eol-style set to native
File size: 3.0 KB
Line 
1/*
2 * Copyright (C) 2007, 2008 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#include "config.h"
30#include "JSVariableObject.h"
31
32#include "PropertyNameArray.h"
33#include "property_map.h"
34
35namespace KJS {
36
37bool JSVariableObject::deleteProperty(ExecState* exec, const Identifier& propertyName)
38{
39 if (symbolTable().contains(propertyName.ustring().rep()))
40 return false;
41
42 return JSObject::deleteProperty(exec, propertyName);
43}
44
45void JSVariableObject::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
46{
47 SymbolTable::const_iterator end = symbolTable().end();
48 for (SymbolTable::const_iterator it = symbolTable().begin(); it != end; ++it) {
49 if ((localStorage()[it->second].attributes & DontEnum) == 0)
50 propertyNames.add(it->first.get());
51 }
52
53 JSObject::getPropertyNames(exec, propertyNames);
54}
55
56bool JSVariableObject::getPropertyAttributes(ExecState* exec, const Identifier& propertyName, unsigned& attributes) const
57{
58 size_t index = symbolTable().get(propertyName.ustring().rep());
59 if (index != missingSymbolMarker()) {
60 attributes = localStorage()[index].attributes;
61 return true;
62 }
63 return JSObject::getPropertyAttributes(exec, propertyName, attributes);
64}
65
66void JSVariableObject::mark()
67{
68 JSObject::mark();
69
70 size_t size = d->localStorage.size();
71 for (size_t i = 0; i < size; ++i) {
72 JSValue* value = d->localStorage[i].value;
73 if (!value->marked())
74 value->mark();
75 }
76}
77
78bool JSVariableObject::isVariableObject() const
79{
80 return true;
81}
82
83} // namespace KJS
Note: See TracBrowser for help on using the repository browser.