Skip to content

GitLab

T
tangled
Commit 1f0854bc authored by yurys@chromium.org's avatar yurys@chromium.org
Browse files
Options

DevTools: add ParseAuthorStyleSheet events to Timeline 

The operation may take noticable time an may give the user additional information about his page performance.

BUG=424502

Review URL: https://codereview.chromium.org/717573003

git-svn-id: svn://svn.chromium.org/blink/trunk@185190 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6d3095b9
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 0 deletions
third_party/WebKit/LayoutTests/inspector/tracing/parse-author-style-sheet-expected.txt 0 → 100644
View file @ 1f0854bc
Tests that ParseAuthorStyleSheet trace event is recorded.
SUCCESS: found ParseAuthorStyleSheet record
third_party/WebKit/LayoutTests/inspector/tracing/parse-author-style-sheet.html 0 → 100644
View file @ 1f0854bc
<html>
<head>
<script src="../../http/tests/inspector/inspector-test.js"></script>
<script src="../../http/tests/inspector/timeline-test.js"></script>
<script src="../tracing-test.js"></script>
<script>
function importStyle(onComplete)
{
var link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.type = 'text/css';
link.href = 'resources/style.css';
document.head.appendChild(link);
link.onload = onComplete.bind(this, null);
}
function test()
{
InspectorTest.invokeWithTracing("importStyle", processTracingEvents);
function processTracingEvents()
{
var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.ParseAuthorStyleSheet);
if (record)
InspectorTest.addResult("SUCCESS: found ParseAuthorStyleSheet record");
else
InspectorTest.addResult("FAIL: ParseAuthorStyleSheet record not found");
InspectorTest.completeTest();
}
}
</script>
</head>
<body onload="runTest()">
<p>
Tests that ParseAuthorStyleSheet trace event is recorded.
</p>
</body>
</html>
third_party/WebKit/LayoutTests/inspector/tracing/timeline-enum-stability-expected.txt
View file @ 1f0854bc
...@@ -37,6 +37,7 @@ Applications outside of WebKit depend on the stability of the mapping of these t ...@@ -37,6 +37,7 @@ Applications outside of WebKit depend on the stability of the mapping of these t
PaintImage : "PaintImage" PaintImage : "PaintImage"
PaintInvalidationTracking : "PaintInvalidationTracking" PaintInvalidationTracking : "PaintInvalidationTracking"
PaintSetup : "PaintSetup" PaintSetup : "PaintSetup"
ParseAuthorStyleSheet : "ParseAuthorStyleSheet"
ParseHTML : "ParseHTML" ParseHTML : "ParseHTML"
PictureSnapshot : "cc::Picture" PictureSnapshot : "cc::Picture"
Program : "Program" Program : "Program"
......
third_party/WebKit/Source/core/css/StyleSheetContents.cpp
View file @ 1f0854bc
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "core/dom/StyleEngine.h" #include "core/dom/StyleEngine.h"
#include "core/fetch/CSSStyleSheetResource.h" #include "core/fetch/CSSStyleSheetResource.h"
#include "core/frame/UseCounter.h" #include "core/frame/UseCounter.h"
#include "core/inspector/InspectorTraceEvents.h"
#include "platform/TraceEvent.h" #include "platform/TraceEvent.h"
#include "platform/weborigin/SecurityOrigin.h" #include "platform/weborigin/SecurityOrigin.h"
#include "wtf/Deque.h" #include "wtf/Deque.h"
...@@ -319,6 +320,7 @@ const AtomicString& StyleSheetContents::determineNamespace(const AtomicString& p ...@@ -319,6 +320,7 @@ const AtomicString& StyleSheetContents::determineNamespace(const AtomicString& p
void StyleSheetContents::parseAuthorStyleSheet(const CSSStyleSheetResource* cachedStyleSheet, const SecurityOrigin* securityOrigin) void StyleSheetContents::parseAuthorStyleSheet(const CSSStyleSheetResource* cachedStyleSheet, const SecurityOrigin* securityOrigin)
{ {
TRACE_EVENT0("blink", "StyleSheetContents::parseAuthorStyleSheet"); TRACE_EVENT0("blink", "StyleSheetContents::parseAuthorStyleSheet");
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ParseAuthorStyleSheet", "data", InspectorParseAuthorStyleSheetEvent::data(cachedStyleSheet));
bool quirksMode = isQuirksModeBehavior(m_parserContext.mode()); bool quirksMode = isQuirksModeBehavior(m_parserContext.mode());
......
third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
View file @ 1f0854bc
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "core/css/invalidation/DescendantInvalidationSet.h" #include "core/css/invalidation/DescendantInvalidationSet.h"
#include "core/dom/StyleChangeReason.h" #include "core/dom/StyleChangeReason.h"
#include "core/events/Event.h" #include "core/events/Event.h"
#include "core/fetch/CSSStyleSheetResource.h"
#include "core/frame/FrameView.h" #include "core/frame/FrameView.h"
#include "core/frame/LocalFrame.h" #include "core/frame/LocalFrame.h"
#include "core/inspector/IdentifiersFactory.h" #include "core/inspector/IdentifiersFactory.h"
...@@ -457,6 +458,13 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorParseHtmlEvent::beginD ...@@ -457,6 +458,13 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorParseHtmlEvent::beginD
return value.release(); return value.release();
} }
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorParseAuthorStyleSheetEvent::data(const CSSStyleSheetResource* cachedStyleSheet)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("styleSheetUrl", cachedStyleSheet->url().string());
return value.release();
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorXhrReadyStateChangeEvent::data(ExecutionContext* context, XMLHttpRequest* request) PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorXhrReadyStateChangeEvent::data(ExecutionContext* context, XMLHttpRequest* request)
{ {
RefPtr<TracedValue> value = TracedValue::create(); RefPtr<TracedValue> value = TracedValue::create();
......
third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
View file @ 1f0854bc
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
namespace blink { namespace blink {
class CSSStyleSheetResource;
class DescendantInvalidationSet; class DescendantInvalidationSet;
class Document; class Document;
class Element; class Element;
...@@ -169,6 +170,11 @@ public: ...@@ -169,6 +170,11 @@ public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(Document*, unsigned startLine); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> beginData(Document*, unsigned startLine);
}; };
class InspectorParseAuthorStyleSheetEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const CSSStyleSheetResource*);
};
class InspectorXhrReadyStateChangeEvent { class InspectorXhrReadyStateChangeEvent {
public: public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*); static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(ExecutionContext*, XMLHttpRequest*);
......
third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js
View file @ 1f0854bc
...@@ -79,6 +79,7 @@ WebInspector.TimelineModel.RecordType = { ...@@ -79,6 +79,7 @@ WebInspector.TimelineModel.RecordType = {
PaintInvalidationTracking: "PaintInvalidationTracking", PaintInvalidationTracking: "PaintInvalidationTracking",
ParseHTML: "ParseHTML", ParseHTML: "ParseHTML",
ParseAuthorStyleSheet: "ParseAuthorStyleSheet",
TimerInstall: "TimerInstall", TimerInstall: "TimerInstall",
TimerRemove: "TimerRemove", TimerRemove: "TimerRemove",
......
third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
View file @ 1f0854bc
...@@ -77,6 +77,7 @@ WebInspector.TimelineUIUtils._initEventStyles = function() ...@@ -77,6 +77,7 @@ WebInspector.TimelineUIUtils._initEventStyles = function()
eventStyles[recordTypes.ScrollLayer] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Scroll"), categories["rendering"]); eventStyles[recordTypes.ScrollLayer] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Scroll"), categories["rendering"]);
eventStyles[recordTypes.CompositeLayers] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Composite Layers"), categories["painting"]); eventStyles[recordTypes.CompositeLayers] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Composite Layers"), categories["painting"]);
eventStyles[recordTypes.ParseHTML] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Parse HTML"), categories["loading"]); eventStyles[recordTypes.ParseHTML] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Parse HTML"), categories["loading"]);
eventStyles[recordTypes.ParseAuthorStyleSheet] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Parse Author Style Sheet"), categories["loading"]);
eventStyles[recordTypes.TimerInstall] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Install Timer"), categories["scripting"]); eventStyles[recordTypes.TimerInstall] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Install Timer"), categories["scripting"]);
eventStyles[recordTypes.TimerRemove] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Remove Timer"), categories["scripting"]); eventStyles[recordTypes.TimerRemove] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Remove Timer"), categories["scripting"]);
eventStyles[recordTypes.TimerFire] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Timer Fired"), categories["scripting"]); eventStyles[recordTypes.TimerFire] = new WebInspector.TimelineRecordStyle(WebInspector.UIString("Timer Fired"), categories["scripting"]);
...@@ -571,6 +572,11 @@ WebInspector.TimelineUIUtils._buildTraceEventDetailsSynchronously = function(eve ...@@ -571,6 +572,11 @@ WebInspector.TimelineUIUtils._buildTraceEventDetailsSynchronously = function(eve
if (event.imageURL) if (event.imageURL)
contentHelper.appendElementRow(WebInspector.UIString("Image URL"), WebInspector.linkifyResourceAsNode(event.imageURL)); contentHelper.appendElementRow(WebInspector.UIString("Image URL"), WebInspector.linkifyResourceAsNode(event.imageURL));
break; break;
case recordTypes.ParseAuthorStyleSheet:
var url = eventData["styleSheetUrl"];
if (url)
contentHelper.appendElementRow(WebInspector.UIString("Stylesheet URL"), WebInspector.linkifyResourceAsNode(url));
break;
case recordTypes.RecalculateStyles: // We don't want to see default details. case recordTypes.RecalculateStyles: // We don't want to see default details.
contentHelper.appendTextRow(WebInspector.UIString("Elements affected"), event.args["elementCount"]); contentHelper.appendTextRow(WebInspector.UIString("Elements affected"), event.args["elementCount"]);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment