source: webkit/trunk/JavaScriptCore/API/JSBase.cpp@ 34581

Last change on this file since 34581 was 34581, checked in by Darin Adler, 17 years ago

JavaScriptCore:

2008-06-15 Darin Adler <Darin Adler>

  • API/JSBase.cpp:
  • API/JSCallbackConstructor.h:
  • API/JSCallbackFunction.cpp:
  • API/JSCallbackFunction.h:
  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h:
  • API/JSClassRef.h:
  • API/JSContextRef.cpp:
  • API/JSObjectRef.cpp:
  • API/JSStringRef.cpp:
  • API/JSStringRefCF.cpp:
  • API/JSValueRef.cpp:
  • GNUmakefile.am:
  • JavaScriptCore.pri:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • JavaScriptCoreSources.bkl:
  • VM/CodeBlock.cpp:
  • VM/CodeGenerator.cpp:
  • VM/ExceptionHelpers.cpp:
  • VM/ExceptionHelpers.h:
  • VM/JSPropertyNameIterator.cpp:
  • VM/JSPropertyNameIterator.h:
  • VM/Machine.cpp:
  • kjs/AllInOneFile.cpp:
  • kjs/DateMath.cpp:
  • kjs/DebuggerCallFrame.cpp:
  • kjs/ExecState.cpp:
  • kjs/JSActivation.cpp:
  • kjs/JSFunction.cpp: Copied from JavaScriptCore/kjs/function.cpp.
  • kjs/JSFunction.h: Copied from JavaScriptCore/kjs/function.h.
  • kjs/JSImmediate.cpp:
  • kjs/JSNotAnObject.h:
  • kjs/JSObject.cpp: Copied from JavaScriptCore/kjs/object.cpp.
  • kjs/JSObject.h: Copied from JavaScriptCore/kjs/object.h.
  • kjs/JSString.h: Copied from JavaScriptCore/kjs/internal.h.
  • kjs/JSValue.cpp: Copied from JavaScriptCore/kjs/value.cpp.
  • kjs/JSValue.h: Copied from JavaScriptCore/kjs/value.h.
  • kjs/JSVariableObject.h:
  • kjs/JSWrapperObject.h:
  • kjs/Shell.cpp:
  • kjs/SymbolTable.h:
  • kjs/array_instance.h:
  • kjs/collector.cpp:
  • kjs/date_object.cpp:
  • kjs/date_object.h:
  • kjs/error_object.cpp:
  • kjs/function.cpp: Removed.
  • kjs/function.h: Removed.
  • kjs/function_object.cpp:
  • kjs/function_object.h:
  • kjs/grammar.y:
  • kjs/internal.cpp:
  • kjs/internal.h: Removed.
  • kjs/lexer.cpp:
  • kjs/list.h:
  • kjs/lookup.h:
  • kjs/nodes.h:
  • kjs/object.cpp: Removed.
  • kjs/object.h: Removed.
  • kjs/object_object.h:
  • kjs/operations.cpp:
  • kjs/property_map.cpp:
  • kjs/property_slot.cpp:
  • kjs/property_slot.h:
  • kjs/protect.h:
  • kjs/regexp_object.cpp:
  • kjs/scope_chain.cpp:
  • kjs/string_object.h:
  • kjs/ustring.cpp:
  • kjs/value.cpp: Removed.
  • kjs/value.h: Removed.
  • profiler/Profile.cpp:
  • profiler/Profiler.cpp:

JavaScriptGlue:

2008-06-15 Darin Adler <Darin Adler>

  • ForwardingHeaders/kjs/JSValue.h: Copied from JavaScriptGlue/ForwardingHeaders/kjs/value.h.
  • ForwardingHeaders/kjs/value.h: Removed.
  • JSUtils.h:

WebCore:

2008-06-15 Darin Adler <Darin Adler>

  • ForwardingHeaders/kjs/JSFunction.h: Copied from WebCore/ForwardingHeaders/kjs/function.h.
  • ForwardingHeaders/kjs/JSObject.h: Copied from WebCore/ForwardingHeaders/kjs/object.h.
  • ForwardingHeaders/kjs/JSString.h: Copied from WebCore/ForwardingHeaders/kjs/internal.h.
  • ForwardingHeaders/kjs/JSValue.h: Copied from WebCore/ForwardingHeaders/kjs/value.h.
  • ForwardingHeaders/kjs/function.h: Removed.
  • ForwardingHeaders/kjs/internal.h: Removed.
  • ForwardingHeaders/kjs/object.h: Removed.
  • ForwardingHeaders/kjs/value.h: Removed.
  • WebCore.vcproj/WebCore.vcproj:
  • bindings/js/JSCustomSQLStatementCallback.h:
  • bindings/js/JSCustomSQLStatementErrorCallback.h:
  • bindings/js/JSCustomSQLTransactionErrorCallback.h:
  • bindings/js/JSCustomVoidCallback.h:
  • bindings/js/JSDOMBinding.h:
  • bindings/js/JSDOMWindowCustom.cpp:
  • bindings/js/JSDOMWindowShell.cpp:
  • bindings/js/JSQuarantinedObjectWrapper.h:
  • bridge/objc/objc_runtime.h:
  • bridge/objc/objc_utility.h:
  • bridge/qt/qt_runtime.cpp:
  • bridge/runtime.h:
  • bridge/runtime_array.h:
  • bridge/runtime_method.h:
  • bridge/runtime_object.h:
  • bridge/testbindings.cpp:
  • bridge/testbindings.mm:
  • bridge/testqtbindings.cpp:
  • loader/FrameLoader.cpp:
  • page/JavaScriptCallFrame.cpp:
  • page/JavaScriptProfile.cpp:
  • page/JavaScriptProfileNode.cpp:
  • platform/graphics/gtk/VideoSinkGStreamer.h:
  • plugins/PluginView.cpp:
  • plugins/gtk/PluginViewGtk.cpp:
  • plugins/qt/PluginViewQt.cpp:
  • plugins/win/PluginViewWin.cpp:

