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 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 devtools_agent_(NULL), | 659 devtools_agent_(NULL), |
660 accessibility_mode_(AccessibilityModeOff), | 660 accessibility_mode_(AccessibilityModeOff), |
661 renderer_accessibility_(NULL), | 661 renderer_accessibility_(NULL), |
662 java_bridge_dispatcher_(NULL), | 662 java_bridge_dispatcher_(NULL), |
663 mouse_lock_dispatcher_(NULL), | 663 mouse_lock_dispatcher_(NULL), |
664 #if defined(OS_ANDROID) | 664 #if defined(OS_ANDROID) |
665 body_background_color_(SK_ColorWHITE), | 665 body_background_color_(SK_ColorWHITE), |
666 update_frame_info_scheduled_(false), | 666 update_frame_info_scheduled_(false), |
667 expected_content_intent_id_(0), | 667 expected_content_intent_id_(0), |
668 media_player_proxy_(NULL), | 668 media_player_proxy_(NULL), |
| 669 #endif |
| 670 #if defined(OS_WIN) |
| 671 focused_plugin_id_(-1), |
| 672 #endif |
669 enumeration_completion_id_(0), | 673 enumeration_completion_id_(0), |
| 674 #if defined(OS_ANDROID) |
670 ALLOW_THIS_IN_INITIALIZER_LIST( | 675 ALLOW_THIS_IN_INITIALIZER_LIST( |
671 load_progress_tracker_(new LoadProgressTracker(this))), | 676 load_progress_tracker_(new LoadProgressTracker(this))), |
672 #endif | 677 #endif |
673 session_storage_namespace_id_(params->session_storage_namespace_id), | 678 session_storage_namespace_id_(params->session_storage_namespace_id), |
674 decrement_shared_popup_at_destruction_(false), | 679 decrement_shared_popup_at_destruction_(false), |
675 handling_select_range_(false), | 680 handling_select_range_(false), |
676 next_snapshot_id_(0), | 681 next_snapshot_id_(0), |
677 allow_partial_swap_(params->allow_partial_swap), | 682 allow_partial_swap_(params->allow_partial_swap), |
678 #if defined(OS_WIN) | |
679 focused_plugin_id_(-1), | |
680 #endif | |
681 updating_frame_tree_(false), | 683 updating_frame_tree_(false), |
682 pending_frame_tree_update_(false), | 684 pending_frame_tree_update_(false), |
683 target_process_id_(0), | 685 target_process_id_(0), |
684 target_routing_id_(0) { | 686 target_routing_id_(0) { |
685 } | 687 } |
686 | 688 |
687 void RenderViewImpl::Initialize(RenderViewImplParams* params) { | 689 void RenderViewImpl::Initialize(RenderViewImplParams* params) { |
688 #if defined(ENABLE_PLUGINS) | 690 #if defined(ENABLE_PLUGINS) |
689 pepper_helper_.reset(new PepperPluginDelegateImpl(this)); | 691 pepper_helper_.reset(new PepperPluginDelegateImpl(this)); |
690 #else | 692 #else |
(...skipping 5926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6617 WebURL url = icon_urls[i].iconURL(); | 6619 WebURL url = icon_urls[i].iconURL(); |
6618 if (!url.isEmpty()) | 6620 if (!url.isEmpty()) |
6619 urls.push_back(FaviconURL(url, | 6621 urls.push_back(FaviconURL(url, |
6620 ToFaviconType(icon_urls[i].iconType()))); | 6622 ToFaviconType(icon_urls[i].iconType()))); |
6621 } | 6623 } |
6622 SendUpdateFaviconURL(urls); | 6624 SendUpdateFaviconURL(urls); |
6623 } | 6625 } |
6624 | 6626 |
6625 | 6627 |
6626 } // namespace content | 6628 } // namespace content |
OLD | NEW |