Diff
Modified: trunk/LayoutTests/ChangeLog (95409 => 95410)
--- trunk/LayoutTests/ChangeLog 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/LayoutTests/ChangeLog 2011-09-19 13:32:24 UTC (rev 95410)
@@ -1,3 +1,19 @@
+2011-09-19 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
+ https://bugs.webkit.org/show_bug.cgi?id=67528
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/timeline/timeline-animation-frame.html:
+ * inspector/timeline/timeline-dom-content-loaded-event-expected.txt: Added.
+ * inspector/timeline/timeline-dom-content-loaded-event.html: Added.
+ * inspector/timeline/timeline-load-event-expected.txt: Added.
+ * inspector/timeline/timeline-load-event.html: Added.
+ * inspector/timeline/timeline-test.js:
+ (initialize_Timeline.InspectorTest.waitForRecordType.addRecord):
+ (initialize_Timeline.InspectorTest.waitForRecordType):
+
2011-09-19 Csaba Osztrogonác <[email protected]>
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html (95409 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/LayoutTests/inspector/timeline/timeline-animation-frame.html 2011-09-19 13:32:24 UTC (rev 95410)
@@ -23,18 +23,10 @@
InspectorTest.evaluateInPage("performActions()");
});
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, function(event) {
- addRecord(event.data);
- });
+ InspectorTest.waitForRecordType("CancelAnimationFrameCallback", finish);
- function addRecord(record)
+ function finish()
{
- if (record.type !== WebInspector.TimelineAgent.RecordType["CancelAnimationFrameCallback"]) {
- for (var i = 0; record.children && i < record.children.length; ++i)
- addRecord(record.children[i]);
- return ;
- }
-
InspectorTest.printTimelineRecords("RegisterAnimationFrameCallback");
InspectorTest.printTimelineRecords("FireAnimationFrameEvent");
InspectorTest.printTimelineRecords("CancelAnimationFrameCallback");
Added: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,12 @@
+Tests the DOM content loaded event.
+
+MarkDOMContent Properties:
+{
+ startTime : <number>
+ data : {
+ }
+ type : "MarkDOMContent"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+}
+
Property changes on: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,29 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function test()
+{
+ WebInspector.showPanel("timeline");
+
+ InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
+ InspectorTest.waitForRecordType("MarkDOMContent", finish);
+ function finish()
+ {
+ InspectorTest.printTimelineRecords("MarkDOMContent");
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests the DOM content loaded event.
+</p>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/timeline/timeline-dom-content-loaded-event.html
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,12 @@
+Tests the load event.
+
+MarkLoad Properties:
+{
+ startTime : <number>
+ data : {
+ }
+ type : "MarkLoad"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+}
+
Property changes on: trunk/LayoutTests/inspector/timeline/timeline-load-event-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/timeline/timeline-load-event.html (0 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-load-event.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-load-event.html 2011-09-19 13:32:24 UTC (rev 95410)
@@ -0,0 +1,29 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function test()
+{
+ WebInspector.showPanel("timeline");
+
+ InspectorTest.startTimeline(function() { InspectorTest.reloadPage(); });
+ InspectorTest.waitForRecordType("MarkLoad", finish);
+ function finish()
+ {
+ InspectorTest.printTimelineRecords("MarkLoad");
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests the load event.
+</p>
+
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/timeline/timeline-load-event.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/LayoutTests/inspector/timeline/timeline-test.js (95409 => 95410)
--- trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-09-19 13:32:24 UTC (rev 95410)
@@ -32,6 +32,24 @@
});
};
+
+InspectorTest.waitForRecordType = function(recordType, callback)
+{
+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, function(event) {
+ addRecord(event.data);
+ });
+
+ function addRecord(record)
+ {
+ if (record.type !== WebInspector.TimelineAgent.RecordType[recordType]) {
+ for (var i = 0; record.children && i < record.children.length; ++i)
+ addRecord(record.children[i]);
+ return ;
+ }
+ callback(record);
+ }
+}
+
InspectorTest.stopTimeline = function(callback)
{
function didStop()
Modified: trunk/Source/WebCore/ChangeLog (95409 => 95410)
--- trunk/Source/WebCore/ChangeLog 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/Source/WebCore/ChangeLog 2011-09-19 13:32:24 UTC (rev 95410)
@@ -1,3 +1,16 @@
+2011-09-19 Ilya Tikhonovsky <[email protected]>
+
+ Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type.
+ https://bugs.webkit.org/show_bug.cgi?id=67528
+
+ Reviewed by Pavel Feldman.
+
+ Tests: inspector/timeline/timeline-dom-content-loaded-event.html
+ inspector/timeline/timeline-load-event.html
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didMarkDOMContentEvent):
+
2011-09-19 Shawn Singh <[email protected]>
Re-name LayerChromium border functions to reflect that
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (95409 => 95410)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-09-19 13:04:30 UTC (rev 95409)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-09-19 13:32:24 UTC (rev 95410)
@@ -336,7 +336,7 @@
void InspectorTimelineAgent::didMarkDOMContentEvent()
{
- appendRecord(InspectorObject::create(), TimelineRecordType::TimeStamp);
+ appendRecord(InspectorObject::create(), TimelineRecordType::MarkDOMContent);
}
void InspectorTimelineAgent::didMarkLoadEvent()
