Title: [98331] trunk/Source/WebCore
- Revision
- 98331
- Author
- nd...@chromium.org
- Date
- 2011-10-25 02:54:27 -0700 (Tue, 25 Oct 2011)
Log Message
[chromium] Route Console::time and Console::timeEnd to trace_event
https://bugs.webkit.org/show_bug.cgi?id=70620
Reviewed by Pavel Feldman.
* page/Console.cpp:
(WebCore::Console::time):
(WebCore::Console::timeEnd):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98330 => 98331)
--- trunk/Source/WebCore/ChangeLog 2011-10-25 09:39:35 UTC (rev 98330)
+++ trunk/Source/WebCore/ChangeLog 2011-10-25 09:54:27 UTC (rev 98331)
@@ -1,3 +1,14 @@
+2011-10-21 Nat Duca <nd...@chromium.org>
+
+ [chromium] Route Console::time and Console::timeEnd to trace_event
+ https://bugs.webkit.org/show_bug.cgi?id=70620
+
+ Reviewed by Pavel Feldman.
+
+ * page/Console.cpp:
+ (WebCore::Console::time):
+ (WebCore::Console::timeEnd):
+
2011-10-21 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: [Extensions API] allow extensions to specify script to be injected on reload
Modified: trunk/Source/WebCore/page/Console.cpp (98330 => 98331)
--- trunk/Source/WebCore/page/Console.cpp 2011-10-25 09:39:35 UTC (rev 98330)
+++ trunk/Source/WebCore/page/Console.cpp 2011-10-25 09:54:27 UTC (rev 98331)
@@ -49,6 +49,10 @@
#include <wtf/UnusedParam.h>
#include <wtf/text/CString.h>
+#if PLATFORM(CHROMIUM)
+#include "TraceEvent.h"
+#endif
+
namespace WebCore {
Console::Console(Frame* frame)
@@ -304,10 +308,18 @@
void Console::time(const String& title)
{
InspectorInstrumentation::startConsoleTiming(page(), title);
+#if PLATFORM(CHROMIUM)
+ if (PlatformSupport::isTraceEventEnabled())
+ PlatformSupport::traceEventBegin(title.utf8().data(), 0, 0);
+#endif
}
void Console::timeEnd(const String& title, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack> callStack)
{
+#if PLATFORM(CHROMIUM)
+ if (PlatformSupport::isTraceEventEnabled())
+ PlatformSupport::traceEventEnd(title.utf8().data(), 0, 0);
+#endif
InspectorInstrumentation::stopConsoleTiming(page(), title, callStack);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
