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 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 focused_plugin_id_(-1), | 654 focused_plugin_id_(-1), |
655 #endif | 655 #endif |
656 #if defined(ENABLE_PLUGINS) | 656 #if defined(ENABLE_PLUGINS) |
657 plugin_find_handler_(NULL), | 657 plugin_find_handler_(NULL), |
658 focused_pepper_plugin_(NULL), | 658 focused_pepper_plugin_(NULL), |
659 pepper_last_mouse_event_target_(NULL), | 659 pepper_last_mouse_event_target_(NULL), |
660 #endif | 660 #endif |
661 enumeration_completion_id_(0), | 661 enumeration_completion_id_(0), |
662 session_storage_namespace_id_(params.session_storage_namespace_id), | 662 session_storage_namespace_id_(params.session_storage_namespace_id), |
663 next_snapshot_id_(0), | 663 next_snapshot_id_(0), |
664 page_scale_factor_is_one_(true) { | 664 page_scale_factor_is_one_(true), |
| 665 debug_info_(params.debug_info) { |
665 } | 666 } |
666 | 667 |
667 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, | 668 void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
668 CompositorDependencies* compositor_deps, | 669 CompositorDependencies* compositor_deps, |
669 bool was_created_by_renderer) { | 670 bool was_created_by_renderer) { |
670 routing_id_ = params.view_id; | 671 routing_id_ = params.view_id; |
671 surface_id_ = params.surface_id; | 672 surface_id_ = params.surface_id; |
672 if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer) | 673 if (params.opener_route_id != MSG_ROUTING_NONE && was_created_by_renderer) |
673 opener_id_ = params.opener_route_id; | 674 opener_id_ = params.opener_route_id; |
674 | 675 |
(...skipping 3352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4027 std::vector<gfx::Size> sizes; | 4028 std::vector<gfx::Size> sizes; |
4028 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4029 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4029 if (!url.isEmpty()) | 4030 if (!url.isEmpty()) |
4030 urls.push_back( | 4031 urls.push_back( |
4031 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4032 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4032 } | 4033 } |
4033 SendUpdateFaviconURL(urls); | 4034 SendUpdateFaviconURL(urls); |
4034 } | 4035 } |
4035 | 4036 |
4036 } // namespace content | 4037 } // namespace content |
OLD | NEW |