← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.cpp
1
1
/*
2
 
 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
 
2
 * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
3
3
 *
4
4
 * Redistribution and use in source and binary forms, with or without
5
5
 * modification, are permitted provided that the following conditions
31
31
 
32
32
ASSERT_CLASS_FITS_IN_CELL(JSStaticScopeObject);
33
33
 
34
 
void JSStaticScopeObject::mark()
 
34
void JSStaticScopeObject::markChildren(MarkStack& markStack)
35
35
{
36
 
    JSVariableObject::mark();
37
 
    
38
 
    if (!d()->registerStore.marked())
39
 
        d()->registerStore.mark();
 
36
    JSVariableObject::markChildren(markStack);
 
37
    markStack.append(d()->registerStore.jsValue());
40
38
}
41
39
 
42
40
JSObject* JSStaticScopeObject::toThisObject(ExecState* exec) const
44
42
    return exec->globalThisValue();
45
43
}
46
44
 
47
 
void JSStaticScopeObject::put(ExecState*, const Identifier& propertyName, JSValuePtr value, PutPropertySlot&)
 
45
void JSStaticScopeObject::put(ExecState*, const Identifier& propertyName, JSValue value, PutPropertySlot&)
48
46
{
49
47
    if (symbolTablePut(propertyName, value))
50
48
        return;
52
50
    ASSERT_NOT_REACHED();
53
51
}
54
52
 
55
 
void JSStaticScopeObject::putWithAttributes(ExecState*, const Identifier& propertyName, JSValuePtr value, unsigned attributes)
 
53
void JSStaticScopeObject::putWithAttributes(ExecState*, const Identifier& propertyName, JSValue value, unsigned attributes)
56
54
{
57
55
    if (symbolTablePutWithAttributes(propertyName, value, attributes))
58
56
        return;
76
74
    return symbolTableGet(propertyName, slot);
77
75
}
78
76
 
79
 
inline bool JSStaticScopeObject::getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot& slot, bool& slotIsWriteable)
80
 
{
81
 
    return symbolTableGet(propertyName, slot, slotIsWriteable);
82
 
}
83
 
 
84
77
}