Diff
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:52:43 UTC (rev 193445)
@@ -1,5 +1,18 @@
2015-12-04 Timothy Hatcher <timo...@apple.com>
+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available
+ https://bugs.webkit.org/show_bug.cgi?id=150615
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/Timeline.json:
+
+2015-12-04 Timothy Hatcher <timo...@apple.com>
+
Merge r189104. rdar://problem/23581597
2015-08-28 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json 2015-12-04 20:52:43 UTC (rev 193445)
@@ -21,8 +21,6 @@
"TimerRemove",
"TimerFire",
"EvaluateScript",
- "MarkLoad",
- "MarkDOMContent",
"TimeStamp",
"Time",
"TimeEnd",
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:52:43 UTC (rev 193445)
@@ -1,5 +1,32 @@
2015-12-04 Timothy Hatcher <timo...@apple.com>
+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available
+ https://bugs.webkit.org/show_bug.cgi?id=150615
+
+ Reviewed by Timothy Hatcher.
+
+ The timestamp only event data is already available from `Page.domContentEventFired`
+ and `Page.loadEventFired` events. We can drop the Timeline specific events in
+ favor of these which have existed for a very long time (before iOS 7).
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::loadEventFiredImpl):
+ (WebCore::InspectorInstrumentation::domContentLoadedEventFiredImpl): Deleted.
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didMarkDOMContentEvent): Deleted.
+ (WebCore::InspectorTimelineAgent::didMarkLoadEvent): Deleted.
+ (WebCore::toProtocol): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createMarkData): Deleted.
+ * inspector/TimelineRecordFactory.h:
+
+2015-12-04 Timothy Hatcher <timo...@apple.com>
+
Merge r189104. rdar://problem/23581597
2015-08-28 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 20:52:43 UTC (rev 193445)
@@ -730,9 +730,6 @@
void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didMarkDOMContentEvent(frame);
-
if (!frame.isMainFrame())
return;
@@ -745,15 +742,9 @@
void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame* frame)
{
- if (!frame)
+ if (!frame || !frame->isMainFrame())
return;
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didMarkLoadEvent(*frame);
-
- if (!frame->isMainFrame())
- return;
-
if (InspectorPageAgent* pageAgent = instrumentingAgents.inspectorPageAgent())
pageAgent->loadEventFired();
}
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 20:52:43 UTC (rev 193445)
@@ -535,16 +535,6 @@
appendRecord(TimelineRecordFactory::createTimeStampData(message), TimelineRecordType::TimeEnd, true, &frame);
}
-void InspectorTimelineAgent::didMarkDOMContentEvent(Frame& frame)
-{
- appendRecord(TimelineRecordFactory::createMarkData(frame.isMainFrame()), TimelineRecordType::MarkDOMContent, false, &frame);
-}
-
-void InspectorTimelineAgent::didMarkLoadEvent(Frame& frame)
-{
- appendRecord(TimelineRecordFactory::createMarkData(frame.isMainFrame()), TimelineRecordType::MarkLoad, false, &frame);
-}
-
void InspectorTimelineAgent::didCommitLoad()
{
clearRecordStack();
@@ -637,11 +627,6 @@
case TimelineRecordType::EvaluateScript:
return Inspector::Protocol::Timeline::EventType::EvaluateScript;
- case TimelineRecordType::MarkLoad:
- return Inspector::Protocol::Timeline::EventType::MarkLoad;
- case TimelineRecordType::MarkDOMContent:
- return Inspector::Protocol::Timeline::EventType::MarkDOMContent;
-
case TimelineRecordType::TimeStamp:
return Inspector::Protocol::Timeline::EventType::TimeStamp;
case TimelineRecordType::Time:
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 20:52:43 UTC (rev 193445)
@@ -84,9 +84,6 @@
EvaluateScript,
- MarkLoad,
- MarkDOMContent,
-
TimeStamp,
Time,
TimeEnd,
@@ -166,8 +163,6 @@
void willWriteHTML(unsigned startLine, Frame*);
void didWriteHTML(unsigned endLine);
void didTimeStamp(Frame&, const String&);
- void didMarkDOMContentEvent(Frame&);
- void didMarkLoadEvent(Frame&);
void didRequestAnimationFrame(int callbackId, Frame*);
void didCancelAnimationFrame(int callbackId, Frame*);
void willFireAnimationFrame(int callbackId, Frame*);
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-04 20:52:43 UTC (rev 193445)
@@ -162,13 +162,6 @@
return WTF::move(data);
}
-Ref<InspectorObject> TimelineRecordFactory::createMarkData(bool isMainFrame)
-{
- Ref<InspectorObject> data = ""
- data->setBoolean("isMainFrame", isMainFrame);
- return WTF::move(data);
-}
-
Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
{
Ref<InspectorObject> data = ""
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.h (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.h 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.h 2015-12-04 20:52:43 UTC (rev 193445)
@@ -81,8 +81,6 @@
static Ref<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
- static Ref<Inspector::InspectorObject> createMarkData(bool isMainFrame);
-
static Ref<Inspector::InspectorObject> createParseHTMLData(unsigned startLine);
static Ref<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 20:52:43 UTC (rev 193445)
@@ -1,5 +1,29 @@
2015-12-04 Timothy Hatcher <timo...@apple.com>
+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available
+ https://bugs.webkit.org/show_bug.cgi?id=150615
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._processEvent):
+ Remove the now unneed mark event handling.
+
+ (WebInspector.TimelineManager.prototype.pageDOMContentLoadedEventFired):
+ (WebInspector.TimelineManager.prototype.pageLoadEventFired):
+ Update the main frame and create markers for the current recording.
+
+ * UserInterface/Protocol/PageObserver.js:
+ (WebInspector.PageObserver.prototype.domContentEventFired):
+ (WebInspector.PageObserver.prototype.loadEventFired):
+ Forward to TimelineManager.
+
+2015-12-04 Timothy Hatcher <timo...@apple.com>
+
Merge r189104. rdar://problem/23581597
2015-08-28 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Base/Object.js (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2015-12-04 20:52:43 UTC (rev 193445)
@@ -57,7 +57,7 @@
static singleFireEventListener(eventType, listener, thisObject)
{
- let wrappedCallback = function() {
+ var wrappedCallback = function() {
this.removeEventListener(eventType, wrappedCallback, null);
listener.apply(thisObject, arguments);
}.bind(this);
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-12-04 20:52:43 UTC (rev 193445)
@@ -153,7 +153,7 @@
preferredInspectorStyleSheetForFrame(frame, callback)
{
var inspectorStyleSheets = this._inspectorStyleSheetsForFrame(frame);
- for (let styleSheet of inspectorStyleSheets) {
+ for (var styleSheet of inspectorStyleSheets) {
if (styleSheet[WebInspector.CSSStyleManager.PreferredInspectorStyleSheetSymbol]) {
callback(styleSheet);
return;
@@ -162,7 +162,7 @@
if (CSSAgent.createStyleSheet) {
CSSAgent.createStyleSheet(frame.id, function(error, styleSheetId) {
- let styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
+ var styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
styleSheet[WebInspector.CSSStyleManager.PreferredInspectorStyleSheetSymbol] = true;
callback(styleSheet);
});
@@ -174,8 +174,8 @@
// Exploit that to create the Inspector StyleSheet for the document.body node in
// this frame, then get the StyleSheet for the new rule.
- let _expression_ = appendWebInspectorSourceURL("document");
- let contextId = frame.pageExecutionContext.id;
+ var _expression_ = appendWebInspectorSourceURL("document");
+ var contextId = frame.pageExecutionContext.id;
RuntimeAgent.evaluate.invoke({_expression_, objectGroup: "", includeCommandLineAPI: false, doNotPauseOnExceptionsAndMuteConsole: true, contextId, returnByValue: false, generatePreview: false}, documentAvailable);
function documentAvailable(error, documentRemoteObjectPayload)
@@ -185,7 +185,7 @@
return;
}
- let remoteObject = WebInspector.RemoteObject.fromPayload(documentRemoteObjectPayload);
+ var remoteObject = WebInspector.RemoteObject.fromPayload(documentRemoteObjectPayload);
remoteObject.pushNodeToFrontend(documentNodeAvailable.bind(null, remoteObject));
}
@@ -209,7 +209,7 @@
return;
}
- let selector = ""; // Intentionally empty.
+ var selector = ""; // Intentionally empty.
CSSAgent.addRule(bodyNodeId, selector, cssRuleAvailable);
}
@@ -220,8 +220,8 @@
return;
}
- let styleSheetId = payload.ruleId.styleSheetId;
- let styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
+ var styleSheetId = payload.ruleId.styleSheetId;
+ var styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
if (!styleSheet) {
callback(null);
return;
@@ -263,9 +263,9 @@
styleSheetAdded(styleSheetInfo)
{
console.assert(!this._styleSheetIdentifierMap.has(styleSheetInfo.styleSheetId), "Attempted to add a CSSStyleSheet but identifier was already in use");
- let styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
- let parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
- let origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
+ var styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
+ var parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
+ var origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame, origin, styleSheetInfo.isInline, styleSheetInfo.startLine, styleSheetInfo.startColumn);
this.dispatchEventToListeners(WebInspector.CSSStyleManager.Event.StyleSheetAdded, {styleSheet});
@@ -273,7 +273,7 @@
styleSheetRemoved(styleSheetIdentifier)
{
- let styleSheet = this._styleSheetIdentifierMap.get(styleSheetIdentifier);
+ var styleSheet = this._styleSheetIdentifierMap.get(styleSheetIdentifier);
console.assert(styleSheet, "Attempted to remove a CSSStyleSheet that was not tracked");
if (!styleSheet)
return;
@@ -287,9 +287,9 @@
_inspectorStyleSheetsForFrame(frame)
{
- let styleSheets = [];
+ var styleSheets = [];
- for (let styleSheet of this.styleSheets) {
+ for (var styleSheet of this.styleSheets) {
if (styleSheet.isInspectorStyleSheet() && styleSheet.parentFrame === frame)
styleSheets.push(styleSheet);
}
@@ -410,16 +410,16 @@
return;
}
- for (let styleSheetInfo of styleSheets) {
- let parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
- let origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
+ for (var styleSheetInfo of styleSheets) {
+ var parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
+ var origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
// COMPATIBILITY (iOS 9): The info did not have 'isInline', 'startLine', and 'startColumn', so make false and 0 in these cases.
var isInline = styleSheetInfo.isInline || false;
var startLine = styleSheetInfo.startLine || 0;
var startColumn = styleSheetInfo.startColumn || 0;
- let styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
+ var styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame, origin, isInline, startLine, startColumn);
var key = this._frameURLMapKey(parentFrame, styleSheetInfo.sourceURL);
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-04 20:52:43 UTC (rev 193445)
@@ -232,6 +232,42 @@
return records;
}
+ // Protected
+
+ pageDOMContentLoadedEventFired(timestamp)
+ {
+ // Called from WebInspector.PageObserver.
+
+ console.assert(this._activeRecording);
+ console.assert(isNaN(WebInspector.frameResourceManager.mainFrame.domContentReadyEventTimestamp));
+
+ var computedTimestamp = this.activeRecording.computeElapsedTime(timestamp);
+
+ WebInspector.frameResourceManager.mainFrame.markDOMContentReadyEvent(computedTimestamp);
+
+ var eventMarker = new WebInspector.TimelineMarker(computedTimestamp, WebInspector.TimelineMarker.Type.DOMContentEvent);
+ this._activeRecording.addEventMarker(eventMarker);
+ }
+
+ pageLoadEventFired(timestamp)
+ {
+ // Called from WebInspector.PageObserver.
+
+ console.assert(this._activeRecording);
+ console.assert(isNaN(WebInspector.frameResourceManager.mainFrame.loadEventTimestamp));
+
+ var computedTimestamp = this.activeRecording.computeElapsedTime(timestamp);
+
+ WebInspector.frameResourceManager.mainFrame.markLoadEvent(computedTimestamp);
+
+ var eventMarker = new WebInspector.TimelineMarker(computedTimestamp, WebInspector.TimelineMarker.Type.LoadEvent);
+ this._activeRecording.addEventMarker(eventMarker);
+
+ this._stopAutoRecordingSoon();
+ }
+
+ // Private
+
_processRecord(recordPayload, parentRecordPayload)
{
var startTime = this.activeRecording.computeElapsedTime(recordPayload.startTime);
@@ -400,48 +436,10 @@
_processEvent(recordPayload, parentRecordPayload)
{
- var startTime = this.activeRecording.computeElapsedTime(recordPayload.startTime);
- var endTime = this.activeRecording.computeElapsedTime(recordPayload.endTime);
-
switch (recordPayload.type) {
- case TimelineAgent.EventType.MarkLoad:
- console.assert(isNaN(endTime));
-
- var frame = WebInspector.frameResourceManager.frameForIdentifier(recordPayload.frameId);
- console.assert(frame);
- if (!frame)
- break;
-
- frame.markLoadEvent(startTime);
-
- if (!frame.isMainFrame())
- break;
-
- var eventMarker = new WebInspector.TimelineMarker(startTime, WebInspector.TimelineMarker.Type.LoadEvent);
- this._activeRecording.addEventMarker(eventMarker);
-
- this._stopAutoRecordingSoon();
- break;
-
- case TimelineAgent.EventType.MarkDOMContent:
- console.assert(isNaN(endTime));
-
- var frame = WebInspector.frameResourceManager.frameForIdentifier(recordPayload.frameId);
- console.assert(frame);
- if (!frame)
- break;
-
- frame.markDOMContentReadyEvent(startTime);
-
- if (!frame.isMainFrame())
- break;
-
- var eventMarker = new WebInspector.TimelineMarker(startTime, WebInspector.TimelineMarker.Type.DOMContentEvent);
- this._activeRecording.addEventMarker(eventMarker);
- break;
-
case TimelineAgent.EventType.TimeStamp:
- var eventMarker = new WebInspector.TimelineMarker(startTime, WebInspector.TimelineMarker.Type.TimeStamp);
+ var timestamp = this.activeRecording.computeElapsedTime(recordPayload.startTime);
+ var eventMarker = new WebInspector.TimelineMarker(timestamp, WebInspector.TimelineMarker.Type.TimeStamp);
this._activeRecording.addEventMarker(eventMarker);
break;
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-12-04 20:52:43 UTC (rev 193445)
@@ -255,7 +255,7 @@
this.refresh();
}
- let selector = this._node.appropriateSelectorFor(true);
+ var selector = this._node.appropriateSelectorFor(true);
// COMPATIBILITY (iOS 9): Before CSS.createStyleSheet, CSS.addRule could be called with a contextNode.
if (!CSSAgent.createStyleSheet) {
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js (193444 => 193445)
--- branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js 2015-12-04 20:52:43 UTC (rev 193445)
@@ -29,12 +29,12 @@
domContentEventFired(timestamp)
{
- // Covered by Timeline "MarkDOMContent" record.
+ WebInspector.timelineManager.pageDOMContentLoadedEventFired(timestamp);
}
loadEventFired(timestamp)
{
- WebInspector.timelineManager.pageDidLoad(timestamp);
+ WebInspector.timelineManager.pageLoadEventFired(timestamp);
}
frameNavigated(frame, loaderId)
