| 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 #if defined(OS_WIN) | 645 #if defined(OS_WIN) |
| 646 focused_plugin_id_(-1), | 646 focused_plugin_id_(-1), |
| 647 #endif | 647 #endif |
| 648 #if defined(ENABLE_PLUGINS) | 648 #if defined(ENABLE_PLUGINS) |
| 649 plugin_find_handler_(NULL), | 649 plugin_find_handler_(NULL), |
| 650 focused_pepper_plugin_(NULL), | 650 focused_pepper_plugin_(NULL), |
| 651 pepper_last_mouse_event_target_(NULL), | 651 pepper_last_mouse_event_target_(NULL), |
| 652 #endif | 652 #endif |
| 653 enumeration_completion_id_(0), | 653 enumeration_completion_id_(0), |
| 654 session_storage_namespace_id_(params.session_storage_namespace_id), | 654 session_storage_namespace_id_(params.session_storage_namespace_id), |
| 655 page_scale_factor_is_one_(true), | 655 page_scale_factor_is_one_(true) { |
| 656 debug_info_(params.debug_info) { | |
| 657 } | 656 } |
| 658 | 657 |
| 659 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, | 658 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
| 660 CompositorDependencies* compositor_deps, | 659 CompositorDependencies* compositor_deps, |
| 661 bool was_created_by_renderer) { | 660 bool was_created_by_renderer) { |
| 662 routing_id_ = params.view_id; | 661 routing_id_ = params.view_id; |
| 663 surface_id_ = params.surface_id; | 662 surface_id_ = params.surface_id; |
| 664 if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer) | 663 if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer) |
| 665 opener_id_ = params.opener_route_id; | 664 opener_id_ = params.opener_route_id; |
| 666 | 665 |
| (...skipping 3294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3961 std::vector<gfx::Size> sizes; | 3960 std::vector<gfx::Size> sizes; |
| 3962 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3961 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3963 if (!url.isEmpty()) | 3962 if (!url.isEmpty()) |
| 3964 urls.push_back( | 3963 urls.push_back( |
| 3965 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3964 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3966 } | 3965 } |
| 3967 SendUpdateFaviconURL(urls); | 3966 SendUpdateFaviconURL(urls); |
| 3968 } | 3967 } |
| 3969 | 3968 |
| 3970 } // namespace content | 3969 } // namespace content |
| OLD | NEW |