| OLD | NEW |
| 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 6082 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6093 #endif | 6093 #endif |
| 6094 | 6094 |
| 6095 bool RenderViewImpl::CanComposeInline() { | 6095 bool RenderViewImpl::CanComposeInline() { |
| 6096 #if defined(ENABLE_PLUGINS) | 6096 #if defined(ENABLE_PLUGINS) |
| 6097 if (focused_pepper_plugin_) | 6097 if (focused_pepper_plugin_) |
| 6098 return IsPepperAcceptingCompositionEvents(); | 6098 return IsPepperAcceptingCompositionEvents(); |
| 6099 #endif | 6099 #endif |
| 6100 return true; | 6100 return true; |
| 6101 } | 6101 } |
| 6102 | 6102 |
| 6103 void RenderViewImpl::InstrumentWillBeginFrame() { | 6103 void RenderViewImpl::InstrumentWillBeginFrame(int frame_id) { |
| 6104 if (!webview()) | 6104 if (!webview()) |
| 6105 return; | 6105 return; |
| 6106 if (!webview()->devToolsAgent()) | 6106 if (!webview()->devToolsAgent()) |
| 6107 return; | 6107 return; |
| 6108 webview()->devToolsAgent()->didBeginFrame(); | 6108 webview()->devToolsAgent()->didBeginFrame(frame_id); |
| 6109 } | 6109 } |
| 6110 | 6110 |
| 6111 void RenderViewImpl::InstrumentDidBeginFrame() { | 6111 void RenderViewImpl::InstrumentDidBeginFrame() { |
| 6112 if (!webview()) | 6112 if (!webview()) |
| 6113 return; | 6113 return; |
| 6114 if (!webview()->devToolsAgent()) | 6114 if (!webview()->devToolsAgent()) |
| 6115 return; | 6115 return; |
| 6116 // TODO(jamesr/caseq): Decide if this needs to be renamed. | 6116 // TODO(jamesr/caseq): Decide if this needs to be renamed. |
| 6117 webview()->devToolsAgent()->didComposite(); | 6117 webview()->devToolsAgent()->didComposite(); |
| 6118 } | 6118 } |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6658 for (size_t i = 0; i < icon_urls.size(); i++) { | 6658 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6659 WebURL url = icon_urls[i].iconURL(); | 6659 WebURL url = icon_urls[i].iconURL(); |
| 6660 if (!url.isEmpty()) | 6660 if (!url.isEmpty()) |
| 6661 urls.push_back(FaviconURL(url, | 6661 urls.push_back(FaviconURL(url, |
| 6662 ToFaviconType(icon_urls[i].iconType()))); | 6662 ToFaviconType(icon_urls[i].iconType()))); |
| 6663 } | 6663 } |
| 6664 SendUpdateFaviconURL(urls); | 6664 SendUpdateFaviconURL(urls); |
| 6665 } | 6665 } |
| 6666 | 6666 |
| 6667 } // namespace content | 6667 } // namespace content |
| OLD | NEW |