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 27 matching lines...) Expand all Loading... | |
| 38 #include "content/child/v8_value_converter_impl.h" | 38 #include "content/child/v8_value_converter_impl.h" |
| 39 #include "content/child/webmessageportchannel_impl.h" | 39 #include "content/child/webmessageportchannel_impl.h" |
| 40 #include "content/common/content_constants_internal.h" | 40 #include "content/common/content_constants_internal.h" |
| 41 #include "content/common/database_messages.h" | 41 #include "content/common/database_messages.h" |
| 42 #include "content/common/dom_storage/dom_storage_types.h" | 42 #include "content/common/dom_storage/dom_storage_types.h" |
| 43 #include "content/common/drag_messages.h" | 43 #include "content/common/drag_messages.h" |
| 44 #include "content/common/frame_messages.h" | 44 #include "content/common/frame_messages.h" |
| 45 #include "content/common/frame_replication_state.h" | 45 #include "content/common/frame_replication_state.h" |
| 46 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 46 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
| 47 #include "content/common/input_messages.h" | 47 #include "content/common/input_messages.h" |
| 48 #include "content/common/navigation_params.h" | |
| 48 #include "content/common/pepper_messages.h" | 49 #include "content/common/pepper_messages.h" |
| 49 #include "content/common/site_isolation_policy.h" | 50 #include "content/common/site_isolation_policy.h" |
| 50 #include "content/common/ssl_status_serialization.h" | 51 #include "content/common/ssl_status_serialization.h" |
| 51 #include "content/common/view_messages.h" | 52 #include "content/common/view_messages.h" |
| 52 #include "content/public/common/bindings_policy.h" | 53 #include "content/public/common/bindings_policy.h" |
| 53 #include "content/public/common/content_client.h" | 54 #include "content/public/common/content_client.h" |
| 54 #include "content/public/common/content_constants.h" | 55 #include "content/public/common/content_constants.h" |
| 55 #include "content/public/common/content_switches.h" | 56 #include "content/public/common/content_switches.h" |
| 56 #include "content/public/common/drop_data.h" | 57 #include "content/public/common/drop_data.h" |
| 57 #include "content/public/common/favicon_url.h" | 58 #include "content/public/common/favicon_url.h" |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 707 DCHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); | 708 DCHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); |
| 708 // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be | 709 // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be |
| 709 // set separately below. | 710 // set separately below. |
| 710 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id_, | 711 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id_, |
| 711 MSG_ROUTING_NONE, MSG_ROUTING_NONE, | 712 MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
| 712 params.replicated_frame_state); | 713 params.replicated_frame_state); |
| 713 } | 714 } |
| 714 } | 715 } |
| 715 | 716 |
| 716 if (main_render_frame_) | 717 if (main_render_frame_) |
| 717 main_render_frame_->Initialize(); | 718 main_render_frame_->Initialize(LOFI_DEFAULT); |
|
nasko
2015/09/17 23:09:00
Inline this as RF default value.
megjablon
2015/09/18 23:22:11
Done.
| |
| 718 | 719 |
| 719 #if defined(OS_ANDROID) | 720 #if defined(OS_ANDROID) |
| 720 content_detectors_.push_back(linked_ptr<ContentDetector>( | 721 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 721 new AddressDetector())); | 722 new AddressDetector())); |
| 722 const std::string& contry_iso = | 723 const std::string& contry_iso = |
| 723 params.renderer_preferences.network_contry_iso; | 724 params.renderer_preferences.network_contry_iso; |
| 724 if (!contry_iso.empty()) { | 725 if (!contry_iso.empty()) { |
| 725 content_detectors_.push_back(linked_ptr<ContentDetector>( | 726 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 726 new PhoneNumberDetector(contry_iso))); | 727 new PhoneNumberDetector(contry_iso))); |
| 727 } | 728 } |
| (...skipping 3055 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3783 std::vector<gfx::Size> sizes; | 3784 std::vector<gfx::Size> sizes; |
| 3784 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3785 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3785 if (!url.isEmpty()) | 3786 if (!url.isEmpty()) |
| 3786 urls.push_back( | 3787 urls.push_back( |
| 3787 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3788 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3788 } | 3789 } |
| 3789 SendUpdateFaviconURL(urls); | 3790 SendUpdateFaviconURL(urls); |
| 3790 } | 3791 } |
| 3791 | 3792 |
| 3792 } // namespace content | 3793 } // namespace content |
| OLD | NEW |