Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« gpu/gpu.gyp ('K') | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_webview_delegate.cc
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 745b2d0581ea6f01fc1c462b00ea0ddc7b1f9c69..4fe60e85fd38c03acdf99341fc9e48d5f7d1df7a 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -819,7 +819,7 @@ void TestWebViewDelegate::didFailLoad(
}
void TestWebViewDelegate::didFinishLoad(WebFrame* frame) {
- TRACE_EVENT_END("frame.load", this, frame->url().spec());
+ TRACE_EVENT_END_ETW("frame.load", this, frame->url().spec());
UpdateAddressBar(frame->view());
LocationChangeDone(frame);
}
@@ -877,7 +877,7 @@ void TestWebViewDelegate::willSendRequest(
header != clear_headers_.end(); ++header)
request.clearHTTPHeaderField(WebString::fromUTF8(*header));
- TRACE_EVENT_BEGIN("url.load", identifier, request_url);
+ TRACE_EVENT_BEGIN_ETW("url.load", identifier, request_url);
// Set the new substituted URL.
request.setURL(GURL(TestShell::RewriteLocalUrl(request_url)));
}
@@ -888,7 +888,7 @@ void TestWebViewDelegate::didReceiveResponse(
void TestWebViewDelegate::didFinishResourceLoad(
WebFrame* frame, unsigned identifier) {
- TRACE_EVENT_END("url.load", identifier, "");
+ TRACE_EVENT_END_ETW("url.load", identifier, "");
resource_identifier_map_.erase(identifier);
}
« gpu/gpu.gyp ('K') | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698