Diff
Modified: trunk/LayoutTests/ChangeLog (190526 => 190527)
--- trunk/LayoutTests/ChangeLog 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/LayoutTests/ChangeLog 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,5 +1,14 @@
2015-10-02 Joseph Pecoraro <[email protected]>
+ Unreviewed, rolling out r190520, some tests assert / crash.
+
+ * inspector/heap/garbageCollected-expected.txt: Removed.
+ * inspector/heap/garbageCollected.html: Removed.
+ * inspector/heap/gc-expected.txt: Removed.
+ * inspector/heap/gc.html: Removed.
+
+2015-10-02 Joseph Pecoraro <[email protected]>
+
Web Inspector: Include Garbage Collection Event in Timeline
https://bugs.webkit.org/show_bug.cgi?id=142510
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (190526 => 190527)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-02 22:24:07 UTC (rev 190527)
@@ -347,7 +347,6 @@
inspector/agents/InspectorAgent.cpp
inspector/agents/InspectorConsoleAgent.cpp
inspector/agents/InspectorDebuggerAgent.cpp
- inspector/agents/InspectorHeapAgent.cpp
inspector/agents/InspectorRuntimeAgent.cpp
inspector/agents/JSGlobalObjectConsoleAgent.cpp
inspector/agents/JSGlobalObjectDebuggerAgent.cpp
@@ -1027,7 +1026,6 @@
${_javascript_CORE_DIR}/inspector/protocol/Database.json
${_javascript_CORE_DIR}/inspector/protocol/Debugger.json
${_javascript_CORE_DIR}/inspector/protocol/GenericTypes.json
- ${_javascript_CORE_DIR}/inspector/protocol/Heap.json
${_javascript_CORE_DIR}/inspector/protocol/Inspector.json
${_javascript_CORE_DIR}/inspector/protocol/LayerTree.json
${_javascript_CORE_DIR}/inspector/protocol/Network.json
Modified: trunk/Source/_javascript_Core/ChangeLog (190526 => 190527)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,3 +1,27 @@
+2015-10-02 Joseph Pecoraro <[email protected]>
+
+ Unreviewed, rolling out r190520, some tests assert / crash.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * _javascript_Core.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.
+
2015-10-01 Geoffrey Garen <[email protected]>
Unreviewed, rolling back in r190450
Modified: trunk/Source/_javascript_Core/DerivedSources.make (190526 => 190527)
--- trunk/Source/_javascript_Core/DerivedSources.make 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/DerivedSources.make 2015-10-02 22:24:07 UTC (rev 190527)
@@ -152,7 +152,6 @@
$(_javascript_Core)/inspector/protocol/Database.json \
$(_javascript_Core)/inspector/protocol/Debugger.json \
$(_javascript_Core)/inspector/protocol/GenericTypes.json \
- $(_javascript_Core)/inspector/protocol/Heap.json \
$(_javascript_Core)/inspector/protocol/Inspector.json \
$(_javascript_Core)/inspector/protocol/LayerTree.json \
$(_javascript_Core)/inspector/protocol/Network.json \
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (190526 => 190527)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1290,9 +1290,6 @@
A532438C18568335002ED692 /* InspectorProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorProtocolObjects.h */; settings = {ATTRIBUTES = (Private, ); }; };
A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
A53243981856A489002ED692 /* CombinedDomains.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* CombinedDomains.json */; settings = {ATTRIBUTES = (Private, ); }; };
- A5339EC61BB399A60054F005 /* InspectorHeapAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A5339EC51BB399900054F005 /* InspectorHeapAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
- A5339EC71BB399A90054F005 /* InspectorHeapAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5339EC41BB399900054F005 /* InspectorHeapAgent.cpp */; };
- A5339EC91BB4B4600054F005 /* HeapObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = A5339EC81BB4B4510054F005 /* HeapObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
A53CE08518BC1A5600BEDF76 /* ConsolePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */; };
A53CE08618BC1A5600BEDF76 /* ConsolePrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */; };
A53CE08718BC1A5600BEDF76 /* JSConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08318BC1A5600BEDF76 /* JSConsole.cpp */; };
@@ -3191,9 +3188,6 @@
A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
A53243951856A475002ED692 /* CombinedDomains.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = CombinedDomains.json; sourceTree = "<group>"; };
A53243961856A475002ED692 /* InspectorBackendCommands.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = InspectorBackendCommands.js; sourceTree = "<group>"; };
- A5339EC41BB399900054F005 /* InspectorHeapAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorHeapAgent.cpp; sourceTree = "<group>"; };
- A5339EC51BB399900054F005 /* InspectorHeapAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorHeapAgent.h; sourceTree = "<group>"; };
- A5339EC81BB4B4510054F005 /* HeapObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapObserver.h; sourceTree = "<group>"; };
A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsolePrototype.cpp; sourceTree = "<group>"; };
A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsolePrototype.h; sourceTree = "<group>"; };
A53CE08318BC1A5600BEDF76 /* JSConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSConsole.cpp; sourceTree = "<group>"; };
@@ -4282,7 +4276,6 @@
0F32BD0F1BB34F190093A57F /* HeapHelperPool.h */,
C2DA778218E259990066FCB6 /* HeapInlines.h */,
2AD8932917E3868F00668276 /* HeapIterationScope.h */,
- A5339EC81BB4B4510054F005 /* HeapObserver.h */,
2A6F462517E959CE00C45C98 /* HeapOperation.h */,
14F97446138C853E00DA1C67 /* HeapRootVisitor.h */,
C24D31E0161CD695002AA4DB /* HeapStatistics.cpp */,
@@ -5749,8 +5742,6 @@
A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */,
A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */,
A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */,
- A5339EC41BB399900054F005 /* InspectorHeapAgent.cpp */,
- A5339EC51BB399900054F005 /* InspectorHeapAgent.h */,
A50E4B5D18809DD50068A46D /* InspectorRuntimeAgent.cpp */,
A50E4B5E18809DD50068A46D /* InspectorRuntimeAgent.h */,
A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */,
@@ -6429,7 +6420,6 @@
14BA7A9813AADFF8005B7C2C /* Heap.h in Headers */,
C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */,
2AD8932B17E3868F00668276 /* HeapIterationScope.h in Headers */,
- A5339EC91BB4B4600054F005 /* HeapObserver.h in Headers */,
2A6F462617E959CE00C45C98 /* HeapOperation.h in Headers */,
14F97447138C853E00DA1C67 /* HeapRootVisitor.h in Headers */,
C24D31E3161CD695002AA4DB /* HeapStatistics.h in Headers */,
@@ -6472,7 +6462,6 @@
A5945595182479EB00CC3843 /* InspectorFrontendChannel.h in Headers */,
A532438A18568335002ED692 /* InspectorFrontendDispatchers.h in Headers */,
99F1A7011B98FBEC00463B26 /* InspectorFrontendRouter.h in Headers */,
- A5339EC61BB399A60054F005 /* InspectorHeapAgent.h in Headers */,
E35E03601B7AB43E0073AD2A /* InspectorInstrumentationObject.h in Headers */,
E33B3E261B7ABD750048DB2E /* InspectorInstrumentationObject.lut.h in Headers */,
A532438C18568335002ED692 /* InspectorProtocolObjects.h in Headers */,
@@ -7784,7 +7773,6 @@
A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */,
A532438918568335002ED692 /* InspectorFrontendDispatchers.cpp in Sources */,
99F1A6FE1B8E6D9400463B26 /* InspectorFrontendRouter.cpp in Sources */,
- A5339EC71BB399A90054F005 /* InspectorHeapAgent.cpp in Sources */,
E35E035F1B7AB43E0073AD2A /* InspectorInstrumentationObject.cpp in Sources */,
A532438B18568335002ED692 /* InspectorProtocolObjects.cpp in Sources */,
A50E4B6118809DD50068A46D /* InspectorRuntimeAgent.cpp in Sources */,
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (190526 => 190527)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2015-10-02 22:24:07 UTC (rev 190527)
@@ -38,10 +38,10 @@
#include "HeapVerifier.h"
#include "IncrementalSweeper.h"
#include "Interpreter.h"
-#include "JSCInlines.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "JSONObject.h"
+#include "JSCInlines.h"
#include "JSVirtualMachineInternal.h"
#include "RecursiveAllocationScope.h"
#include "RegExpCache.h"
@@ -51,12 +51,13 @@
#include "VM.h"
#include "WeakSetInlines.h"
#include <algorithm>
+#include <wtf/RAMSize.h>
#include <wtf/CurrentTime.h>
#include <wtf/ParallelVectorIterator.h>
#include <wtf/ProcessID.h>
-#include <wtf/RAMSize.h>
using namespace std;
+using namespace JSC;
namespace JSC {
@@ -1167,9 +1168,6 @@
if (m_edenActivityCallback)
m_edenActivityCallback->willCollect();
-
- for (auto* observer : m_observers)
- observer->willGarbageCollect();
}
void Heap::flushOldStructureIDTables()
@@ -1318,7 +1316,6 @@
{
GCPHASE(FinishingCollection);
double gcEndTime = WTF::monotonicallyIncreasingTime();
- HeapOperation operation = m_operationInProgress;
if (m_operationInProgress == FullCollection)
m_lastFullGCLength = gcEndTime - gcStartTime;
else
@@ -1342,9 +1339,6 @@
RELEASE_ASSERT(m_operationInProgress == EdenCollection || m_operationInProgress == FullCollection);
m_operationInProgress = NoOperation;
_javascript_CORE_GC_END();
-
- for (auto* observer : m_observers)
- observer->didGarbageCollect(operation);
}
void Heap::resumeCompilerThreads()
Modified: trunk/Source/_javascript_Core/heap/Heap.h (190526 => 190527)
--- trunk/Source/_javascript_Core/heap/Heap.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/heap/Heap.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -28,7 +28,6 @@
#include "GCIncomingRefCountedSet.h"
#include "HandleSet.h"
#include "HandleStack.h"
-#include "HeapObserver.h"
#include "HeapOperation.h"
#include "JITStubRoutineSet.h"
#include "ListableHandler.h"
@@ -50,24 +49,28 @@
namespace JSC {
-class CodeBlock;
class CopiedSpace;
-class EdenGCActivityCallback;
+class CodeBlock;
class ExecutableBase;
+class EdenGCActivityCallback;
class FullGCActivityCallback;
class GCActivityCallback;
class GCAwareJITStubRoutine;
+class GlobalCodeBlock;
class Heap;
class HeapRootVisitor;
class HeapVerifier;
class IncrementalSweeper;
class JITStubRoutine;
class JSCell;
+class VM;
class JSStack;
class JSValue;
+class LiveObjectIterator;
class LLIntOffsetsExtractor;
class MarkedArgumentBuffer;
-class VM;
+class WeakGCHandlePool;
+class SlotVisitor;
namespace DFG {
class Worklist;
@@ -130,9 +133,6 @@
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
bool isCollecting();
HeapOperation operationInProgress() { return m_operationInProgress; }
@@ -411,9 +411,7 @@
RefPtr<GCActivityCallback> m_edenActivityCallback;
std::unique_ptr<IncrementalSweeper> m_sweeper;
Vector<MarkedBlock*> m_blockSnapshot;
-
- Vector<HeapObserver*> m_observers;
-
+
unsigned m_deferralDepth;
Vector<DFG::Worklist*> m_suspendedCompilerWorklists;
Deleted: trunk/Source/_javascript_Core/heap/HeapObserver.h (190526 => 190527)
--- trunk/Source/_javascript_Core/heap/HeapObserver.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/heap/HeapObserver.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HeapObserver_h
-#define HeapObserver_h
-
-#include "HeapOperation.h"
-
-namespace JSC {
-
-class HeapObserver {
-public:
- virtual ~HeapObserver() { }
- virtual void willGarbageCollect() = 0;
- virtual void didGarbageCollect(HeapOperation) = 0;
-};
-
-} // namespace JSC
-
-#endif // HeapObserver_h
Modified: trunk/Source/_javascript_Core/heap/MarkedSpace.h (190526 => 190527)
--- trunk/Source/_javascript_Core/heap/MarkedSpace.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/heap/MarkedSpace.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -39,6 +39,7 @@
class Heap;
class HeapIterationScope;
class JSCell;
+class LiveObjectIterator;
class LLIntOffsetsExtractor;
class WeakGCHandle;
class SlotVisitor;
Modified: trunk/Source/_javascript_Core/inspector/InspectorEnvironment.h (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/InspectorEnvironment.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/InspectorEnvironment.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -35,7 +35,6 @@
namespace JSC {
class Exception;
class SourceCode;
-class VM;
}
namespace Inspector {
@@ -54,7 +53,6 @@
virtual void didCallInjectedScriptFunction(JSC::ExecState*) = 0;
virtual void frontendInitialized() = 0;
virtual Ref<WTF::Stopwatch> executionStopwatch() = 0;
- virtual JSC::VM& vm() = 0;
};
} // namespace Inspector
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp 2015-10-02 22:24:07 UTC (rev 190527)
@@ -36,7 +36,6 @@
#include "InspectorBackendDispatcher.h"
#include "InspectorFrontendChannel.h"
#include "InspectorFrontendRouter.h"
-#include "InspectorHeapAgent.h"
#include "JSGlobalObject.h"
#include "JSGlobalObjectConsoleAgent.h"
#include "JSGlobalObjectConsoleClient.h"
@@ -63,11 +62,13 @@
namespace Inspector {
JSGlobalObjectInspectorController::JSGlobalObjectInspectorController(JSGlobalObject& globalObject)
- : m_globalObject(globalObject)
- , m_injectedScriptManager(std::make_unique<InjectedScriptManager>(*this, InjectedScriptHost::create()))
+ : m_injectedScriptManager(std::make_unique<InjectedScriptManager>(*this, InjectedScriptHost::create()))
, m_executionStopwatch(Stopwatch::create())
, m_frontendRouter(FrontendRouter::create())
, m_backendDispatcher(BackendDispatcher::create(m_frontendRouter.copyRef()))
+#if ENABLE(REMOTE_INSPECTOR)
+ , m_globalObject(globalObject)
+#endif
{
AgentContext baseContext = {
*this,
@@ -85,11 +86,9 @@
auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(context);
auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(context);
auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(context, consoleAgent.get());
- auto heapAgent = std::make_unique<InspectorHeapAgent>(context);
m_inspectorAgent = inspectorAgent.get();
m_debuggerAgent = debuggerAgent.get();
- m_heapAgent = heapAgent.get();
m_consoleAgent = consoleAgent.get();
m_consoleClient = std::make_unique<JSGlobalObjectConsoleClient>(m_consoleAgent);
@@ -99,7 +98,6 @@
m_agents.append(WTF::move(runtimeAgent));
m_agents.append(WTF::move(consoleAgent));
m_agents.append(WTF::move(debuggerAgent));
- m_agents.append(WTF::move(heapAgent));
m_executionStopwatch->start();
}
@@ -285,11 +283,6 @@
return m_executionStopwatch.copyRef();
}
-VM& JSGlobalObjectInspectorController::vm()
-{
- return m_globalObject.vm();
-}
-
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
void JSGlobalObjectInspectorController::appendExtraAgent(std::unique_ptr<InspectorAgentBase> agent)
{
Modified: trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -41,6 +41,7 @@
class Stopwatch;
}
+
namespace JSC {
class ConsoleClient;
class Exception;
@@ -57,7 +58,6 @@
class InspectorAgent;
class InspectorConsoleAgent;
class InspectorDebuggerAgent;
-class InspectorHeapAgent;
class JSGlobalObjectConsoleClient;
class ScriptCallStack;
@@ -97,7 +97,6 @@
virtual void didCallInjectedScriptFunction(JSC::ExecState*) override { }
virtual void frontendInitialized() override;
virtual Ref<WTF::Stopwatch> executionStopwatch() override;
- virtual JSC::VM& vm() override;
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
virtual AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const override { return m_augmentingClient; }
@@ -111,7 +110,6 @@
private:
void appendAPIBacktrace(ScriptCallStack* callStack);
- JSC::JSGlobalObject& m_globalObject;
std::unique_ptr<InjectedScriptManager> m_injectedScriptManager;
std::unique_ptr<JSGlobalObjectConsoleClient> m_consoleClient;
Ref<WTF::Stopwatch> m_executionStopwatch;
@@ -120,7 +118,6 @@
InspectorAgent* m_inspectorAgent { nullptr };
InspectorConsoleAgent* m_consoleAgent { nullptr };
InspectorDebuggerAgent* m_debuggerAgent { nullptr };
- InspectorHeapAgent* m_heapAgent { nullptr };
Ref<FrontendRouter> m_frontendRouter;
Ref<BackendDispatcher> m_backendDispatcher;
@@ -128,6 +125,10 @@
bool m_includeNativeCallStackWithExceptions { false };
bool m_isAutomaticInspection { false };
+#if ENABLE(REMOTE_INSPECTOR)
+ JSC::JSGlobalObject& m_globalObject;
+#endif
+
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
AugmentableInspectorControllerClient* m_augmentingClient { nullptr };
#endif
Deleted: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InspectorHeapAgent.h"
-
-#include "InspectorEnvironment.h"
-#include "VM.h"
-#include <wtf/Stopwatch.h>
-
-using namespace JSC;
-
-namespace Inspector {
-
-InspectorHeapAgent::InspectorHeapAgent(AgentContext& context)
- : InspectorAgentBase(ASCIILiteral("Heap"))
- , m_frontendDispatcher(std::make_unique<HeapFrontendDispatcher>(context.frontendRouter))
- , m_backendDispatcher(HeapBackendDispatcher::create(context.backendDispatcher, this))
- , m_environment(context.environment)
-{
-}
-
-InspectorHeapAgent::~InspectorHeapAgent()
-{
- ErrorString ignored;
- disable(ignored);
-}
-
-void InspectorHeapAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*)
-{
-}
-
-void InspectorHeapAgent::willDestroyFrontendAndBackend(DisconnectReason)
-{
-}
-
-void InspectorHeapAgent::enable(ErrorString&)
-{
- if (m_enabled)
- return;
-
- m_enabled = true;
-
- m_environment.vm().heap.addObserver(this);
-}
-
-void InspectorHeapAgent::disable(ErrorString&)
-{
- if (!m_enabled)
- return;
-
- m_enabled = false;
-
- m_environment.vm().heap.removeObserver(this);
-}
-
-void InspectorHeapAgent::gc(ErrorString&)
-{
- VM& vm = m_environment.vm();
- JSLockHolder lock(vm);
- sanitizeStackForVM(&vm);
- vm.heap.collectAllGarbage();
-}
-
-static Inspector::Protocol::Heap::GarbageCollection::Type protocolTypeForHeapOperation(HeapOperation operation)
-{
- switch (operation) {
- case FullCollection:
- return Inspector::Protocol::Heap::GarbageCollection::Type::Full;
- case EdenCollection:
- return Inspector::Protocol::Heap::GarbageCollection::Type::Partial;
- default:
- ASSERT_NOT_REACHED();
- return Inspector::Protocol::Heap::GarbageCollection::Type::Full;
- }
-}
-
-void InspectorHeapAgent::willGarbageCollect()
-{
- ASSERT(m_enabled);
- ASSERT(std::isnan(m_gcStartTime));
-
- m_gcStartTime = m_environment.executionStopwatch()->elapsedTime();
-}
-
-void InspectorHeapAgent::didGarbageCollect(HeapOperation operation)
-{
- ASSERT(m_enabled);
- ASSERT(!std::isnan(m_gcStartTime));
-
- // FIXME: Include number of bytes freed by collection.
-
- double endTime = m_environment.executionStopwatch()->elapsedTime();
- auto collection = Inspector::Protocol::Heap::GarbageCollection::create()
- .setType(protocolTypeForHeapOperation(operation))
- .setStartTime(m_gcStartTime)
- .setEndTime(endTime)
- .release();
-
- m_frontendDispatcher->garbageCollected(WTF::move(collection));
- m_gcStartTime = NAN;
-}
-
-} // namespace Inspector
Deleted: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorHeapAgent_h
-#define InspectorHeapAgent_h
-
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontendDispatchers.h"
-#include "heap/HeapObserver.h"
-#include "inspector/InspectorAgentBase.h"
-#include <wtf/Forward.h>
-#include <wtf/Noncopyable.h>
-
-namespace Inspector {
-
-typedef String ErrorString;
-
-class JS_EXPORT_PRIVATE InspectorHeapAgent final : public InspectorAgentBase, public HeapBackendDispatcherHandler, public JSC::HeapObserver {
- WTF_MAKE_NONCOPYABLE(InspectorHeapAgent);
-public:
- InspectorHeapAgent(AgentContext&);
- virtual ~InspectorHeapAgent();
-
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
-
- // HeapBackendDispatcherHandler
- virtual void enable(ErrorString&) override;
- virtual void disable(ErrorString&) override;
- virtual void gc(ErrorString&) override;
-
- // HeapObserver
- virtual void willGarbageCollect() override;
- virtual void didGarbageCollect(JSC::HeapOperation) override;
-
-private:
- std::unique_ptr<HeapFrontendDispatcher> m_frontendDispatcher;
- RefPtr<HeapBackendDispatcher> m_backendDispatcher;
- InspectorEnvironment& m_environment;
- bool m_enabled { false };
- double m_gcStartTime { NAN };
-};
-
-} // namespace Inspector
-
-#endif // InspectorHeapAgent_h
Deleted: trunk/Source/_javascript_Core/inspector/protocol/Heap.json (190526 => 190527)
--- trunk/Source/_javascript_Core/inspector/protocol/Heap.json 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/_javascript_Core/inspector/protocol/Heap.json 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,39 +0,0 @@
-{
- "domain": "Heap",
- "description": "Heap domain exposes _javascript_ heap attributes and capabilities.",
- "types": [
- {
- "id": "GarbageCollection",
- "description": "Information about a garbage collection.",
- "type": "object",
- "properties": [
- { "name": "type", "type": "string", "enum": ["full", "partial"], "description": "The type of garbage collection." },
- { "name": "startTime", "type": "number" },
- { "name": "endTime", "type": "number" }
- ]
- }
- ],
- "commands": [
- {
- "name": "enable",
- "description": "Enables Heap domain events."
- },
- {
- "name": "disable",
- "description": "Disables Heap domain events."
- },
- {
- "name": "gc",
- "description": "Trigger a full garbage collection."
- }
- ],
- "events": [
- {
- "name": "garbageCollected",
- "description": "Information about the garbage collection.",
- "parameters": [
- { "name": "collection", "type": "GarbageCollection" }
- ]
- }
- ]
-}
Modified: trunk/Source/WebCore/ChangeLog (190526 => 190527)
--- trunk/Source/WebCore/ChangeLog 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/ChangeLog 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,5 +1,21 @@
2015-10-02 Joseph Pecoraro <[email protected]>
+ Unreviewed, rolling out r190520, some tests assert / crash.
+
+ * 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:
+
+2015-10-02 Joseph Pecoraro <[email protected]>
+
Web Inspector: Include Garbage Collection Event in Timeline
https://bugs.webkit.org/show_bug.cgi?id=142510
Deleted: trunk/Source/WebCore/ForwardingHeaders/heap/HeapObserver.h (190526 => 190527)
--- trunk/Source/WebCore/ForwardingHeaders/heap/HeapObserver.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/ForwardingHeaders/heap/HeapObserver.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_HeapObserver_h
-#define WebCore_FWD_HeapObserver_h
-#include <_javascript_Core/HeapObserver.h>
-#endif
Deleted: trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorHeapAgent.h (190526 => 190527)
--- trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorHeapAgent.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorHeapAgent.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorHeapAgent_h
-#define WebCore_FWD_InspectorHeapAgent_h
-#include <_javascript_Core/InspectorHeapAgent.h>
-#endif
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (190526 => 190527)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-02 22:24:07 UTC (rev 190527)
@@ -20355,7 +20355,6 @@
<ClInclude Include="..\ForwardingHeaders\bindings\ScriptValue.h" />
<ClInclude Include="..\ForwardingHeaders\heap\AllocationSpace.h" />
<ClInclude Include="..\ForwardingHeaders\heap\Heap.h" />
- <ClInclude Include="..\ForwardingHeaders\heap\HeapObserver.h" />
<ClInclude Include="..\ForwardingHeaders\heap\SlotVisitor.h" />
<ClInclude Include="..\ForwardingHeaders\heap\StrongInlines.h" />
<ClInclude Include="..\ForwardingHeaders\heap\Weak.h" />
@@ -20385,7 +20384,6 @@
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorAgent.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorConsoleAgent.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorDebuggerAgent.h" />
- <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorHeapAgent.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorRuntimeAgent.h" />
<ClInclude Include="..\ForwardingHeaders\masm\X86Assembler.h" />
<ClInclude Include="..\ForwardingHeaders\parser\SourceCode.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (190526 => 190527)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-10-02 22:24:07 UTC (rev 190527)
@@ -11789,9 +11789,6 @@
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorDebuggerAgent.h">
<Filter>ForwardingHeaders\inspector</Filter>
</ClInclude>
- <ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorHeapAgent.h">
- <Filter>ForwardingHeaders\inspector</Filter>
- </ClInclude>
<ClInclude Include="..\ForwardingHeaders\inspector\agents\InspectorRuntimeAgent.h">
<Filter>ForwardingHeaders\inspector</Filter>
</ClInclude>
@@ -12072,9 +12069,6 @@
<ClInclude Include="..\ForwardingHeaders\heap\Heap.h">
<Filter>ForwardingHeaders\heap</Filter>
</ClInclude>
- <ClInclude Include="..\ForwardingHeaders\heap\HeapObserver.h">
- <Filter>ForwardingHeaders\heap</Filter>
- </ClInclude>
<ClInclude Include="..\ForwardingHeaders\heap\SlotVisitor.h">
<Filter>ForwardingHeaders\heap</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (190526 => 190527)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-10-02 22:24:07 UTC (rev 190527)
@@ -70,7 +70,6 @@
#include <inspector/InspectorFrontendDispatchers.h>
#include <inspector/InspectorFrontendRouter.h>
#include <inspector/agents/InspectorAgent.h>
-#include <inspector/agents/InspectorHeapAgent.h>
#include <profiler/LegacyProfiler.h>
#include <runtime/JSLock.h>
#include <wtf/Stopwatch.h>
@@ -171,7 +170,6 @@
m_domDebuggerAgent = domDebuggerAgentPtr.get();
m_agents.append(WTF::move(domDebuggerAgentPtr));
- m_agents.append(std::make_unique<InspectorHeapAgent>(pageContext));
m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(pageContext, pageAgent));
m_agents.append(std::make_unique<InspectorWorkerAgent>(pageContext));
m_agents.append(std::make_unique<InspectorLayerTreeAgent>(pageContext));
@@ -476,11 +474,6 @@
return m_executionStopwatch.copyRef();
}
-JSC::VM& InspectorController::vm()
-{
- return JSDOMWindowBase::commonVM();
-}
-
void InspectorController::didComposite(Frame& frame)
{
InspectorInstrumentation::didComposite(frame);
Modified: trunk/Source/WebCore/inspector/InspectorController.h (190526 => 190527)
--- trunk/Source/WebCore/inspector/InspectorController.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -131,7 +131,6 @@
virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
virtual void frontendInitialized() override;
virtual Ref<WTF::Stopwatch> executionStopwatch() override;
- virtual JSC::VM& vm() override;
WEBCORE_EXPORT void didComposite(Frame&);
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (190526 => 190527)
--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-10-02 22:24:07 UTC (rev 190527)
@@ -36,7 +36,6 @@
#include "InspectorInstrumentation.h"
#include "InspectorTimelineAgent.h"
#include "InstrumentingAgents.h"
-#include "JSDOMWindowBase.h"
#include "JSMainThreadExecState.h"
#include "WebInjectedScriptHost.h"
#include "WebInjectedScriptManager.h"
@@ -52,7 +51,6 @@
#include <inspector/InspectorFrontendRouter.h>
#include <wtf/Stopwatch.h>
-using namespace JSC;
using namespace Inspector;
namespace WebCore {
@@ -197,9 +195,4 @@
return m_executionStopwatch.copyRef();
}
-VM& WorkerInspectorController::vm()
-{
- return JSDOMWindowBase::commonVM();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (190526 => 190527)
--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-10-02 22:24:07 UTC (rev 190527)
@@ -75,7 +75,6 @@
virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
virtual void frontendInitialized() override { }
virtual Ref<WTF::Stopwatch> executionStopwatch() override;
- virtual JSC::VM& vm() override;
private:
friend class InspectorInstrumentation;
Modified: trunk/Source/WebInspectorUI/ChangeLog (190526 => 190527)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,3 +1,45 @@
+2015-10-02 Joseph Pecoraro <[email protected]>
+
+ Unreviewed, rolling out r190520, some tests assert / crash.
+
+ * 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):
+
2015-10-02 Devin Rousso <[email protected]>
Web Inspector: Option-Click on a property name in the Computed view should jump to resource view
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -291,11 +291,9 @@
localizedStrings["Frames"] = "Frames";
localizedStrings["Frames: %d %d (%s %s)"] = "Frames: %d %d (%s %s)";
localizedStrings["Frames: None Selected"] = "Frames: None Selected";
-localizedStrings["Full Garbage Collection"] = "Full Garbage Collection";
localizedStrings["Full URL"] = "Full URL";
localizedStrings["Function"] = "Function";
localizedStrings["Function Name Variable"] = "Function Name Variable";
-localizedStrings["Garbage Collection"] = "Garbage Collection";
localizedStrings["Getter"] = "Getter";
localizedStrings["Global Breakpoints"] = "Global Breakpoints";
localizedStrings["Global Variables"] = "Global Variables";
@@ -435,7 +433,6 @@
localizedStrings["Paint"] = "Paint";
localizedStrings["Paints"] = "Paints";
localizedStrings["Parent"] = "Parent";
-localizedStrings["Partial Garbage Collection"] = "Partial Garbage Collection";
localizedStrings["Path"] = "Path";
localizedStrings["Pause Playback"] = "Pause Playback";
localizedStrings["Pause Reason"] = "Pause Reason";
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -68,8 +68,6 @@
InspectorBackend.registerDOMDispatcher(new WebInspector.DOMObserver);
if (InspectorBackend.registerDebuggerDispatcher)
InspectorBackend.registerDebuggerDispatcher(new WebInspector.DebuggerObserver);
- if (InspectorBackend.registerHeapDispatcher)
- InspectorBackend.registerHeapDispatcher(new WebInspector.HeapObserver);
if (InspectorBackend.registerDatabaseDispatcher)
InspectorBackend.registerDatabaseDispatcher(new WebInspector.DatabaseObserver);
if (InspectorBackend.registerDOMStorageDispatcher)
@@ -110,7 +108,6 @@
this.issueManager = new WebInspector.IssueManager;
this.analyzerManager = new WebInspector.AnalyzerManager;
this.runtimeManager = new WebInspector.RuntimeManager;
- this.heapManager = new WebInspector.HeapManager;
this.applicationCacheManager = new WebInspector.ApplicationCacheManager;
this.timelineManager = new WebInspector.TimelineManager;
this.debuggerManager = new WebInspector.DebuggerManager;
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -452,23 +452,6 @@
}
});
-Object.defineProperty(Array.prototype, "partition",
-{
- value: function(callback)
- {
- let positive = [];
- let negative = [];
- for (let i = 0; i < this.length; ++i) {
- let value = this[i];
- if (callback(value))
- positive.push(value);
- else
- negative.push(value);
- }
- return [positive, negative];
- }
-});
-
Object.defineProperty(String.prototype, "trimMiddle",
{
value: function(maxLength)
Deleted: trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/HeapManager.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.HeapManager = class HeapManager extends WebInspector.Object
-{
- constructor()
- {
- super();
-
- if (window.HeapAgent)
- HeapAgent.enable();
- }
-
- // Public
-
- garbageCollected(payload)
- {
- // Called from WebInspector.HeapObserver.
-
- let collection = WebInspector.GarbageCollection.fromPayload(payload);
- this.dispatchEventToListeners(WebInspector.HeapManager.Event.GarbageCollected, {collection});
- }
-};
-
-WebInspector.HeapManager.Event = {
- GarbageCollected: "heap-manager-garbage-collected"
-};
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -33,8 +33,6 @@
WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ResourceWasAdded, this._resourceWasAdded, this);
- WebInspector.heapManager.addEventListener(WebInspector.HeapManager.Event.GarbageCollected, this._garbageCollected, this);
-
this._persistentNetworkTimeline = new WebInspector.NetworkTimeline;
this._isCapturing = false;
@@ -595,15 +593,6 @@
this._addRecord(record);
}
-
- _garbageCollected(event)
- {
- if (!this._isCapturing)
- return;
-
- let collection = event.data.collection;
- this._addRecord(new WebInspector.ScriptTimelineRecord(WebInspector.ScriptTimelineRecord.EventType.GarbageCollected, collection.startTime, collection.endTime, null, null, collection));
- }
};
WebInspector.TimelineManager.Event = {
Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/TimelineRecordGarbageCollection.svg (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Images/TimelineRecordGarbageCollection.svg 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/TimelineRecordGarbageCollection.svg 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path fill="rgb(228, 198, 172)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 Z"/>
- <path fill="rgb(186, 157, 132)" d="M 13 1 L 3 1 C 1.898438 1 1 1.898438 1 3 L 1 13 C 1 14.101562 1.898438 15 3 15 L 13 15 C 14.101562 15 15 14.101562 15 13 L 15 3 C 15 1.898438 14.101562 1 13 1 M 13 2 C 13.550781 2 14 2.449219 14 3 L 14 13 C 14 13.550781 13.550781 14 13 14 L 3 14 C 2.449219 14 2 13.550781 2 13 L 2 3 C 2 2.449219 2.449219 2 3 2 L 13 2"/>
- <path fill="rgb(186, 157, 132)" d="M 4.773438 11.542969 C 3.855469 10.621094 3.390625 9.347656 3.390625 7.769531 C 3.390625 6.15625 3.863281 4.878906 4.789062 3.964844 C 5.710938 3.054688 7.003906 2.59375 8.625 2.59375 C 9.570312 2.59375 10.519531 2.707031 11.441406 2.929688 C 11.890625 3.035156 12.210938 3.4375 12.210938 3.902344 L 12.210938 5.195312 C 12.210938 5.519531 12.050781 5.824219 11.789062 6.011719 C 11.613281 6.132812 11.410156 6.195312 11.207031 6.195312 C 11.097656 6.195312 10.984375 6.179688 10.878906 6.140625 C 10.015625 5.835938 9.308594 5.683594 8.769531 5.683594 C 8.058594 5.683594 7.753906 5.941406 7.589844 6.132812 C 7.296875 6.476562 7.148438 7.019531 7.148438 7.746094 C 7.148438 8.445312 7.308594 8.972656 7.621094 9.320312 C 7.808594 9.523438 8.148438 9.796875 8.921875 9.796875 C 9.542969 9.796875 10.1875 9.632812 10.839844 9.308594 C 10.980469 9.242188 11.132812 9.207031 11.285156 9.207031 C 11.46875 9.207031 11.648438 9.257812 1
1.8125 9.359375 C 12.105469 9.539062 12.285156 9.859375 12.285156 10.207031 L 12.285156 11.425781 C 12.285156 11.820312 12.050781 12.179688 11.691406 12.339844 C 10.792969 12.738281 9.730469 12.941406 8.527344 12.941406 C 6.957031 12.941406 5.691406 12.472656 4.773438 11.542969"/>
- <path fill="white" d="M 11.285156 11.425781 C 10.515625 11.769531 9.597656 11.941406 8.527344 11.941406 C 7.226562 11.941406 6.210938 11.574219 5.484375 10.839844 C 4.757812 10.105469 4.394531 9.082031 4.394531 7.769531 C 4.394531 6.429688 4.757812 5.398438 5.492188 4.675781 C 6.222656 3.957031 7.269531 3.59375 8.625 3.59375 C 9.492188 3.59375 10.351562 3.695312 11.210938 3.902344 L 11.210938 5.195312 C 10.238281 4.855469 9.425781 4.683594 8.769531 4.683594 C 7.933594 4.683594 7.285156 4.949219 6.832031 5.484375 C 6.375 6.015625 6.148438 6.769531 6.148438 7.746094 C 6.148438 8.707031 6.394531 9.453125 6.882812 9.992188 C 7.371094 10.527344 8.050781 10.796875 8.921875 10.796875 C 9.703125 10.796875 10.488281 10.601562 11.285156 10.207031 Z"/>
-</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-10-02 22:24:07 UTC (rev 190527)
@@ -226,7 +226,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -280,7 +279,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -601,7 +599,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Deleted: trunk/Source/WebInspectorUI/UserInterface/Models/GarbageCollection.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Models/GarbageCollection.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/GarbageCollection.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.GarbageCollection = class GarbageCollection extends WebInspector.Object
-{
- constructor(type, startTime, endTime)
- {
- super();
-
- console.assert(endTime > startTime);
-
- this._type = type;
- this._startTime = startTime;
- this._endTime = endTime;
- }
-
- // Static
-
- static fromPayload(payload)
- {
- let type = WebInspector.GarbageCollection.Type.Full;
- if (payload.type === HeapAgent.GarbageCollectionType.Partial)
- type = WebInspector.GarbageCollection.Type.Partial;
-
- return new WebInspector.GarbageCollection(type, payload.startTime, payload.endTime);
- }
-
- // Public
-
- get type()
- {
- return this._type;
- }
-
- get startTime()
- {
- return this._startTime;
- }
-
- get endTime()
- {
- return this._endTime;
- }
-
- get duration()
- {
- return this._endTime - this._startTime;
- }
-};
-
-WebInspector.GarbageCollection.Type = {
- Partial: Symbol("Partial"),
- Full: Symbol("Full")
-};
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -58,11 +58,6 @@
return this._profile;
}
- isGarbageCollection()
- {
- return this._eventType === WebInspector.ScriptTimelineRecord.EventType.GarbageCollected;
- }
-
saveIdentityToCookie(cookie)
{
super.saveIdentityToCookie(cookie);
@@ -163,11 +158,10 @@
AnimationFrameFired: "script-timeline-record-animation-frame-fired",
AnimationFrameRequested: "script-timeline-record-animation-frame-requested",
AnimationFrameCanceled: "script-timeline-record-animation-frame-canceled",
- ConsoleProfileRecorded: "script-timeline-record-console-profile-recorded",
- GarbageCollected: "script-timeline-record-garbage-collected"
+ ConsoleProfileRecorded: "script-timeline-record-console-profile-recorded"
};
-WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, details, includeDetailsInformationInMainTitle)
+WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, details, includeTimerIdentifierInMainTitle)
{
if (details && !WebInspector.ScriptTimelineRecord._eventDisplayNames) {
// These display names are not localized because they closely represent
@@ -341,27 +335,16 @@
if (details && (details instanceof String || typeof details === "string"))
return WebInspector.UIString("“%s” Profile Recorded").format(details);
return WebInspector.UIString("Console Profile Recorded");
- case WebInspector.ScriptTimelineRecord.EventType.GarbageCollected:
- console.assert(details);
- if (details && (details instanceof WebInspector.GarbageCollection) && includeDetailsInformationInMainTitle) {
- switch (details.type) {
- case WebInspector.GarbageCollection.Type.Partial:
- return WebInspector.UIString("Partial Garbage Collection");
- case WebInspector.GarbageCollection.Type.Full:
- return WebInspector.UIString("Full Garbage Collection");
- }
- }
- return WebInspector.UIString("Garbage Collection");
case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
- if (details && includeDetailsInformationInMainTitle)
+ if (details && includeTimerIdentifierInMainTitle)
return WebInspector.UIString("Timer %s Fired").format(details);
return WebInspector.UIString("Timer Fired");
case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
- if (details && includeDetailsInformationInMainTitle)
+ if (details && includeTimerIdentifierInMainTitle)
return WebInspector.UIString("Timer %s Installed").format(details);
return WebInspector.UIString("Timer Installed");
case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
- if (details && includeDetailsInformationInMainTitle)
+ if (details && includeTimerIdentifierInMainTitle)
return WebInspector.UIString("Timer %s Removed").format(details);
return WebInspector.UIString("Timer Removed");
case WebInspector.ScriptTimelineRecord.EventType.AnimationFrameFired:
Deleted: trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.HeapObserver = class HeapObserver
-{
- // Events defined by the "Heap" domain.
-
- garbageCollected(collection)
- {
- WebInspector.heapManager.garbageCollected(collection);
- }
-};
Modified: trunk/Source/WebInspectorUI/UserInterface/Test/Test.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Test/Test.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -41,7 +41,6 @@
InspectorBackend.registerDOMDispatcher(new WebInspector.DOMObserver);
InspectorBackend.registerNetworkDispatcher(new WebInspector.NetworkObserver);
InspectorBackend.registerDebuggerDispatcher(new WebInspector.DebuggerObserver);
- InspectorBackend.registerHeapDispatcher(new WebInspector.HeapObserver);
InspectorBackend.registerTimelineDispatcher(new WebInspector.TimelineObserver);
InspectorBackend.registerCSSDispatcher(new WebInspector.CSSObserver);
InspectorBackend.registerRuntimeDispatcher(new WebInspector.RuntimeObserver);
@@ -55,7 +54,6 @@
this.logManager = new WebInspector.LogManager;
this.issueManager = new WebInspector.IssueManager;
this.runtimeManager = new WebInspector.RuntimeManager;
- this.heapManager = new WebInspector.HeapManager;
this.timelineManager = new WebInspector.TimelineManager;
this.debuggerManager = new WebInspector.DebuggerManager;
this.probeManager = new WebInspector.ProbeManager;
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2015-10-02 22:24:07 UTC (rev 190527)
@@ -62,7 +62,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -98,7 +97,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
@@ -142,7 +140,6 @@
<script src=""
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineDataGridNode.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -77,15 +77,8 @@
}
}
- return {
- eventType: this._record.eventType,
- startTime,
- selfTime: duration,
- totalTime: duration,
- averageTime: duration,
- callCount: NaN,
- location: callFrameOrSourceCodeLocation
- };
+ return {eventType: this._record.eventType, startTime, selfTime: duration, totalTime: duration,
+ averageTime: duration, callCount: 1, location: callFrameOrSourceCodeLocation};
}
updateRangeTimes(startTime, endTime)
@@ -131,9 +124,6 @@
case "totalTime":
case "averageTime":
return isNaN(value) ? emptyValuePlaceholderString : Number.secondsToString(value, true);
-
- case "callCount":
- return isNaN(value) ? emptyValuePlaceholderString : value;
}
return super.createCellContent(columnIdentifier, cell);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineOverviewGraph.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -73,11 +73,7 @@
++recordBarIndex;
}
- // Create bars for non-GC records and GC records.
- let [gcRecords, nonGCRecords] = this._scriptTimeline.records.partition((x) => x.isGarbageCollection());
- let boundCreateBar = createBar.bind(this);
- WebInspector.TimelineRecordBar.createCombinedBars(nonGCRecords, secondsPerPixel, this, boundCreateBar);
- WebInspector.TimelineRecordBar.createCombinedBars(gcRecords, secondsPerPixel, this, boundCreateBar);
+ WebInspector.TimelineRecordBar.createCombinedBars(this._scriptTimeline.records, secondsPerPixel, this, createBar.bind(this));
// Remove the remaining unused TimelineRecordBars.
for (; recordBarIndex < this._timelineRecordBars.length; ++recordBarIndex) {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -224,10 +224,6 @@
if (!this._pendingRecords.length)
return;
- var zeroTime = this.zeroTime;
- var startTime = this.startTime;
- var endTime = this.endTime;
-
for (var scriptTimelineRecord of this._pendingRecords) {
var rootNodes = [];
if (scriptTimelineRecord.profile) {
@@ -235,11 +231,15 @@
rootNodes = scriptTimelineRecord.profile.topDownRootNodes;
}
- var treeElement = new WebInspector.TimelineRecordTreeElement(scriptTimelineRecord, WebInspector.SourceCodeLocation.NameStyle.Short, true);
+ var zeroTime = this.zeroTime;
+ var treeElement = new WebInspector.TimelineRecordTreeElement(scriptTimelineRecord, WebInspector.SourceCodeLocation.NameStyle.Short, rootNodes.length);
var dataGridNode = new WebInspector.ScriptTimelineDataGridNode(scriptTimelineRecord, zeroTime);
this._dataGrid.addRowInSortOrder(treeElement, dataGridNode);
+ var startTime = this.startTime;
+ var endTime = this.endTime;
+
for (var profileNode of rootNodes) {
var profileNodeTreeElement = new WebInspector.ProfileNodeTreeElement(profileNode, this);
var profileNodeDataGridNode = new WebInspector.ProfileNodeDataGridNode(profileNode, zeroTime, startTime, endTime);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTreeElement.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTreeElement.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTimelineTreeElement.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -25,13 +25,13 @@
WebInspector.SourceCodeTimelineTreeElement = class SourceCodeTimelineTreeElement extends WebInspector.TimelineRecordTreeElement
{
- constructor(sourceCodeTimeline, subtitleNameStyle, includeDetailsInformationInMainTitle)
+ constructor(sourceCodeTimeline, subtitleNameStyle, includeTimerIdentifierInMainTitle)
{
console.assert(sourceCodeTimeline);
subtitleNameStyle = subtitleNameStyle || WebInspector.SourceCodeLocation.NameStyle.None;
- super(sourceCodeTimeline.records[0], subtitleNameStyle, includeDetailsInformationInMainTitle, sourceCodeTimeline.sourceCodeLocation, sourceCodeTimeline);
+ super(sourceCodeTimeline.records[0], subtitleNameStyle, includeTimerIdentifierInMainTitle, sourceCodeTimeline.sourceCodeLocation, sourceCodeTimeline);
this._sourceCodeTimeline = sourceCodeTimeline;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2015-10-02 22:24:07 UTC (rev 190527)
@@ -103,10 +103,6 @@
content: url(../Images/TimelineRecordConsoleProfile.svg);
}
-.garbage-collection-profile-record .icon {
- content: url(../Images/TimelineRecordGarbageCollection.svg);
-}
-
.timer-record .icon {
content: url(../Images/TimelineRecordTimer.svg);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css 2015-10-02 22:24:07 UTC (rev 190527)
@@ -98,8 +98,3 @@
background-color: hsl(269, 65%, 74%);
border-color: hsl(273, 33%, 58%);
}
-
-.timeline-record-bar.timeline-record-type-script.script-timeline-record-garbage-collected > .segment {
- background-color: hsl(23, 69%, 73%);
- border-color: hsl(11, 54%, 62%);
-}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -134,23 +134,21 @@
var startTimeProperty = usesActiveStartTime ? "activeStartTime" : "startTime";
for (var record of visibleRecords) {
- var startTime = record[startTimeProperty];
-
// Check if the previous record is far enough away to create the active bar. We also create it now if the current record has no active state time.
- if (!isNaN(activeStartTime) && (activeStartTime + Math.max(activeEndTime - activeStartTime, minimumDuration) + minimumMargin <= startTime
- || (isNaN(startTime) && !isNaN(activeEndTime)))) {
+ if (!isNaN(activeStartTime) && (activeStartTime + Math.max(activeEndTime - activeStartTime, minimumDuration) + minimumMargin <= record[startTimeProperty]
+ || (isNaN(record[startTimeProperty]) && !isNaN(activeEndTime)))) {
createBarCallback(activeRecords, WebInspector.TimelineRecordBar.RenderMode.ActiveOnly);
activeRecords = [];
activeStartTime = NaN;
activeEndTime = NaN;
}
- if (isNaN(startTime))
+ if (isNaN(record[startTimeProperty]))
continue;
// If this is a new bar, peg the start time.
if (isNaN(activeStartTime))
- activeStartTime = startTime;
+ activeStartTime = record[startTimeProperty];
// Update the end time to be the maximum we encounter. activeEndTime might be NaN, so "|| 0" to prevent Math.max from returning NaN.
if (!isNaN(record.endTime))
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js (190526 => 190527)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-10-02 22:15:22 UTC (rev 190526)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordTreeElement.js 2015-10-02 22:24:07 UTC (rev 190527)
@@ -25,7 +25,7 @@
WebInspector.TimelineRecordTreeElement = class TimelineRecordTreeElement extends WebInspector.GeneralTreeElement
{
- constructor(timelineRecord, subtitleNameStyle, includeDetailsInformationInMainTitle, sourceCodeLocation, representedObject)
+ constructor(timelineRecord, subtitleNameStyle, includeTimerIdentifierInMainTitle, sourceCodeLocation, representedObject)
{
console.assert(timelineRecord);
@@ -72,7 +72,7 @@
break;
case WebInspector.TimelineRecord.Type.Script:
- title = WebInspector.ScriptTimelineRecord.EventType.displayName(timelineRecord.eventType, timelineRecord.details, includeDetailsInformationInMainTitle);
+ title = WebInspector.ScriptTimelineRecord.EventType.displayName(timelineRecord.eventType, timelineRecord.details, includeTimerIdentifierInMainTitle);
switch (timelineRecord.eventType) {
case WebInspector.ScriptTimelineRecord.EventType.ScriptEvaluated:
@@ -87,9 +87,6 @@
case WebInspector.ScriptTimelineRecord.EventType.ConsoleProfileRecorded:
iconStyleClass = WebInspector.TimelineRecordTreeElement.ConsoleProfileIconStyleClass;
break;
- case WebInspector.ScriptTimelineRecord.EventType.GarbageCollected:
- iconStyleClass = WebInspector.TimelineRecordTreeElement.GarbageCollectionIconStyleClass;
- break;
case WebInspector.ScriptTimelineRecord.EventType.TimerFired:
case WebInspector.ScriptTimelineRecord.EventType.TimerInstalled:
case WebInspector.ScriptTimelineRecord.EventType.TimerRemoved:
@@ -171,4 +168,3 @@
WebInspector.TimelineRecordTreeElement.AnimationRecordIconStyleClass = "animation-record";
WebInspector.TimelineRecordTreeElement.ProbeRecordIconStyleClass = "probe-record";
WebInspector.TimelineRecordTreeElement.ConsoleProfileIconStyleClass = "console-profile-record";
-WebInspector.TimelineRecordTreeElement.GarbageCollectionIconStyleClass = "garbage-collection-profile-record";
