Changeset 190527 in webkit for trunk/Source/JavaScriptCore/heap/Heap.h

Timestamp:

Oct 2, 2015, 3:24:07 PM (10 years ago)

Author:

Joseph Pecoraro

Message:

Unreviewed, rolling out r190520, some tests assert / crash.

Source/JavaScriptCore:

• CMakeLists.txt:
• DerivedSources.make:
• JavaScriptCore.xcodeproj/project.pbxproj:
• heap/Heap.cpp:

(JSC::Heap::willStartCollection): Deleted.
(JSC::Heap::didFinishCollection): Deleted.

• heap/Heap.h:

(JSC::Heap::addObserver): Deleted.
(JSC::Heap::removeObserver): Deleted.

• heap/HeapObserver.h: Removed.
• heap/MarkedSpace.h:
• inspector/InspectorEnvironment.h:
• inspector/JSGlobalObjectInspectorController.cpp:

(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
(Inspector::JSGlobalObjectInspectorController::vm): Deleted.

• inspector/JSGlobalObjectInspectorController.h:
• inspector/agents/InspectorHeapAgent.cpp: Removed.
• inspector/agents/InspectorHeapAgent.h: Removed.
• inspector/protocol/Heap.json: Removed.

Source/WebCore:

• ForwardingHeaders/heap/HeapObserver.h: Removed.
• ForwardingHeaders/inspector/agents/InspectorHeapAgent.h: Removed.
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• inspector/InspectorController.cpp:

(WebCore::InspectorController::InspectorController): Deleted.
(WebCore::InspectorController::vm): Deleted.

• inspector/InspectorController.h:
• inspector/WorkerInspectorController.cpp:

(WebCore::WorkerInspectorController::vm): Deleted.

• inspector/WorkerInspectorController.h:

Source/WebInspectorUI:

• Localizations/en.lproj/localizedStrings.js:
• UserInterface/Base/Main.js:

(WebInspector.loaded): Deleted.

• UserInterface/Base/Utilities.js:

(value): Deleted.

• UserInterface/Controllers/HeapManager.js: Removed.
• UserInterface/Controllers/TimelineManager.js:

(WebInspector.TimelineManager): Deleted.
(WebInspector.TimelineManager.prototype._garbageCollected): Deleted.

• UserInterface/Images/TimelineRecordGarbageCollection.svg: Removed.
• UserInterface/Main.html:
• UserInterface/Models/GarbageCollection.js: Removed.
• UserInterface/Models/ScriptTimelineRecord.js:

(WebInspector.ScriptTimelineRecord.EventType.displayName):
(WebInspector.ScriptTimelineRecord.prototype.isGarbageCollection): Deleted.

• UserInterface/Protocol/HeapObserver.js: Removed.
• UserInterface/Test.html:
• UserInterface/Test/Test.js:

(WebInspector.loaded): Deleted.

• UserInterface/Views/ScriptTimelineDataGridNode.js:

(WebInspector.ScriptTimelineDataGridNode.prototype.get data):
(WebInspector.ScriptTimelineDataGridNode.prototype.createCellContent): Deleted.
(WebInspector.ScriptTimelineDataGridNode): Deleted.

• UserInterface/Views/ScriptTimelineOverviewGraph.js:

(WebInspector.ScriptTimelineOverviewGraph.prototype.updateLayout):

• UserInterface/Views/ScriptTimelineView.js:

(WebInspector.ScriptTimelineView.prototype._processPendingRecords):

• UserInterface/Views/SourceCodeTimelineTreeElement.js:

(WebInspector.SourceCodeTimelineTreeElement):

• UserInterface/Views/TimelineIcons.css:

(.garbage-collection-profile-record .icon): Deleted.

• UserInterface/Views/TimelineRecordBar.css:

(.timeline-record-bar.timeline-record-type-script.script-timeline-record-garbage-collected > .segment): Deleted.

• UserInterface/Views/TimelineRecordBar.js:

(WebInspector.TimelineRecordBar.createCombinedBars):

• UserInterface/Views/TimelineRecordTreeElement.js:

(WebInspector.TimelineRecordTreeElement):

LayoutTests:

• inspector/heap/garbageCollected-expected.txt: Removed.
• inspector/heap/garbageCollected.html: Removed.
• inspector/heap/gc-expected.txt: Removed.
• inspector/heap/gc.html: Removed.

File:

• trunk/Source/JavaScriptCore/heap/Heap.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -29 +29 @@
 #include "HandleSet.h"
 #include "HandleStack.h"
-#include "HeapObserver.h"
 #include "HeapOperation.h"
 #include "JITStubRoutineSet.h"
@@ -51 +50 @@
 namespace JSC {
 
+class CopiedSpace;
 class CodeBlock;
-class CopiedSpace;
+class ExecutableBase;
 class EdenGCActivityCallback;
-class ExecutableBase;
 class FullGCActivityCallback;
 class GCActivityCallback;
 class GCAwareJITStubRoutine;
+class GlobalCodeBlock;
 class Heap;
 class HeapRootVisitor;
@@ -64 +64 @@
 class JITStubRoutine;
 class JSCell;
+class VM;
 class JSStack;
 class JSValue;
+class LiveObjectIterator;
 class LLIntOffsetsExtractor;
 class MarkedArgumentBuffer;
-class VM;
+class WeakGCHandlePool;
+class SlotVisitor;
 
 namespace DFG {
@@ -130 +133 @@
     JS_EXPORT_PRIVATE IncrementalSweeper* sweeper();
     JS_EXPORT_PRIVATE void setIncrementalSweeper(std::unique_ptr<IncrementalSweeper>);
-
-    void addObserver(HeapObserver* observer) { m_observers.append(observer); }
-    void removeObserver(HeapObserver* observer) { m_observers.removeFirst(observer); }
 
     // true if collection is in progress
@@ -412 +412 @@
     std::unique_ptr<IncrementalSweeper> m_sweeper;
     Vector<MarkedBlock*> m_blockSnapshot;
-
-    Vector<HeapObserver*> m_observers;
-
+    
     unsigned m_deferralDepth;
     Vector<DFG::Worklist*> m_suspendedCompilerWorklists;