source: webkit/trunk/JavaScriptCore/kjs/JSGlobalObject.cpp@ 28328

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

JavaScriptCore:

Reviewed by Eric Seidel.

Second step in refactoring JSGlobalObject: moved virtual functions from
Interpreter to JSGlobalObject.


Layout and JS tests pass. SunSpider reports a .7% speedup -- don't
believe his lies.

JavaScriptGlue:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.


  • JSRun.cpp:
  • JSRun.h:
  • JSValueWrapper.cpp: (getThreadGlobalExecState):
  • JavaScriptGlue.cpp: (JSRunCopyGlobalObject): (JSRunEvaluate):

WebCore:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.


Moved virtual ScriptInterpreter functions to Window.

WebKit/mac:

Reviewed by Eric Seidel.

Updated to match the JavaScriptCore change to move virtual methods from
Interpreter to JSGlobalObject.

  • WebView/WebFrame.mm: (-[WebFrame globalContext]): Use the toRef function instead of manually casting.
File size: 3.7 KB
Line 
1/*
2 * Copyright (C) 2007 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 "JSGlobalObject.h"
31
32#include "object_object.h"
33#include "function_object.h"
34#include "array_object.h"
35#include "bool_object.h"
36#include "string_object.h"
37#include "number_object.h"
38#include "date_object.h"
39#include "regexp_object.h"
40#include "error_object.h"
41
42namespace KJS {
43
44static inline void markIfNeeded(JSValue* v)
45{
46 if (v && !v->marked())
47 v->mark();
48}
49
50void JSGlobalObject::mark()
51{
52 JSObject::mark();
53
54 if (m_interpreter->m_currentExec)
55 m_interpreter->m_currentExec->mark();
56
57 markIfNeeded(m_interpreter->m_globalExec.exception());
58
59 markIfNeeded(m_interpreter->m_Object);
60 markIfNeeded(m_interpreter->m_Function);
61 markIfNeeded(m_interpreter->m_Array);
62 markIfNeeded(m_interpreter->m_Boolean);
63 markIfNeeded(m_interpreter->m_String);
64 markIfNeeded(m_interpreter->m_Number);
65 markIfNeeded(m_interpreter->m_Date);
66 markIfNeeded(m_interpreter->m_RegExp);
67 markIfNeeded(m_interpreter->m_Error);
68
69 markIfNeeded(m_interpreter->m_ObjectPrototype);
70 markIfNeeded(m_interpreter->m_FunctionPrototype);
71 markIfNeeded(m_interpreter->m_ArrayPrototype);
72 markIfNeeded(m_interpreter->m_BooleanPrototype);
73 markIfNeeded(m_interpreter->m_StringPrototype);
74 markIfNeeded(m_interpreter->m_NumberPrototype);
75 markIfNeeded(m_interpreter->m_DatePrototype);
76 markIfNeeded(m_interpreter->m_RegExpPrototype);
77 markIfNeeded(m_interpreter->m_ErrorPrototype);
78
79 markIfNeeded(m_interpreter->m_EvalError);
80 markIfNeeded(m_interpreter->m_RangeError);
81 markIfNeeded(m_interpreter->m_ReferenceError);
82 markIfNeeded(m_interpreter->m_SyntaxError);
83 markIfNeeded(m_interpreter->m_TypeError);
84 markIfNeeded(m_interpreter->m_UriError);
85
86 markIfNeeded(m_interpreter->m_EvalErrorPrototype);
87 markIfNeeded(m_interpreter->m_RangeErrorPrototype);
88 markIfNeeded(m_interpreter->m_ReferenceErrorPrototype);
89 markIfNeeded(m_interpreter->m_SyntaxErrorPrototype);
90 markIfNeeded(m_interpreter->m_TypeErrorPrototype);
91 markIfNeeded(m_interpreter->m_UriErrorPrototype);
92}
93
94ExecState* JSGlobalObject::globalExec()
95{
96 return &m_interpreter->m_globalExec;
97}
98
99} // namespace KJS
Note: See TracBrowser for help on using the repository browser.