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/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 411 is_subframe_(false), | 411 is_subframe_(false), |
| 412 force_disable_overscroll_content_(false), | 412 force_disable_overscroll_content_(false), |
| 413 last_dialog_suppressed_(false), | 413 last_dialog_suppressed_(false), |
| 414 geolocation_service_context_(new GeolocationServiceContext()), | 414 geolocation_service_context_(new GeolocationServiceContext()), |
| 415 accessibility_mode_( | 415 accessibility_mode_( |
| 416 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()), | 416 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()), |
| 417 audio_stream_monitor_(this), | 417 audio_stream_monitor_(this), |
| 418 bluetooth_connected_device_count_(0), | 418 bluetooth_connected_device_count_(0), |
| 419 virtual_keyboard_requested_(false), | 419 virtual_keyboard_requested_(false), |
| 420 page_scale_factor_is_one_(true), | 420 page_scale_factor_is_one_(true), |
| 421 mouse_lock_widget_(nullptr), | |
| 421 loading_weak_factory_(this), | 422 loading_weak_factory_(this), |
| 422 weak_factory_(this) { | 423 weak_factory_(this) { |
| 423 frame_tree_.SetFrameRemoveListener( | 424 frame_tree_.SetFrameRemoveListener( |
| 424 base::Bind(&WebContentsImpl::OnFrameRemoved, | 425 base::Bind(&WebContentsImpl::OnFrameRemoved, |
| 425 base::Unretained(this))); | 426 base::Unretained(this))); |
| 426 #if defined(OS_ANDROID) | 427 #if defined(OS_ANDROID) |
| 427 media_web_contents_observer_.reset(new MediaWebContentsObserverAndroid(this)); | 428 media_web_contents_observer_.reset(new MediaWebContentsObserverAndroid(this)); |
| 428 #else | 429 #else |
| 429 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); | 430 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); |
| 430 #endif | 431 #endif |
| (...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1683 if (delegate_ && delegate_->EmbedsFullscreenWidget()) | 1684 if (delegate_ && delegate_->EmbedsFullscreenWidget()) |
| 1684 delegate_->ExitFullscreenModeForTab(this); | 1685 delegate_->ExitFullscreenModeForTab(this); |
| 1685 FOR_EACH_OBSERVER(WebContentsObserver, | 1686 FOR_EACH_OBSERVER(WebContentsObserver, |
| 1686 observers_, | 1687 observers_, |
| 1687 DidDestroyFullscreenWidget()); | 1688 DidDestroyFullscreenWidget()); |
| 1688 fullscreen_widget_process_id_ = ChildProcessHost::kInvalidUniqueID; | 1689 fullscreen_widget_process_id_ = ChildProcessHost::kInvalidUniqueID; |
| 1689 fullscreen_widget_routing_id_ = MSG_ROUTING_NONE; | 1690 fullscreen_widget_routing_id_ = MSG_ROUTING_NONE; |
| 1690 if (fullscreen_widget_had_focus_at_shutdown_) | 1691 if (fullscreen_widget_had_focus_at_shutdown_) |
| 1691 view_->RestoreFocus(); | 1692 view_->RestoreFocus(); |
| 1692 } | 1693 } |
| 1694 | |
| 1695 if (mouse_lock_widget_ == render_widget_host) | |
| 1696 mouse_lock_widget_ = nullptr; | |
| 1693 } | 1697 } |
| 1694 | 1698 |
| 1695 void WebContentsImpl::RenderWidgetGotFocus( | 1699 void WebContentsImpl::RenderWidgetGotFocus( |
| 1696 RenderWidgetHostImpl* render_widget_host) { | 1700 RenderWidgetHostImpl* render_widget_host) { |
| 1697 // Notify the observers if an embedded fullscreen widget was focused. | 1701 // Notify the observers if an embedded fullscreen widget was focused. |
| 1698 if (delegate_ && render_widget_host && delegate_->EmbedsFullscreenWidget() && | 1702 if (delegate_ && render_widget_host && delegate_->EmbedsFullscreenWidget() && |
| 1699 render_widget_host->GetView() == GetFullscreenRenderWidgetHostView()) { | 1703 render_widget_host->GetView() == GetFullscreenRenderWidgetHostView()) { |
| 1700 NotifyWebContentsFocused(); | 1704 NotifyWebContentsFocused(); |
| 1701 } | 1705 } |
| 1702 } | 1706 } |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1881 return blink::WebDisplayModeBrowser; | 1885 return blink::WebDisplayModeBrowser; |
| 1882 | 1886 |
| 1883 return delegate_ ? delegate_->GetDisplayMode(this) | 1887 return delegate_ ? delegate_->GetDisplayMode(this) |
| 1884 : blink::WebDisplayModeBrowser; | 1888 : blink::WebDisplayModeBrowser; |
| 1885 } | 1889 } |
| 1886 | 1890 |
| 1887 void WebContentsImpl::RequestToLockMouse( | 1891 void WebContentsImpl::RequestToLockMouse( |
| 1888 RenderWidgetHostImpl* render_widget_host, | 1892 RenderWidgetHostImpl* render_widget_host, |
| 1889 bool user_gesture, | 1893 bool user_gesture, |
| 1890 bool last_unlocked_by_target) { | 1894 bool last_unlocked_by_target) { |
| 1891 if (render_widget_host != GetRenderViewHost()->GetWidget()) { | 1895 if (mouse_lock_widget_) { |
| 1892 render_widget_host->GotResponseToLockMouseRequest(false); | 1896 render_widget_host->GotResponseToLockMouseRequest(false); |
| 1893 return; | 1897 return; |
| 1894 } | 1898 } |
| 1895 | 1899 |
| 1896 if (delegate_) | 1900 bool widget_in_frame_tree = false; |
| 1901 for (FrameTreeNode* node : frame_tree_.Nodes()) { | |
| 1902 if (node->current_frame_host()->GetRenderWidgetHost() == | |
| 1903 render_widget_host) { | |
| 1904 widget_in_frame_tree = true; | |
| 1905 break; | |
| 1906 } | |
| 1907 } | |
| 1908 | |
| 1909 if (widget_in_frame_tree && delegate_) { | |
| 1910 mouse_lock_widget_ = render_widget_host; | |
| 1897 delegate_->RequestToLockMouse(this, user_gesture, last_unlocked_by_target); | 1911 delegate_->RequestToLockMouse(this, user_gesture, last_unlocked_by_target); |
| 1898 else | 1912 } else |
|
nasko
2016/05/25 21:12:01
The else clause also needs {} if the if clause has
lfg
2016/05/31 21:13:20
Done.
| |
| 1899 GotResponseToLockMouseRequest(false); | 1913 render_widget_host->GotResponseToLockMouseRequest(false); |
| 1900 } | 1914 } |
| 1901 | 1915 |
| 1902 void WebContentsImpl::LostMouseLock(RenderWidgetHostImpl* render_widget_host) { | 1916 void WebContentsImpl::LostMouseLock(RenderWidgetHostImpl* render_widget_host) { |
| 1903 if (!RenderViewHostImpl::From(render_widget_host)) | 1917 CHECK(mouse_lock_widget_); |
| 1904 return; | 1918 mouse_lock_widget_->SendMouseLockLost(); |
| 1919 mouse_lock_widget_ = nullptr; | |
| 1905 | 1920 |
| 1906 if (delegate_) | 1921 if (delegate_) |
| 1907 delegate_->LostMouseLock(); | 1922 delegate_->LostMouseLock(); |
| 1908 } | 1923 } |
| 1909 | 1924 |
| 1910 void WebContentsImpl::ForwardCompositorProto( | 1925 void WebContentsImpl::ForwardCompositorProto( |
| 1911 RenderWidgetHostImpl* render_widget_host, | 1926 RenderWidgetHostImpl* render_widget_host, |
| 1912 const std::vector<uint8_t>& proto) { | 1927 const std::vector<uint8_t>& proto) { |
| 1913 if (delegate_) | 1928 if (delegate_) |
| 1914 delegate_->ForwardCompositorProto(render_widget_host, proto); | 1929 delegate_->ForwardCompositorProto(render_widget_host, proto); |
| (...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2928 } | 2943 } |
| 2929 | 2944 |
| 2930 gfx::Size WebContentsImpl::GetPreferredSize() const { | 2945 gfx::Size WebContentsImpl::GetPreferredSize() const { |
| 2931 return capturer_count_ == 0 ? preferred_size_ : preferred_size_for_capture_; | 2946 return capturer_count_ == 0 ? preferred_size_ : preferred_size_for_capture_; |
| 2932 } | 2947 } |
| 2933 | 2948 |
| 2934 bool WebContentsImpl::GotResponseToLockMouseRequest(bool allowed) { | 2949 bool WebContentsImpl::GotResponseToLockMouseRequest(bool allowed) { |
| 2935 if (GetBrowserPluginGuest()) | 2950 if (GetBrowserPluginGuest()) |
| 2936 return GetBrowserPluginGuest()->LockMouse(allowed); | 2951 return GetBrowserPluginGuest()->LockMouse(allowed); |
| 2937 | 2952 |
| 2938 return GetRenderViewHost() | 2953 if (mouse_lock_widget_) |
| 2939 ? GetRenderViewHost()->GetWidget()->GotResponseToLockMouseRequest( | 2954 return mouse_lock_widget_->GotResponseToLockMouseRequest(allowed); |
| 2940 allowed) | 2955 return false; |
| 2941 : false; | |
| 2942 } | 2956 } |
| 2943 | 2957 |
| 2944 bool WebContentsImpl::HasOpener() const { | 2958 bool WebContentsImpl::HasOpener() const { |
| 2945 return GetOpener() != NULL; | 2959 return GetOpener() != NULL; |
| 2946 } | 2960 } |
| 2947 | 2961 |
| 2948 WebContentsImpl* WebContentsImpl::GetOpener() const { | 2962 WebContentsImpl* WebContentsImpl::GetOpener() const { |
| 2949 FrameTreeNode* opener_ftn = frame_tree_.root()->opener(); | 2963 FrameTreeNode* opener_ftn = frame_tree_.root()->opener(); |
| 2950 return opener_ftn ? FromFrameTreeNode(opener_ftn) : nullptr; | 2964 return opener_ftn ? FromFrameTreeNode(opener_ftn) : nullptr; |
| 2951 } | 2965 } |
| (...skipping 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5039 for (RenderViewHost* render_view_host : render_view_host_set) | 5053 for (RenderViewHost* render_view_host : render_view_host_set) |
| 5040 render_view_host->OnWebkitPreferencesChanged(); | 5054 render_view_host->OnWebkitPreferencesChanged(); |
| 5041 } | 5055 } |
| 5042 | 5056 |
| 5043 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 5057 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
| 5044 JavaScriptDialogManager* dialog_manager) { | 5058 JavaScriptDialogManager* dialog_manager) { |
| 5045 dialog_manager_ = dialog_manager; | 5059 dialog_manager_ = dialog_manager; |
| 5046 } | 5060 } |
| 5047 | 5061 |
| 5048 } // namespace content | 5062 } // namespace content |
| OLD | NEW |