WebKit/gtk:

2008-06-15 Darin Adler <Darin Adler>

  • WebCoreSupport/ContextMenuClientGtk.cpp:
  • webkit/webkitnetworkrequest.h:
  • webkit/webkitwebbackforwardlist.h:
  • webkit/webkitwebframe.h:
  • webkit/webkitwebhistoryitem.h:
  • webkit/webkitwebsettings.h:

WebKit/mac:

2008-06-15 Darin Adler <Darin Adler>

  • ForwardingHeaders/kjs/JSFunction.h: Copied from WebKit/mac/ForwardingHeaders/kjs/function.h.
  • ForwardingHeaders/kjs/JSObject.h: Copied from WebKit/mac/ForwardingHeaders/kjs/object.h.
  • ForwardingHeaders/kjs/JSString.h: Copied from WebKit/mac/ForwardingHeaders/kjs/internal.h.
  • ForwardingHeaders/kjs/JSValue.h: Copied from WebKit/mac/ForwardingHeaders/kjs/value.h.
  • ForwardingHeaders/kjs/function.h: Removed.
  • ForwardingHeaders/kjs/internal.h: Removed.
  • ForwardingHeaders/kjs/object.h: Removed.
  • ForwardingHeaders/kjs/value.h: Removed.
  • WebView/WebScriptDebugDelegate.mm:

WebKit/qt:

2008-06-15 Darin Adler <Darin Adler>

  • Api/qwebframe.cpp:

WebKit/win:

2008-06-15 Darin Adler <Darin Adler>

  • WebView.cpp:

WebKit/wx:

2008-06-15 Darin Adler <Darin Adler>

  • WebView.cpp:

WebKitTools:

2008-06-15 Darin Adler <Darin Adler>

  • Scripts/do-file-rename: Updated for the latest round of renaming.
  • Scripts/do-webcore-rename: Tweaked and reorganized a bit.
  • Property svn:eol-style set to native
File size: 3.7 KB
Line 
1// -*- mode: c++; c-basic-offset: 4 -*-
2/*
3 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
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 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "config.h"
28#include "JSBase.h"
29
30#include "APICast.h"
31#include <kjs/ExecState.h>
32#include <kjs/InitializeThreading.h>
33#include <kjs/interpreter.h>
34#include <kjs/JSGlobalObject.h>
35#include <kjs/JSLock.h>
36#include <kjs/JSObject.h>
37
38using namespace KJS;
39
40JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
41{
42 JSLock lock;
43 ExecState* exec = toJS(ctx);
44 JSObject* jsThisObject = toJS(thisObject);
45 UString::Rep* scriptRep = toJS(script);
46 UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
47
48 // Interpreter::evaluate sets "this" to the global object if it is NULL
49 JSGlobalObject* globalObject = exec->dynamicGlobalObject();
50 Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);
51
52 if (completion.complType() == Throw) {
53 if (exception)
54 *exception = toRef(completion.value());
55 return 0;
56 }
57
58 if (completion.value())
59 return toRef(completion.value());
60
61 // happens, for example, when the only statement is an empty (';') statement
62 return toRef(jsUndefined());
63}
64
65bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
66{
67 JSLock lock;
68
69 ExecState* exec = toJS(ctx);
70 UString::Rep* scriptRep = toJS(script);
71 UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
72 Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), UString(sourceURLRep), startingLineNumber, UString(scriptRep));
73 if (completion.complType() == Throw) {
74 if (exception)
75 *exception = toRef(completion.value());
76 return false;
77 }
78
79 return true;
80}
81
82void JSGarbageCollect(JSContextRef ctx)
83{
84 // Unlikely, but it is legal to call JSGarbageCollect(0) before actually doing anything that would implicitly call initializeThreading().
85 if (!ctx)
86 initializeThreading();
87
88 JSLock lock;
89 if (!Collector::isBusy())
90 Collector::collect();
91 // FIXME: Perhaps we should trigger a second mark and sweep
92 // once the garbage collector is done if this is called when
93 // the collector is busy.
94}
Note: See TracBrowser for help on using the repository browser.