Chromium Code Reviews| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 #include "content/renderer/render_frame_impl.h" | 109 #include "content/renderer/render_frame_impl.h" |
| 110 #include "content/renderer/render_process.h" | 110 #include "content/renderer/render_process.h" |
| 111 #include "content/renderer/render_thread_impl.h" | 111 #include "content/renderer/render_thread_impl.h" |
| 112 #include "content/renderer/render_view_impl_params.h" | 112 #include "content/renderer/render_view_impl_params.h" |
| 113 #include "content/renderer/render_view_mouse_lock_dispatcher.h" | 113 #include "content/renderer/render_view_mouse_lock_dispatcher.h" |
| 114 #include "content/renderer/render_widget_fullscreen_pepper.h" | 114 #include "content/renderer/render_widget_fullscreen_pepper.h" |
| 115 #include "content/renderer/renderer_webapplicationcachehost_impl.h" | 115 #include "content/renderer/renderer_webapplicationcachehost_impl.h" |
| 116 #include "content/renderer/renderer_webcolorchooser_impl.h" | 116 #include "content/renderer/renderer_webcolorchooser_impl.h" |
| 117 #include "content/renderer/resizing_mode_selector.h" | 117 #include "content/renderer/resizing_mode_selector.h" |
| 118 #include "content/renderer/savable_resources.h" | 118 #include "content/renderer/savable_resources.h" |
| 119 #include "content/renderer/skia_benchmarking_extension.h" | |
| 119 #include "content/renderer/speech_recognition_dispatcher.h" | 120 #include "content/renderer/speech_recognition_dispatcher.h" |
| 120 #include "content/renderer/stats_collection_controller.h" | 121 #include "content/renderer/stats_collection_controller.h" |
| 121 #include "content/renderer/stats_collection_observer.h" | 122 #include "content/renderer/stats_collection_observer.h" |
| 122 #include "content/renderer/text_input_client_observer.h" | 123 #include "content/renderer/text_input_client_observer.h" |
| 123 #include "content/renderer/v8_value_converter_impl.h" | 124 #include "content/renderer/v8_value_converter_impl.h" |
| 124 #include "content/renderer/web_ui_extension.h" | 125 #include "content/renderer/web_ui_extension.h" |
| 125 #include "content/renderer/web_ui_extension_data.h" | 126 #include "content/renderer/web_ui_extension_data.h" |
| 126 #include "content/renderer/websharedworker_proxy.h" | 127 #include "content/renderer/websharedworker_proxy.h" |
| 127 #include "media/audio/audio_output_device.h" | 128 #include "media/audio/audio_output_device.h" |
| 128 #include "media/base/audio_renderer_mixer_input.h" | 129 #include "media/base/audio_renderer_mixer_input.h" |
| (...skipping 3506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3635 RenderViewNavigatedToHost(GURL(GetLoadingUrl(frame)).host(), | 3636 RenderViewNavigatedToHost(GURL(GetLoadingUrl(frame)).host(), |
| 3636 g_view_map.Get().size()); | 3637 g_view_map.Get().size()); |
| 3637 } | 3638 } |
| 3638 } | 3639 } |
| 3639 } | 3640 } |
| 3640 | 3641 |
| 3641 void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) { | 3642 void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) { |
| 3642 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3643 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
| 3643 DidClearWindowObject(frame, world_id)); | 3644 DidClearWindowObject(frame, world_id)); |
| 3644 | 3645 |
| 3645 if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) && (world_id == 0)) | 3646 if (world_id == 0) { |
| 3646 DomAutomationController::Install(this, frame); | 3647 if ((enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION)) |
| 3648 DomAutomationController::Install(this, frame); | |
| 3647 | 3649 |
| 3648 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) | 3650 if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) |
| 3649 StatsCollectionController::Install(frame); | 3651 StatsCollectionController::Install(frame); |
|
piman
2014/01/21 20:59:31
I'm not sure what this does. Did you mean to inclu
jochen (gone - plz use gerrit)
2014/01/22 12:17:05
yes, I forgot about moving the stats controller un
| |
| 3652 | |
| 3653 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | |
| 3654 | |
| 3655 if (command_line.HasSwitch(switches::kEnableSkiaBenchmarking)) | |
| 3656 SkiaBenchmarking::Install(frame); | |
| 3657 } | |
| 3650 } | 3658 } |
| 3651 | 3659 |
| 3652 void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) { | 3660 void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) { |
| 3653 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 3661 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
| 3654 DidCreateDocumentElement(frame)); | 3662 DidCreateDocumentElement(frame)); |
| 3655 } | 3663 } |
| 3656 | 3664 |
| 3657 void RenderViewImpl::didReceiveTitle(WebFrame* frame, const WebString& title, | 3665 void RenderViewImpl::didReceiveTitle(WebFrame* frame, const WebString& title, |
| 3658 WebTextDirection direction) { | 3666 WebTextDirection direction) { |
| 3659 UpdateTitle(frame, title, direction); | 3667 UpdateTitle(frame, title, direction); |
| (...skipping 2573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6233 for (size_t i = 0; i < icon_urls.size(); i++) { | 6241 for (size_t i = 0; i < icon_urls.size(); i++) { |
| 6234 WebURL url = icon_urls[i].iconURL(); | 6242 WebURL url = icon_urls[i].iconURL(); |
| 6235 if (!url.isEmpty()) | 6243 if (!url.isEmpty()) |
| 6236 urls.push_back(FaviconURL(url, | 6244 urls.push_back(FaviconURL(url, |
| 6237 ToFaviconType(icon_urls[i].iconType()))); | 6245 ToFaviconType(icon_urls[i].iconType()))); |
| 6238 } | 6246 } |
| 6239 SendUpdateFaviconURL(urls); | 6247 SendUpdateFaviconURL(urls); |
| 6240 } | 6248 } |
| 6241 | 6249 |
| 6242 } // namespace content | 6250 } // namespace content |
| OLD | NEW |