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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 12252058: Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix builds 2 Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/gpu/image_transport_surface.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 5057 matching lines...) Expand 10 before | Expand all | Expand 10 after
5068 frame = frame->findChildByExpression(*i); 5068 frame = frame->findChildByExpression(*i);
5069 } 5069 }
5070 5070
5071 return frame; 5071 return frame;
5072 } 5072 }
5073 5073
5074 void RenderViewImpl::OnScriptEvalRequest(const string16& frame_xpath, 5074 void RenderViewImpl::OnScriptEvalRequest(const string16& frame_xpath,
5075 const string16& jscript, 5075 const string16& jscript,
5076 int id, 5076 int id,
5077 bool notify_result) { 5077 bool notify_result) {
5078 TRACE_EVENT_INSTANT0("test_tracing", "OnScriptEvalRequest"); 5078 TRACE_EVENT_INSTANT0("test_tracing", "OnScriptEvalRequest",
5079 TRACE_EVENT_SCOPE_THREAD);
5079 EvaluateScript(frame_xpath, jscript, id, notify_result); 5080 EvaluateScript(frame_xpath, jscript, id, notify_result);
5080 } 5081 }
5081 5082
5082 void RenderViewImpl::OnPostMessageEvent( 5083 void RenderViewImpl::OnPostMessageEvent(
5083 const ViewMsg_PostMessage_Params& params) { 5084 const ViewMsg_PostMessage_Params& params) {
5084 // Find the target frame of this message. The source tags the message with 5085 // Find the target frame of this message. The source tags the message with
5085 // |target_frame_id|, so use it to locate the frame. 5086 // |target_frame_id|, so use it to locate the frame.
5086 // TODO(nasko): Lookup based on the frame id, once http://crbug.com/153701 5087 // TODO(nasko): Lookup based on the frame id, once http://crbug.com/153701
5087 // is fixed and we can rely on having frame tree updates again. 5088 // is fixed and we can rely on having frame tree updates again.
5088 WebFrame* frame = webview()->mainFrame(); 5089 WebFrame* frame = webview()->mainFrame();
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
6531 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6532 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6532 RenderProcess::current()->ReleaseTransportDIB(dib); 6533 RenderProcess::current()->ReleaseTransportDIB(dib);
6533 } 6534 }
6534 6535
6535 void RenderViewImpl::DidCommitCompositorFrame() { 6536 void RenderViewImpl::DidCommitCompositorFrame() {
6536 RenderWidget::DidCommitCompositorFrame(); 6537 RenderWidget::DidCommitCompositorFrame();
6537 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); 6538 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
6538 } 6539 }
6539 6540
6540 } // namespace content 6541 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/image_transport_surface.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698