Diff
Modified: trunk/LayoutTests/ChangeLog (151773 => 151774)
--- trunk/LayoutTests/ChangeLog 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/ChangeLog 2013-06-20 13:21:56 UTC (rev 151774)
@@ -1,3 +1,19 @@
+2013-06-20 Seokju Kwon <[email protected]>
+
+ Web Inspector: Use console.timeStamp instead of console.markTimeline
+ https://bugs.webkit.org/show_bug.cgi?id=117810
+
+ Reviewed by Joseph Pecoraro.
+
+ Use 'console.timeStamp' instead of 'console.markTimeline' in LayoutTests.
+ And remove inspector/timeline/timeline-mark-timeline.html.
+
+ * inspector/console/console-messages-stack-traces-expected.txt:
+ * inspector/console/console-messages-stack-traces.html:
+ * inspector/timeline/timeline-mark-timeline-expected.txt: Removed.
+ * inspector/timeline/timeline-mark-timeline.html: Removed.
+ * inspector/timeline/timeline-timer-fired-from-eval-call-site.html:
+
2013-06-20 Zoltan Arvai <[email protected]>
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/console/console-messages-stack-traces-expected.txt (151773 => 151774)
--- trunk/LayoutTests/inspector/console/console-messages-stack-traces-expected.txt 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/inspector/console/console-messages-stack-traces-expected.txt 2013-06-20 13:21:56 UTC (rev 151774)
@@ -1,14 +1,14 @@
-CONSOLE MESSAGE: line 17: log
-CONSOLE MESSAGE: line 18: info
-CONSOLE MESSAGE: line 19: warn
-CONSOLE MESSAGE: line 20: debug
-CONSOLE MESSAGE: line 21: error
-CONSOLE MESSAGE: line 22: assert
-CONSOLE MESSAGE: line 23: trace
-CONSOLE MESSAGE: line 24: 1,2,3
-CONSOLE MESSAGE: line 25: [object HTMLBodyElement]
-CONSOLE MESSAGE: line 31: MARKER: EXPECT NO STACK TRACES
-CONSOLE MESSAGE: line 35: MARKER: DONE
+CONSOLE MESSAGE: line 16: log
+CONSOLE MESSAGE: line 17: info
+CONSOLE MESSAGE: line 18: warn
+CONSOLE MESSAGE: line 19: debug
+CONSOLE MESSAGE: line 20: error
+CONSOLE MESSAGE: line 21: assert
+CONSOLE MESSAGE: line 22: trace
+CONSOLE MESSAGE: line 23: 1,2,3
+CONSOLE MESSAGE: line 24: [object HTMLBodyElement]
+CONSOLE MESSAGE: line 30: MARKER: EXPECT NO STACK TRACES
+CONSOLE MESSAGE: line 34: MARKER: DONE
Tests that console-api messages contain stack traces.
SUCCESS
Modified: trunk/LayoutTests/inspector/console/console-messages-stack-traces.html (151773 => 151774)
--- trunk/LayoutTests/inspector/console/console-messages-stack-traces.html 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/inspector/console/console-messages-stack-traces.html 2013-06-20 13:21:56 UTC (rev 151774)
@@ -7,7 +7,6 @@
function performConsoleMessages() {
// No console message.
console.timeStamp();
- console.markTimeline();
// Expected to have stack traces.
console.time("time"); // Nothing until timeEnd.
Deleted: trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt (151773 => 151774)
--- trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt 2013-06-20 13:21:56 UTC (rev 151774)
@@ -1,15 +0,0 @@
-Tests the Timeline API mark feature
-
-TimeStamp Properties:
-{
- counters : <object>
- data : {
- message : "MARK TIMELINE"
- }
- frameId : <string>
- stackTrace : <object>
- startTime : <number>
- type : "TimeStamp"
- usedHeapSize : <number>
-}
-
Deleted: trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html (151773 => 151774)
--- trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html 2013-06-20 13:21:56 UTC (rev 151774)
@@ -1,26 +0,0 @@
-<html>
-<head>
-<script src=""
-<script src=""
-<script>
-
-function performActions()
-{
- console.markTimeline("MARK TIMELINE");
-}
-
-function test()
-{
- InspectorTest.performActionsAndPrint("performActions()", "TimeStamp");
-}
-
-</script>
-</head>
-
-<body _onload_="runTest()">
-<p>
-Tests the Timeline API mark feature
-</p>
-
-</body>
-</html>
Modified: trunk/LayoutTests/inspector/timeline/timeline-timer-fired-from-eval-call-site.html (151773 => 151774)
--- trunk/LayoutTests/inspector/timeline/timeline-timer-fired-from-eval-call-site.html 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/LayoutTests/inspector/timeline/timeline-timer-fired-from-eval-call-site.html 2013-06-20 13:21:56 UTC (rev 151774)
@@ -7,7 +7,7 @@
function performActions()
{
var content = "" +
- "var fn2 = function() {console.markTimeline(\"Script evaluated\");};\\n" +
+ "var fn2 = function() {console.timeStamp(\"Script evaluated\");};\\n" +
"var fn1 = function() {window.setTimeout(fn2, 1);};\\n" +
"window.setTimeout(fn1, 1);\\n"
content = "eval('" + content + "//@ sourceURL=fromEval.js" + "');";
Modified: trunk/Source/WebCore/ChangeLog (151773 => 151774)
--- trunk/Source/WebCore/ChangeLog 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/Source/WebCore/ChangeLog 2013-06-20 13:21:56 UTC (rev 151774)
@@ -1,3 +1,21 @@
+2013-06-20 Seokju Kwon <[email protected]>
+
+ Web Inspector: Use console.timeStamp instead of console.markTimeline
+ https://bugs.webkit.org/show_bug.cgi?id=117810
+
+ Reviewed by Joseph Pecoraro.
+
+ Webkit supports both console.timeStamp and console.markTimeline.
+ And they do the exact same thing.
+ This patch gets rid of console.markTimeline for Chrome/Firebug compatibility.
+
+ No new functionality, no new tests.
+
+ * WebCore.order:
+ * page/Console.cpp:
+ * page/Console.h:
+ * page/Console.idl:
+
2013-06-20 Grzegorz Czajkowski <[email protected]>
background-color and text-decoration are not preserved when merging paragraphs
Modified: trunk/Source/WebCore/WebCore.order (151773 => 151774)
--- trunk/Source/WebCore/WebCore.order 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/Source/WebCore/WebCore.order 2013-06-20 13:21:56 UTC (rev 151774)
@@ -27983,11 +27983,6 @@
__ZN7WebCore17InspectorDOMAgent16handleMousePressEv
__ZN7WebCore22InspectorTimelineAgent17willDispatchEventERKNS_5EventE
__ZN7WebCore21TimelineRecordFactory23createEventDispatchDataERKNS_5EventE
-__ZN7WebCore38jsConsolePrototypeFunctionMarkTimelineEPN3JSC9ExecStateE
-__ZN7WebCore7Console12markTimelineEN3WTF10PassRefPtrINS_15ScriptArgumentsEEENS2_INS_15ScriptCallStackEEE
-__ZN7WebCore24InspectorInstrumentation23consoleMarkTimelineImplEPNS_19InstrumentingAgentsEN3WTF10PassRefPtrINS_15ScriptArgumentsEEE
-__ZN7WebCore22InspectorTimelineAgent15didMarkTimelineERKN3WTF6StringE
-__ZN7WebCore21TimelineRecordFactory22createMarkTimelineDataERKN3WTF6StringE
__ZN7WebCore22InspectorTimelineAgent16didDispatchEventEv
__ZN7WebCore22InspectorTimelineAgent13willFireTimerEi
__ZN7WebCore21TimelineRecordFactory22createGenericTimerDataEi
Modified: trunk/Source/WebCore/page/Console.cpp (151773 => 151774)
--- trunk/Source/WebCore/page/Console.cpp 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/Source/WebCore/page/Console.cpp 2013-06-20 13:21:56 UTC (rev 151774)
@@ -174,11 +174,6 @@
InspectorInstrumentation::consoleCount(page(), state, arguments);
}
-void Console::markTimeline(PassRefPtr<ScriptArguments> arguments)
-{
- InspectorInstrumentation::consoleTimeStamp(m_frame, arguments);
-}
-
#if ENABLE(_javascript__DEBUGGER)
void Console::profile(const String& title, ScriptState* state)
Modified: trunk/Source/WebCore/page/Console.h (151773 => 151774)
--- trunk/Source/WebCore/page/Console.h 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/Source/WebCore/page/Console.h 2013-06-20 13:21:56 UTC (rev 151774)
@@ -64,7 +64,6 @@
void trace(ScriptState*, PassRefPtr<ScriptArguments>);
void assertCondition(ScriptState*, PassRefPtr<ScriptArguments>, bool condition);
void count(ScriptState*, PassRefPtr<ScriptArguments>);
- void markTimeline(PassRefPtr<ScriptArguments>);
#if ENABLE(_javascript__DEBUGGER)
const ProfilesArray& profiles() const { return m_profiles; }
void profile(const String&, ScriptState*);
Modified: trunk/Source/WebCore/page/Console.idl (151773 => 151774)
--- trunk/Source/WebCore/page/Console.idl 2013-06-20 08:22:10 UTC (rev 151773)
+++ trunk/Source/WebCore/page/Console.idl 2013-06-20 13:21:56 UTC (rev 151774)
@@ -42,7 +42,6 @@
[CallWith=ScriptArguments|ScriptState] void trace();
[CallWith=ScriptArguments|ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
[CallWith=ScriptArguments|ScriptState] void count();
- [CallWith=ScriptArguments] void markTimeline();
// As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
// "Sequences must not be used as the type of an attribute, constant or exception field."
