<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193445] branches/safari-601.1.46-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193445">193445</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 12:52:43 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191651">r191651</a>. rdar://problem/23581597</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceJavaScriptCoreinspectorprotocolTimelinejson">branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgentcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgenth">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorTimelineRecordFactorycpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorTimelineRecordFactoryh">branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIChangeLog">branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceBaseObjectjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceProtocolPageObserverjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:52:43 UTC (rev 193445)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecoraro@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 <timothy@apple.com>
+
</ins><span class="cx"> Merge r189104. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceJavaScriptCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/protocol/Timeline.json (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-12-04 20:52:32 UTC (rev 193444)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-12-04 20:52:43 UTC (rev 193445)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx"> "TimerRemove",
</span><span class="cx"> "TimerFire",
</span><span class="cx"> "EvaluateScript",
</span><del>- "MarkLoad",
- "MarkDOMContent",
</del><span class="cx"> "TimeStamp",
</span><span class="cx"> "Time",
</span><span class="cx"> "TimeEnd",
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecoraro@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 <timothy@apple.com>
+
</ins><span class="cx"> Merge r189104. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -730,9 +730,6 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
</span><span class="cx"> {
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didMarkDOMContentEvent(frame);
-
</del><span class="cx"> if (!frame.isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -745,15 +742,9 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents& instrumentingAgents, Frame* frame)
</span><span class="cx"> {
</span><del>- if (!frame)
</del><ins>+ if (!frame || !frame->isMainFrame())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didMarkLoadEvent(*frame);
-
- if (!frame->isMainFrame())
- return;
-
</del><span class="cx"> if (InspectorPageAgent* pageAgent = instrumentingAgents.inspectorPageAgent())
</span><span class="cx"> pageAgent->loadEventFired();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -535,16 +535,6 @@
</span><span class="cx"> appendRecord(TimelineRecordFactory::createTimeStampData(message), TimelineRecordType::TimeEnd, true, &frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void InspectorTimelineAgent::didCommitLoad()
</span><span class="cx"> {
</span><span class="cx"> clearRecordStack();
</span><span class="lines">@@ -637,11 +627,6 @@
</span><span class="cx"> case TimelineRecordType::EvaluateScript:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::EvaluateScript;
</span><span class="cx">
</span><del>- case TimelineRecordType::MarkLoad:
- return Inspector::Protocol::Timeline::EventType::MarkLoad;
- case TimelineRecordType::MarkDOMContent:
- return Inspector::Protocol::Timeline::EventType::MarkDOMContent;
-
</del><span class="cx"> case TimelineRecordType::TimeStamp:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::TimeStamp;
</span><span class="cx"> case TimelineRecordType::Time:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -84,9 +84,6 @@
</span><span class="cx">
</span><span class="cx"> EvaluateScript,
</span><span class="cx">
</span><del>- MarkLoad,
- MarkDOMContent,
-
</del><span class="cx"> TimeStamp,
</span><span class="cx"> Time,
</span><span class="cx"> TimeEnd,
</span><span class="lines">@@ -166,8 +163,6 @@
</span><span class="cx"> void willWriteHTML(unsigned startLine, Frame*);
</span><span class="cx"> void didWriteHTML(unsigned endLine);
</span><span class="cx"> void didTimeStamp(Frame&, const String&);
</span><del>- void didMarkDOMContentEvent(Frame&);
- void didMarkLoadEvent(Frame&);
</del><span class="cx"> void didRequestAnimationFrame(int callbackId, Frame*);
</span><span class="cx"> void didCancelAnimationFrame(int callbackId, Frame*);
</span><span class="cx"> void willFireAnimationFrame(int callbackId, Frame*);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -162,13 +162,6 @@
</span><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createMarkData(bool isMainFrame)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setBoolean("isMainFrame", isMainFrame);
- return WTF::move(data);
-}
-
</del><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.h (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -81,8 +81,6 @@
</span><span class="cx">
</span><span class="cx"> static Ref<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
</span><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createMarkData(bool isMainFrame);
-
</del><span class="cx"> static Ref<Inspector::InspectorObject> createParseHTMLData(unsigned startLine);
</span><span class="cx">
</span><span class="cx"> static Ref<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191651. rdar://problem/23581597
+
+ 2015-10-27 Joseph Pecoraro <pecoraro@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 <timothy@apple.com>
+
</ins><span class="cx"> Merge r189104. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Base/Object.js (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> static singleFireEventListener(eventType, listener, thisObject)
</span><span class="cx"> {
</span><del>- let wrappedCallback = function() {
</del><ins>+ var wrappedCallback = function() {
</ins><span class="cx"> this.removeEventListener(eventType, wrappedCallback, null);
</span><span class="cx"> listener.apply(thisObject, arguments);
</span><span class="cx"> }.bind(this);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIUserInterfaceControllersCSSStyleManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> preferredInspectorStyleSheetForFrame(frame, callback)
</span><span class="cx"> {
</span><span class="cx"> var inspectorStyleSheets = this._inspectorStyleSheetsForFrame(frame);
</span><del>- for (let styleSheet of inspectorStyleSheets) {
</del><ins>+ for (var styleSheet of inspectorStyleSheets) {
</ins><span class="cx"> if (styleSheet[WebInspector.CSSStyleManager.PreferredInspectorStyleSheetSymbol]) {
</span><span class="cx"> callback(styleSheet);
</span><span class="cx"> return;
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> if (CSSAgent.createStyleSheet) {
</span><span class="cx"> CSSAgent.createStyleSheet(frame.id, function(error, styleSheetId) {
</span><del>- let styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
</del><ins>+ var styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
</ins><span class="cx"> styleSheet[WebInspector.CSSStyleManager.PreferredInspectorStyleSheetSymbol] = true;
</span><span class="cx"> callback(styleSheet);
</span><span class="cx"> });
</span><span class="lines">@@ -174,8 +174,8 @@
</span><span class="cx"> // Exploit that to create the Inspector StyleSheet for the document.body node in
</span><span class="cx"> // this frame, then get the StyleSheet for the new rule.
</span><span class="cx">
</span><del>- let expression = appendWebInspectorSourceURL("document");
- let contextId = frame.pageExecutionContext.id;
</del><ins>+ var expression = appendWebInspectorSourceURL("document");
+ var contextId = frame.pageExecutionContext.id;
</ins><span class="cx"> RuntimeAgent.evaluate.invoke({expression, objectGroup: "", includeCommandLineAPI: false, doNotPauseOnExceptionsAndMuteConsole: true, contextId, returnByValue: false, generatePreview: false}, documentAvailable);
</span><span class="cx">
</span><span class="cx"> function documentAvailable(error, documentRemoteObjectPayload)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let remoteObject = WebInspector.RemoteObject.fromPayload(documentRemoteObjectPayload);
</del><ins>+ var remoteObject = WebInspector.RemoteObject.fromPayload(documentRemoteObjectPayload);
</ins><span class="cx"> remoteObject.pushNodeToFrontend(documentNodeAvailable.bind(null, remoteObject));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let selector = ""; // Intentionally empty.
</del><ins>+ var selector = ""; // Intentionally empty.
</ins><span class="cx"> CSSAgent.addRule(bodyNodeId, selector, cssRuleAvailable);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,8 +220,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let styleSheetId = payload.ruleId.styleSheetId;
- let styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
</del><ins>+ var styleSheetId = payload.ruleId.styleSheetId;
+ var styleSheet = WebInspector.cssStyleManager.styleSheetForIdentifier(styleSheetId);
</ins><span class="cx"> if (!styleSheet) {
</span><span class="cx"> callback(null);
</span><span class="cx"> return;
</span><span class="lines">@@ -263,9 +263,9 @@
</span><span class="cx"> styleSheetAdded(styleSheetInfo)
</span><span class="cx"> {
</span><span class="cx"> console.assert(!this._styleSheetIdentifierMap.has(styleSheetInfo.styleSheetId), "Attempted to add a CSSStyleSheet but identifier was already in use");
</span><del>- let styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
- let parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
- let origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
</del><ins>+ var styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
+ var parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
+ var origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
</ins><span class="cx"> styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame, origin, styleSheetInfo.isInline, styleSheetInfo.startLine, styleSheetInfo.startColumn);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.CSSStyleManager.Event.StyleSheetAdded, {styleSheet});
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> styleSheetRemoved(styleSheetIdentifier)
</span><span class="cx"> {
</span><del>- let styleSheet = this._styleSheetIdentifierMap.get(styleSheetIdentifier);
</del><ins>+ var styleSheet = this._styleSheetIdentifierMap.get(styleSheetIdentifier);
</ins><span class="cx"> console.assert(styleSheet, "Attempted to remove a CSSStyleSheet that was not tracked");
</span><span class="cx"> if (!styleSheet)
</span><span class="cx"> return;
</span><span class="lines">@@ -287,9 +287,9 @@
</span><span class="cx">
</span><span class="cx"> _inspectorStyleSheetsForFrame(frame)
</span><span class="cx"> {
</span><del>- let styleSheets = [];
</del><ins>+ var styleSheets = [];
</ins><span class="cx">
</span><del>- for (let styleSheet of this.styleSheets) {
</del><ins>+ for (var styleSheet of this.styleSheets) {
</ins><span class="cx"> if (styleSheet.isInspectorStyleSheet() && styleSheet.parentFrame === frame)
</span><span class="cx"> styleSheets.push(styleSheet);
</span><span class="cx"> }
</span><span class="lines">@@ -410,16 +410,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (let styleSheetInfo of styleSheets) {
- let parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
- let origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
</del><ins>+ for (var styleSheetInfo of styleSheets) {
+ var parentFrame = WebInspector.frameResourceManager.frameForIdentifier(styleSheetInfo.frameId);
+ var origin = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(styleSheetInfo.origin);
</ins><span class="cx">
</span><span class="cx"> // COMPATIBILITY (iOS 9): The info did not have 'isInline', 'startLine', and 'startColumn', so make false and 0 in these cases.
</span><span class="cx"> var isInline = styleSheetInfo.isInline || false;
</span><span class="cx"> var startLine = styleSheetInfo.startLine || 0;
</span><span class="cx"> var startColumn = styleSheetInfo.startColumn || 0;
</span><span class="cx">
</span><del>- let styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
</del><ins>+ var styleSheet = this.styleSheetForIdentifier(styleSheetInfo.styleSheetId);
</ins><span class="cx"> styleSheet.updateInfo(styleSheetInfo.sourceURL, parentFrame, origin, isInline, startLine, startColumn);
</span><span class="cx">
</span><span class="cx"> var key = this._frameURLMapKey(parentFrame, styleSheetInfo.sourceURL);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -232,6 +232,42 @@
</span><span class="cx"> return records;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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
+
</ins><span class="cx"> _processRecord(recordPayload, parentRecordPayload)
</span><span class="cx"> {
</span><span class="cx"> var startTime = this.activeRecording.computeElapsedTime(recordPayload.startTime);
</span><span class="lines">@@ -400,48 +436,10 @@
</span><span class="cx">
</span><span class="cx"> _processEvent(recordPayload, parentRecordPayload)
</span><span class="cx"> {
</span><del>- var startTime = this.activeRecording.computeElapsedTime(recordPayload.startTime);
- var endTime = this.activeRecording.computeElapsedTime(recordPayload.endTime);
-
</del><span class="cx"> switch (recordPayload.type) {
</span><del>- 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;
-
</del><span class="cx"> case TimelineAgent.EventType.TimeStamp:
</span><del>- var eventMarker = new WebInspector.TimelineMarker(startTime, WebInspector.TimelineMarker.Type.TimeStamp);
</del><ins>+ var timestamp = this.activeRecording.computeElapsedTime(recordPayload.startTime);
+ var eventMarker = new WebInspector.TimelineMarker(timestamp, WebInspector.TimelineMarker.Type.TimeStamp);
</ins><span class="cx"> this._activeRecording.addEventMarker(eventMarker);
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIUserInterfaceModelsDOMNodeStylesjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> this.refresh();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let selector = this._node.appropriateSelectorFor(true);
</del><ins>+ var selector = this._node.appropriateSelectorFor(true);
</ins><span class="cx">
</span><span class="cx"> // COMPATIBILITY (iOS 9): Before CSS.createStyleSheet, CSS.addRule could be called with a contextNode.
</span><span class="cx"> if (!CSSAgent.createStyleSheet) {
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIUserInterfaceProtocolPageObserverjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Protocol/PageObserver.js (193444 => 193445)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx">
</span><span class="cx"> domContentEventFired(timestamp)
</span><span class="cx"> {
</span><del>- // Covered by Timeline "MarkDOMContent" record.
</del><ins>+ WebInspector.timelineManager.pageDOMContentLoadedEventFired(timestamp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> loadEventFired(timestamp)
</span><span class="cx"> {
</span><del>- WebInspector.timelineManager.pageDidLoad(timestamp);
</del><ins>+ WebInspector.timelineManager.pageLoadEventFired(timestamp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> frameNavigated(frame, loaderId)
</span></span></pre>
</div>
</div>
</body>
</html>