| 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/bind.h" | 10 #include "base/bind.h" |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 devtools_agent_(NULL), | 616 devtools_agent_(NULL), |
| 617 accessibility_mode_(AccessibilityModeOff), | 617 accessibility_mode_(AccessibilityModeOff), |
| 618 renderer_accessibility_(NULL), | 618 renderer_accessibility_(NULL), |
| 619 java_bridge_dispatcher_(NULL), | 619 java_bridge_dispatcher_(NULL), |
| 620 mouse_lock_dispatcher_(NULL), | 620 mouse_lock_dispatcher_(NULL), |
| 621 #if defined(OS_ANDROID) | 621 #if defined(OS_ANDROID) |
| 622 body_background_color_(SK_ColorWHITE), | 622 body_background_color_(SK_ColorWHITE), |
| 623 expected_content_intent_id_(0), | 623 expected_content_intent_id_(0), |
| 624 media_player_proxy_(NULL), | 624 media_player_proxy_(NULL), |
| 625 synchronous_find_active_match_ordinal_(-1), | 625 synchronous_find_active_match_ordinal_(-1), |
| 626 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 627 load_progress_tracker_(new LoadProgressTracker(this))), |
| 626 #endif | 628 #endif |
| 627 session_storage_namespace_id_(session_storage_namespace_id), | 629 session_storage_namespace_id_(session_storage_namespace_id), |
| 628 handling_select_range_(false), | 630 handling_select_range_(false), |
| 629 #if defined(OS_WIN) | 631 #if defined(OS_WIN) |
| 630 focused_plugin_id_(-1), | 632 focused_plugin_id_(-1), |
| 631 #endif | 633 #endif |
| 632 guest_to_embedder_channel_(guest_to_embedder_channel), | 634 guest_to_embedder_channel_(guest_to_embedder_channel), |
| 633 guest_pp_instance_(0), | 635 guest_pp_instance_(0), |
| 634 guest_uninitialized_context_(NULL), | 636 guest_uninitialized_context_(NULL), |
| 635 updating_frame_tree_(false), | 637 updating_frame_tree_(false), |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 857 | 859 |
| 858 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { | 860 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { |
| 859 observer->RenderViewGone(); | 861 observer->RenderViewGone(); |
| 860 observers_.RemoveObserver(observer); | 862 observers_.RemoveObserver(observer); |
| 861 } | 863 } |
| 862 | 864 |
| 863 WebKit::WebView* RenderViewImpl::webview() const { | 865 WebKit::WebView* RenderViewImpl::webview() const { |
| 864 return static_cast<WebKit::WebView*>(webwidget()); | 866 return static_cast<WebKit::WebView*>(webwidget()); |
| 865 } | 867 } |
| 866 | 868 |
| 867 void RenderViewImpl::SetReportLoadProgressEnabled(bool enabled) { | |
| 868 if (!enabled) { | |
| 869 load_progress_tracker_.reset(NULL); | |
| 870 return; | |
| 871 } | |
| 872 if (load_progress_tracker_ == NULL) | |
| 873 load_progress_tracker_.reset(new LoadProgressTracker(this)); | |
| 874 } | |
| 875 | |
| 876 old::GuestToEmbedderChannel* RenderViewImpl::GetGuestToEmbedderChannel() const { | 869 old::GuestToEmbedderChannel* RenderViewImpl::GetGuestToEmbedderChannel() const { |
| 877 return guest_to_embedder_channel_; | 870 return guest_to_embedder_channel_; |
| 878 } | 871 } |
| 879 | 872 |
| 880 void RenderViewImpl::SetGuestToEmbedderChannel( | 873 void RenderViewImpl::SetGuestToEmbedderChannel( |
| 881 old::GuestToEmbedderChannel* channel) { | 874 old::GuestToEmbedderChannel* channel) { |
| 882 guest_to_embedder_channel_ = channel; | 875 guest_to_embedder_channel_ = channel; |
| 883 } | 876 } |
| 884 | 877 |
| 885 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path) { | 878 void RenderViewImpl::PluginCrashed(const FilePath& plugin_path) { |
| (...skipping 5548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6434 } | 6427 } |
| 6435 #endif | 6428 #endif |
| 6436 | 6429 |
| 6437 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6430 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
| 6438 TransportDIB::Handle dib_handle) { | 6431 TransportDIB::Handle dib_handle) { |
| 6439 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6432 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
| 6440 RenderProcess::current()->ReleaseTransportDIB(dib); | 6433 RenderProcess::current()->ReleaseTransportDIB(dib); |
| 6441 } | 6434 } |
| 6442 | 6435 |
| 6443 } // namespace content | 6436 } // namespace content |
| OLD | NEW |