Changeset 83385 in webkit for trunk/Source/JavaScriptCore/API/JSClassRef.h

Timestamp:

Apr 9, 2011, 7:32:07 PM (14 years ago)

Author:

[email protected]

Message:

2011-04-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

A few heap-related renames and file moves.

WeakGCPtr<T> => Weak<T>
Global<T> => Strong<T>
collector/ => heap/
collector/* => heap/*
runtime/WeakGCPtr.h => heap/Weak.h

(Eventually, even more files should move into the heap directory. Like
Heap.h and Heap.cpp, for example.)

• API/JSClassRef.h:
• CMakeLists.txt:
• GNUmakefile.am:
• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.pri:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
• JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd:
• JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/SamplingTool.h:
• bytecompiler/BytecodeGenerator.h:
• collector: Removed.
• collector/handles: Removed.
• collector/handles/Global.h: Removed.
• collector/handles/Handle.h: Removed.
• collector/handles/HandleHeap.cpp: Removed.
• collector/handles/HandleHeap.h: Removed.
• collector/handles/HandleStack.cpp: Removed.
• collector/handles/HandleStack.h: Removed.
• collector/handles/Local.h: Removed.
• collector/handles/LocalScope.h: Removed.
• heap: Copied from collector.
• heap/Handle.h: Copied from collector/handles/Handle.h.
• heap/HandleHeap.cpp: Copied from collector/handles/HandleHeap.cpp.
• heap/HandleHeap.h: Copied from collector/handles/HandleHeap.h.
• heap/HandleStack.cpp: Copied from collector/handles/HandleStack.cpp.
• heap/HandleStack.h: Copied from collector/handles/HandleStack.h.
• heap/Local.h: Copied from collector/handles/Local.h.
• heap/LocalScope.h: Copied from collector/handles/LocalScope.h.
• heap/Strong.h: Copied from collector/handles/Global.h. (JSC::Strong::Strong): (JSC::Strong::~Strong): (JSC::Strong::operator=):
• heap/Weak.h: Copied from runtime/WeakGCPtr.h. (JSC::Weak::Weak): (JSC::Weak::~Weak):
• heap/handles: Removed.
• interpreter/RegisterFile.h:
• jit/JITStubs.cpp: (JSC::JITThunks::hostFunctionStub):
• jit/JITStubs.h:
• runtime/Structure.h:
• runtime/WeakGCPtr.h: Removed.

2011-04-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

A few heap-related renames and file moves.

WeakGCPtr<T> => Weak<T>
Global<T> => Strong<T>
collector/ => heap/
collector/* => heap/*
runtime/WeakGCPtr.h => heap/Weak.h

(Eventually, even more files should move into the heap directory. Like
Heap.h and Heap.cpp, for example.)

• JSRun.h:
• JSValueWrapper.h:

2011-04-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

A few heap-related renames and file moves.

WeakGCPtr<T> => Weak<T>
Global<T> => Strong<T>
collector/ => heap/
collector/* => heap/*
runtime/WeakGCPtr.h => heap/Weak.h

(Eventually, even more files should move into the heap directory. Like
Heap.h and Heap.cpp, for example.)

• CMakeLists.txt:

2011-04-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

A few heap-related renames and file moves.

WeakGCPtr<T> => Weak<T>
Global<T> => Strong<T>
collector/ => heap/
collector/* => heap/*
runtime/WeakGCPtr.h => heap/Weak.h

(Eventually, even more files should move into the heap directory. Like
Heap.h and Heap.cpp, for example.)

• Plugins/Hosted/NetscapePluginInstanceProxy.h:
• Plugins/Hosted/NetscapePluginInstanceProxy.mm: (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::idForObject): (WebKit::NetscapePluginInstanceProxy::LocalObjectMap::forget): (WebKit::NetscapePluginInstanceProxy::evaluate):
• WebView/WebScriptDebugger.h:

2011-04-08 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

A few heap-related renames and file moves.

WeakGCPtr<T> => Weak<T>
Global<T> => Strong<T>
collector/ => heap/
collector/* => heap/*
runtime/WeakGCPtr.h => heap/Weak.h

(Eventually, even more files should move into the heap directory. Like
Heap.h and Heap.cpp, for example.)

• CMakeLists.txt:
• ForwardingHeaders/collector: Removed.
• ForwardingHeaders/heap: Copied from ForwardingHeaders/collector.
• ForwardingHeaders/heap/Strong.h: Copied from ForwardingHeaders/collector/handles/Global.h.
• ForwardingHeaders/heap/Weak.h: Copied from ForwardingHeaders/runtime/WeakGCPtr.h.
• ForwardingHeaders/runtime/WeakGCPtr.h: Removed.
• WebCore.vcproj/WebCore.vcproj:
• WebCore.vcproj/copyForwardingHeaders.cmd:
• bindings/js/JSCallbackData.h:
• bindings/js/JSCustomVoidCallback.h:
• bindings/js/JSDOMWindowBase.h:
• bindings/js/JSDOMWindowShell.cpp: (WebCore::JSDOMWindowShell::setWindow):
• bindings/js/JSDataGridDataSource.h:
• bindings/js/JSEventListener.h:
• bindings/js/ScheduledAction.cpp: (WebCore::ScheduledAction::ScheduledAction):
• bindings/js/ScheduledAction.h:
• bindings/js/ScriptCachedFrameData.cpp: (WebCore::ScriptCachedFrameData::ScriptCachedFrameData):
• bindings/js/ScriptCachedFrameData.h:
• bindings/js/ScriptController.cpp: (WebCore::ScriptController::createWindowShell):
• bindings/js/ScriptController.h:
• bindings/js/ScriptObject.h:
• bindings/js/ScriptState.h:
• bindings/js/ScriptValue.cpp:
• bindings/js/ScriptValue.h:
• bindings/js/ScriptWrappable.h:
• bindings/js/WorkerScriptController.cpp: (WebCore::WorkerScriptController::initScript):
• bindings/js/WorkerScriptController.h:
• bridge/jsc/BridgeJSC.h:
• bridge/qt/qt_runtime.h:
• bridge/runtime_root.h:
• xml/XMLHttpRequest.cpp:

File:

• trunk/Source/JavaScriptCore/API/JSClassRef.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSClassRef.h

@@ -29 +29 @@
 #include "JSObjectRef.h"
 
-#include <runtime/JSObject.h>
-#include <runtime/Protect.h>
-#include <runtime/UString.h>
-#include <runtime/WeakGCPtr.h>
+#include "Weak.h"
+#include "JSObject.h"
+#include "Protect.h"
+#include "UString.h"
 #include <wtf/HashMap.h>
 
@@ -83 +83 @@
     OpaqueJSClassStaticValuesTable* staticValues;
     OpaqueJSClassStaticFunctionsTable* staticFunctions;
-    JSC::WeakGCPtr<JSC::JSObject> cachedPrototype;
+    JSC::Weak<JSC::JSObject> cachedPrototype;
 };