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

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

Issue 54493003: Propagate source_frame_number from LTH to DevTools (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed content/test/web_layer_tree_view_impl_for_testing.h Created 7 years, 1 month 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
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 6058 matching lines...) Expand 10 before | Expand all | Expand 10 after
6069 #endif 6069 #endif
6070 6070
6071 bool RenderViewImpl::CanComposeInline() { 6071 bool RenderViewImpl::CanComposeInline() {
6072 #if defined(ENABLE_PLUGINS) 6072 #if defined(ENABLE_PLUGINS)
6073 if (focused_pepper_plugin_) 6073 if (focused_pepper_plugin_)
6074 return IsPepperAcceptingCompositionEvents(); 6074 return IsPepperAcceptingCompositionEvents();
6075 #endif 6075 #endif
6076 return true; 6076 return true;
6077 } 6077 }
6078 6078
6079 void RenderViewImpl::InstrumentWillBeginFrame() { 6079 void RenderViewImpl::InstrumentWillBeginFrame(int frame_id) {
6080 if (!webview()) 6080 if (!webview())
6081 return; 6081 return;
6082 if (!webview()->devToolsAgent()) 6082 if (!webview()->devToolsAgent())
6083 return; 6083 return;
6084 webview()->devToolsAgent()->didBeginFrame(); 6084 webview()->devToolsAgent()->didBeginFrame(frame_id);
6085 } 6085 }
6086 6086
6087 void RenderViewImpl::InstrumentDidBeginFrame() { 6087 void RenderViewImpl::InstrumentDidBeginFrame() {
6088 if (!webview()) 6088 if (!webview())
6089 return; 6089 return;
6090 if (!webview()->devToolsAgent()) 6090 if (!webview()->devToolsAgent())
6091 return; 6091 return;
6092 // TODO(jamesr/caseq): Decide if this needs to be renamed. 6092 // TODO(jamesr/caseq): Decide if this needs to be renamed.
6093 webview()->devToolsAgent()->didComposite(); 6093 webview()->devToolsAgent()->didComposite();
6094 } 6094 }
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
6630 for (size_t i = 0; i < icon_urls.size(); i++) { 6630 for (size_t i = 0; i < icon_urls.size(); i++) {
6631 WebURL url = icon_urls[i].iconURL(); 6631 WebURL url = icon_urls[i].iconURL();
6632 if (!url.isEmpty()) 6632 if (!url.isEmpty())
6633 urls.push_back(FaviconURL(url, 6633 urls.push_back(FaviconURL(url,
6634 ToFaviconType(icon_urls[i].iconType()))); 6634 ToFaviconType(icon_urls[i].iconType())));
6635 } 6635 }
6636 SendUpdateFaviconURL(urls); 6636 SendUpdateFaviconURL(urls);
6637 } 6637 }
6638 6638
6639 } // namespace content 6639 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698