Diff
Modified: branches/safari-536-branch/LayoutTests/ChangeLog (117151 => 117152)
--- branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/LayoutTests/ChangeLog 2012-05-15 21:08:25 UTC (rev 117152)
@@ -1,5 +1,25 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116821
+
+ 2012-05-10 Timothy Hatcher <[email protected]>
+
+ Instrument timer function calls so they show up in the Web Inspector Timeline.
+
+ https://webkit.org/b/86173
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/timeline/timeline-injected-script-eval-expected.txt: Updated for the blocked scriptName and scriptLine.
+ * inspector/timeline/timeline-script-tag-1-expected.txt: Updated for the blocked lineNumber.
+ * inspector/timeline/timeline-script-tag-2-expected.txt: Ditto.
+ * inspector/timeline/timeline-test.js: Block scriptName, scriptLine, lineNumber and timerId.
+ * inspector/timeline/timeline-timer-expected.txt: Added.
+ * inspector/timeline/timeline-timer.html: Added.
+ * platform/chromium/inspector/timeline/timeline-timer-expected.txt: Added.
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116685
2012-05-10 Brady Eidson <[email protected]>
Modified: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt (117151 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-injected-script-eval-expected.txt 2012-05-15 21:08:25 UTC (rev 117152)
@@ -4,8 +4,8 @@
{
startTime : <number>
data : {
- scriptName : "InjectedScript"
- scriptLine : 1
+ scriptName : <string>
+ scriptLine : <number>
}
children : <object>
endTime : <number>
@@ -18,8 +18,8 @@
{
startTime : <number>
data : {
- scriptName : "InjectedScript"
- scriptLine : 1
+ scriptName : <string>
+ scriptLine : <number>
}
children : <object>
endTime : <number>
Modified: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt (117151 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2012-05-15 21:08:25 UTC (rev 117152)
@@ -11,7 +11,7 @@
startTime : <number>
data : {
url : <string>
- lineNumber : 3
+ lineNumber : <number>
}
children : <object>
endTime : <number>
Modified: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt (117151 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-script-tag-2-expected.txt 2012-05-15 21:08:25 UTC (rev 117152)
@@ -6,7 +6,7 @@
startTime : <number>
data : {
url : <string>
- lineNumber : 1
+ lineNumber : <number>
}
children : <object>
endTime : <number>
Modified: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-test.js (117151 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-test.js 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-test.js 2012-05-15 21:08:25 UTC (rev 117152)
@@ -10,11 +10,15 @@
width: "formatAsTypeName",
stackTrace: "formatAsTypeName",
url: "formatAsTypeName",
+ scriptName: "formatAsTypeName",
usedHeapSize: "formatAsTypeName",
totalHeapSize: "formatAsTypeName",
mimeType: "formatAsTypeName",
id: "formatAsTypeName",
- counters: "formatAsTypeName"
+ counters: "formatAsTypeName",
+ timerId: "formatAsTypeName",
+ scriptLine: "formatAsTypeName",
+ lineNumber: "formatAsTypeName"
};
InspectorTest.startTimeline = function(callback)
Copied: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer-expected.txt (from rev 116821, trunk/LayoutTests/inspector/timeline/timeline-timer-expected.txt) (0 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer-expected.txt (rev 0)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer-expected.txt 2012-05-15 21:08:25 UTC (rev 117152)
@@ -0,0 +1,149 @@
+Tests the Timeline events for Timers
+
+TimerInstall Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ timeout : 10
+ singleShot : true
+ }
+ type : "TimerInstall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerInstall Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ timeout : 20
+ singleShot : false
+ }
+ type : "TimerInstall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerRemove Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ type : "TimerRemove"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+EvaluateScript Properties:
+{
+ startTime : <number>
+ data : {
+ url : <string>
+ lineNumber : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "EvaluateScript"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+
Copied: branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer.html (from rev 116821, trunk/LayoutTests/inspector/timeline/timeline-timer.html) (0 => 117152)
--- branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer.html (rev 0)
+++ branches/safari-536-branch/LayoutTests/inspector/timeline/timeline-timer.html 2012-05-15 21:08:25 UTC (rev 117152)
@@ -0,0 +1,51 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function performActions()
+{
+ var timerOne = setTimeout("1 + 1", 10);
+ var timerTwo = setInterval(intervalTimerWork, 20);
+ var iteration = 0;
+
+ function intervalTimerWork()
+ {
+ if (++iteration < 2)
+ return;
+ clearInterval(timerTwo);
+ }
+}
+
+function test()
+{
+ InspectorTest.startTimeline(function() {
+ InspectorTest.evaluateInPage("performActions()");
+ });
+
+ InspectorTest.waitForRecordType("TimerRemove", finish);
+
+ function finish()
+ {
+ InspectorTest.printTimelineRecords("TimerInstall");
+ InspectorTest.printTimelineRecords("TimerFire");
+ InspectorTest.printTimelineRecords("TimerRemove");
+ InspectorTest.printTimelineRecords("FunctionCall");
+ InspectorTest.printTimelineRecords("EvaluateScript");
+ InspectorTest.completeTest();
+ }
+}
+
+if (!window.layoutTestController)
+ setTimeout(performActions, 2000);
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests the Timeline events for Timers
+</p>
+</body>
+</html>
Copied: branches/safari-536-branch/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt (from rev 116821, trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt) (0 => 117152)
--- branches/safari-536-branch/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt (rev 0)
+++ branches/safari-536-branch/LayoutTests/platform/chromium/inspector/timeline/timeline-timer-expected.txt 2012-05-15 21:08:25 UTC (rev 117152)
@@ -0,0 +1,152 @@
+Tests the Timeline events for Timers
+
+TimerInstall Properties:
+{
+ startTime : <number>
+ stackTrace : <object>
+ data : {
+ timerId : <number>
+ timeout : 10
+ singleShot : true
+ }
+ type : "TimerInstall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerInstall Properties:
+{
+ startTime : <number>
+ stackTrace : <object>
+ data : {
+ timerId : <number>
+ timeout : 20
+ singleShot : false
+ }
+ type : "TimerInstall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerFire Properties:
+{
+ startTime : <number>
+ data : {
+ timerId : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "TimerFire"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+TimerRemove Properties:
+{
+ startTime : <number>
+ stackTrace : <object>
+ data : {
+ timerId : <number>
+ }
+ type : "TimerRemove"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+FunctionCall Properties:
+{
+ startTime : <number>
+ data : {
+ scriptName : <string>
+ scriptLine : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "FunctionCall"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+EvaluateScript Properties:
+{
+ startTime : <number>
+ data : {
+ url : <string>
+ lineNumber : <number>
+ }
+ children : <object>
+ endTime : <number>
+ type : "EvaluateScript"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+ counters : <object>
+}
+
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117151 => 117152)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:08:25 UTC (rev 117152)
@@ -1,5 +1,23 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116821
+
+ 2012-05-10 Timothy Hatcher <[email protected]>
+
+ Instrument timer function calls so they show up in the Web Inspector Timeline.
+
+ https://webkit.org/b/86173
+
+ Reviewed by Pavel Feldman.
+
+ Test: inspector/timeline/timeline-timer.html
+
+ * bindings/js/ScheduledAction.cpp:
+ (WebCore::ScheduledAction::executeFunctionInContext): Wrap the call with JSMainThreadExecState::instrumentFunctionCall
+ and InspectorInstrumentation::didCallFunction.
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116799
2012-05-11 Tim Horton <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/bindings/js/ScheduledAction.cpp (117151 => 117152)
--- branches/safari-536-branch/Source/WebCore/bindings/js/ScheduledAction.cpp 2012-05-15 21:06:39 UTC (rev 117151)
+++ branches/safari-536-branch/Source/WebCore/bindings/js/ScheduledAction.cpp 2012-05-15 21:08:25 UTC (rev 117152)
@@ -106,10 +106,14 @@
args.append(m_args[i].get());
globalObject->globalData().timeoutChecker.start();
+ InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
+
if (context->isDocument())
JSMainThreadExecState::call(exec, m_function.get(), callType, callData, thisValue, args);
else
JSC::call(exec, m_function.get(), callType, callData, thisValue, args);
+
+ InspectorInstrumentation::didCallFunction(cookie);
globalObject->globalData().timeoutChecker.stop();
if (exec->hadException())
