<!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>[193447] 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/193447">193447</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 12:53:02 -0800 (Fri, 04 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191967">r191967</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="#branchessafari601146branchSourceWebCorehtmlparserHTMLDocumentParsercpp">branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLDocumentParser.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationh">branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.h</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="#branchessafari601146branchSourceWebInspectorUIChangeLog">branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.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 (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Handle or Remove ParseHTML Timeline Event Records
+ https://bugs.webkit.org/show_bug.cgi?id=150689
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/Timeline.json:
+
</ins><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191651. rdar://problem/23581597
</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 (193446 => 193447)</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:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx"> "Composite",
</span><span class="cx"> "RenderingFrame",
</span><span class="cx"> "ScrollLayer",
</span><del>- "ParseHTML",
</del><span class="cx"> "TimerInstall",
</span><span class="cx"> "TimerRemove",
</span><span class="cx"> "TimerFire",
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Handle or Remove ParseHTML Timeline Event Records
+ https://bugs.webkit.org/show_bug.cgi?id=150689
+
+ Reviewed by Timothy Hatcher.
+
+ Remove ParseHTML nesting recordings. We were not using them
+ and for most pages their self-time is very small in comparison
+ to other events. We may consider adding it back later for
+ UI purposes but for now the frontend doesn't use the records
+ so lets remove it.
+
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::pumpTokenizer): Deleted.
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::willWriteHTMLImpl): Deleted.
+ (WebCore::InspectorInstrumentation::didWriteHTMLImpl): Deleted.
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::willWriteHTML): Deleted.
+ (WebCore::InspectorInstrumentation::didWriteHTML): Deleted.
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willWriteHTML): Deleted.
+ (WebCore::InspectorTimelineAgent::didWriteHTML): Deleted.
+ (WebCore::toProtocol): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createParseHTMLData): Deleted.
+ * inspector/TimelineRecordFactory.h:
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191732. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorehtmlparserHTMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLDocumentParser.cpp (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx"> #include "HTMLDocumentParser.h"
</span><span class="cx">
</span><span class="cx"> #include "DocumentFragment.h"
</span><ins>+#include "Frame.h"
+#include "HTMLDocument.h"
</ins><span class="cx"> #include "HTMLParserScheduler.h"
</span><span class="cx"> #include "HTMLPreloadScanner.h"
</span><span class="cx"> #include "HTMLScriptRunner.h"
</span><span class="cx"> #include "HTMLTreeBuilder.h"
</span><del>-#include "HTMLDocument.h"
-#include "InspectorInstrumentation.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -247,13 +247,6 @@
</span><span class="cx">
</span><span class="cx"> PumpSession session(m_pumpSessionNestingLevel, contextForParsingSession());
</span><span class="cx">
</span><del>- // We tell the InspectorInstrumentation about every pump, even if we
- // end up pumping nothing. It can filter out empty pumps itself.
- // FIXME: m_input.current().length() is only accurate if we
- // end up parsing the whole buffer in this pump. We should pass how
- // much we parsed as part of didWriteHTML instead of willWriteHTML.
- auto cookie = InspectorInstrumentation::willWriteHTML(document(), m_input.current().currentLine().zeroBasedInt());
-
</del><span class="cx"> m_xssAuditor.init(document(), &m_xssAuditorDelegate);
</span><span class="cx">
</span><span class="cx"> while (canTakeNextToken(mode, session) && !session.needsYield) {
</span><span class="lines">@@ -294,8 +287,6 @@
</span><span class="cx"> }
</span><span class="cx"> m_preloadScanner->scan(*m_preloader, *document());
</span><span class="cx"> }
</span><del>-
- InspectorInstrumentation::didWriteHTML(cookie, m_input.current().currentLine().zeroBasedInt());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLDocumentParser::constructTreeFromHTMLToken(HTMLTokenizer::TokenPtr& rawToken)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -878,22 +878,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(InstrumentingAgents& instrumentingAgents, unsigned startLine, Frame* frame)
-{
- int timelineAgentId = 0;
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent()) {
- timelineAgent->willWriteHTML(startLine, frame);
- timelineAgentId = timelineAgent->id();
- }
- return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
-}
-
-void InspectorInstrumentation::didWriteHTMLImpl(const InspectorInstrumentationCookie& cookie, unsigned endLine)
-{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didWriteHTML(endLine);
-}
-
</del><span class="cx"> // JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
</span><span class="cx"> static bool isConsoleAssertMessage(MessageSource source, MessageType type)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.h (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.h 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.h 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -210,9 +210,6 @@
</span><span class="cx"> static void didRunJavaScriptDialog(const InspectorInstrumentationCookie&);
</span><span class="cx"> static void willDestroyCachedResource(CachedResource&);
</span><span class="cx">
</span><del>- static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned startLine);
- static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned endLine);
-
</del><span class="cx"> static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert to ScriptArguments to match non-worker context.
</span><span class="lines">@@ -396,9 +393,6 @@
</span><span class="cx"> static void didRunJavaScriptDialogImpl(const InspectorInstrumentationCookie&);
</span><span class="cx"> static void willDestroyCachedResourceImpl(CachedResource&);
</span><span class="cx">
</span><del>- static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents&, unsigned startLine, Frame*);
- static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned endLine);
-
</del><span class="cx"> static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
</span><span class="cx">
</span><span class="cx"> static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</span><span class="lines">@@ -1121,21 +1115,6 @@
</span><span class="cx"> willDestroyCachedResourceImpl(cachedResource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTML(Document* document, unsigned startLine)
-{
- FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
- return willWriteHTMLImpl(*instrumentingAgents, startLine, document->frame());
- return InspectorInstrumentationCookie();
-}
-
-inline void InspectorInstrumentation::didWriteHTML(const InspectorInstrumentationCookie& cookie, unsigned endLine)
-{
- FAST_RETURN_IF_NO_FRONTENDS(void());
- if (cookie.isValid())
- didWriteHTMLImpl(cookie, endLine);
-}
-
</del><span class="cx"> inline void InspectorInstrumentation::didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Page* page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -415,20 +415,6 @@
</span><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::ScrollLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::willWriteHTML(unsigned startLine, Frame* frame)
-{
- pushCurrentRecord(TimelineRecordFactory::createParseHTMLData(startLine), TimelineRecordType::ParseHTML, true, frame);
-}
-
-void InspectorTimelineAgent::didWriteHTML(unsigned endLine)
-{
- if (!m_recordStack.isEmpty()) {
- const TimelineRecordEntry& entry = m_recordStack.last();
- entry.data->setInteger("endLine", endLine);
- didCompleteCurrentRecord(TimelineRecordType::ParseHTML);
- }
-}
-
</del><span class="cx"> void InspectorTimelineAgent::didInstallTimer(int timerId, int timeout, bool singleShot, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> appendRecord(TimelineRecordFactory::createTimerInstallData(timerId, timeout, singleShot), TimelineRecordType::TimerInstall, true, frame);
</span><span class="lines">@@ -595,9 +581,6 @@
</span><span class="cx"> case TimelineRecordType::ScrollLayer:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::ScrollLayer;
</span><span class="cx">
</span><del>- case TimelineRecordType::ParseHTML:
- return Inspector::Protocol::Timeline::EventType::ParseHTML;
-
</del><span class="cx"> case TimelineRecordType::TimerInstall:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::TimerInstall;
</span><span class="cx"> case TimelineRecordType::TimerRemove:
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> RenderingFrame,
</span><span class="cx"> ScrollLayer,
</span><span class="cx">
</span><del>- ParseHTML,
-
</del><span class="cx"> TimerInstall,
</span><span class="cx"> TimerRemove,
</span><span class="cx"> TimerFire,
</span><span class="lines">@@ -156,8 +154,6 @@
</span><span class="cx"> void willRecalculateStyle(Frame*);
</span><span class="cx"> void didRecalculateStyle();
</span><span class="cx"> void didScheduleStyleRecalculation(Frame*);
</span><del>- void willWriteHTML(unsigned startLine, Frame*);
- void didWriteHTML(unsigned endLine);
</del><span class="cx"> void didTimeStamp(Frame&, const String&);
</span><span class="cx"> void didRequestAnimationFrame(int callbackId, Frame*);
</span><span class="cx"> void didCancelAnimationFrame(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 (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -149,13 +149,6 @@
</span><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setInteger(ASCIILiteral("startLine"), startLine);
- return WTF::move(data);
-}
-
</del><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog (193446 => 193447)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Handle or Remove ParseHTML Timeline Event Records
+ https://bugs.webkit.org/show_bug.cgi?id=150689
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._processRecord):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r191732. rdar://problem/23581597
</span><span class="cx">
</span><span class="cx"> 2015-10-29 Joseph Pecoraro <pecoraro@apple.com>
</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 (193446 => 193447)</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:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-04 20:53:02 UTC (rev 193447)
</span><span class="lines">@@ -332,10 +332,7 @@
</span><span class="cx"> if (!recordPayload.children)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- var children = this._processNestedRecords(recordPayload.children, recordPayload);
- if (!children.length)
- return null;
- return new WebInspector.RenderingFrameTimelineRecord(startTime, endTime, children);
</del><ins>+ return new WebInspector.RenderingFrameTimelineRecord(startTime, endTime);
</ins><span class="cx">
</span><span class="cx"> case TimelineAgent.EventType.EvaluateScript:
</span><span class="cx"> if (!sourceCodeLocation) {
</span></span></pre>
</div>
</div>
</body>
</html>