Diff
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog (193446 => 193447)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/ChangeLog 2015-12-04 20:53:02 UTC (rev 193447)
@@ -1,3 +1,16 @@
+2015-12-02 Timothy Hatcher <timo...@apple.com>
+
+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecor...@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:
+
2015-12-04 Timothy Hatcher <timo...@apple.com>
Merge r191651. rdar://problem/23581597
Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json (193446 => 193447)
--- branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json 2015-12-04 20:52:52 UTC (rev 193446)
+++ branches/safari-601.1.46-branch/Source/_javascript_Core/inspector/protocol/Timeline.json 2015-12-04 20:53:02 UTC (rev 193447)
@@ -16,7 +16,6 @@
"Composite",
"RenderingFrame",
"ScrollLayer",
- "ParseHTML",
"TimerInstall",
"TimerRemove",
"TimerFire",
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193446 => 193447)
--- 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)
@@ -1,5 +1,39 @@
2015-12-02 Timothy Hatcher <timo...@apple.com>
+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecor...@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 <timo...@apple.com>
+
Merge r191732. rdar://problem/23581597
2015-10-29 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLDocumentParser.cpp (193446 => 193447)
--- 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)
@@ -28,12 +28,12 @@
#include "HTMLDocumentParser.h"
#include "DocumentFragment.h"
+#include "Frame.h"
+#include "HTMLDocument.h"
#include "HTMLParserScheduler.h"
#include "HTMLPreloadScanner.h"
#include "HTMLScriptRunner.h"
#include "HTMLTreeBuilder.h"
-#include "HTMLDocument.h"
-#include "InspectorInstrumentation.h"
namespace WebCore {
@@ -247,13 +247,6 @@
PumpSession session(m_pumpSessionNestingLevel, contextForParsingSession());
- // 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());
-
m_xssAuditor.init(document(), &m_xssAuditorDelegate);
while (canTakeNextToken(mode, session) && !session.needsYield) {
@@ -294,8 +287,6 @@
}
m_preloadScanner->scan(*m_preloader, *document());
}
-
- InspectorInstrumentation::didWriteHTML(cookie, m_input.current().currentLine().zeroBasedInt());
}
void HTMLDocumentParser::constructTreeFromHTMLToken(HTMLTokenizer::TokenPtr& rawToken)
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.cpp (193446 => 193447)
--- 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)
@@ -878,22 +878,6 @@
}
}
-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);
-}
-
// _javascript_Core InspectorDebuggerAgent should know Console MessageTypes.
static bool isConsoleAssertMessage(MessageSource source, MessageType type)
{
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorInstrumentation.h (193446 => 193447)
--- 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)
@@ -210,9 +210,6 @@
static void didRunJavaScriptDialog(const InspectorInstrumentationCookie&);
static void willDestroyCachedResource(CachedResource&);
- static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned startLine);
- static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned endLine);
-
static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
// FIXME: Convert to ScriptArguments to match non-worker context.
@@ -396,9 +393,6 @@
static void didRunJavaScriptDialogImpl(const InspectorInstrumentationCookie&);
static void willDestroyCachedResourceImpl(CachedResource&);
- static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents&, unsigned startLine, Frame*);
- static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned endLine);
-
static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
@@ -1121,21 +1115,6 @@
willDestroyCachedResourceImpl(cachedResource);
}
-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);
-}
-
inline void InspectorInstrumentation::didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Page* page)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.cpp (193446 => 193447)
--- 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)
@@ -415,20 +415,6 @@
didCompleteCurrentRecord(TimelineRecordType::ScrollLayer);
}
-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);
- }
-}
-
void InspectorTimelineAgent::didInstallTimer(int timerId, int timeout, bool singleShot, Frame* frame)
{
appendRecord(TimelineRecordFactory::createTimerInstallData(timerId, timeout, singleShot), TimelineRecordType::TimerInstall, true, frame);
@@ -595,9 +581,6 @@
case TimelineRecordType::ScrollLayer:
return Inspector::Protocol::Timeline::EventType::ScrollLayer;
- case TimelineRecordType::ParseHTML:
- return Inspector::Protocol::Timeline::EventType::ParseHTML;
-
case TimelineRecordType::TimerInstall:
return Inspector::Protocol::Timeline::EventType::TimerInstall;
case TimelineRecordType::TimerRemove:
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/InspectorTimelineAgent.h (193446 => 193447)
--- 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)
@@ -72,8 +72,6 @@
RenderingFrame,
ScrollLayer,
- ParseHTML,
-
TimerInstall,
TimerRemove,
TimerFire,
@@ -156,8 +154,6 @@
void willRecalculateStyle(Frame*);
void didRecalculateStyle();
void didScheduleStyleRecalculation(Frame*);
- void willWriteHTML(unsigned startLine, Frame*);
- void didWriteHTML(unsigned endLine);
void didTimeStamp(Frame&, const String&);
void didRequestAnimationFrame(int callbackId, Frame*);
void didCancelAnimationFrame(int callbackId, Frame*);
Modified: branches/safari-601.1.46-branch/Source/WebCore/inspector/TimelineRecordFactory.cpp (193446 => 193447)
--- 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)
@@ -149,13 +149,6 @@
return WTF::move(data);
}
-Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
-{
- Ref<InspectorObject> data = ""
- data->setInteger(ASCIILiteral("startLine"), startLine);
- return WTF::move(data);
-}
-
Ref<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
{
Ref<InspectorObject> data = ""
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog (193446 => 193447)
--- 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)
@@ -1,5 +1,19 @@
2015-12-02 Timothy Hatcher <timo...@apple.com>
+ Merge r191967. rdar://problem/23221163
+
+ 2015-11-03 Joseph Pecoraro <pecor...@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 <timo...@apple.com>
+
Merge r191732. rdar://problem/23581597
2015-10-29 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193446 => 193447)
--- 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)
@@ -332,10 +332,7 @@
if (!recordPayload.children)
return null;
- var children = this._processNestedRecords(recordPayload.children, recordPayload);
- if (!children.length)
- return null;
- return new WebInspector.RenderingFrameTimelineRecord(startTime, endTime, children);
+ return new WebInspector.RenderingFrameTimelineRecord(startTime, endTime);
case TimelineAgent.EventType.EvaluateScript:
if (!sourceCodeLocation) {
