Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1948343002: [reland] Browser Side Text Input State Tracking for OOPIF (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "content/browser/media/media_web_contents_observer.h" 58 #include "content/browser/media/media_web_contents_observer.h"
59 #include "content/browser/media/session/media_session.h" 59 #include "content/browser/media/session/media_session.h"
60 #include "content/browser/message_port_message_filter.h" 60 #include "content/browser/message_port_message_filter.h"
61 #include "content/browser/plugin_content_origin_whitelist.h" 61 #include "content/browser/plugin_content_origin_whitelist.h"
62 #include "content/browser/renderer_host/render_process_host_impl.h" 62 #include "content/browser/renderer_host/render_process_host_impl.h"
63 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 63 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
64 #include "content/browser/renderer_host/render_view_host_impl.h" 64 #include "content/browser/renderer_host/render_view_host_impl.h"
65 #include "content/browser/renderer_host/render_widget_host_impl.h" 65 #include "content/browser/renderer_host/render_widget_host_impl.h"
66 #include "content/browser/renderer_host/render_widget_host_input_event_router.h" 66 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
67 #include "content/browser/renderer_host/render_widget_host_view_base.h" 67 #include "content/browser/renderer_host/render_widget_host_view_base.h"
68 #include "content/browser/renderer_host/text_input_manager.h"
68 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h" 69 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h"
69 #include "content/browser/site_instance_impl.h" 70 #include "content/browser/site_instance_impl.h"
70 #include "content/browser/wake_lock/wake_lock_service_context.h" 71 #include "content/browser/wake_lock/wake_lock_service_context.h"
71 #include "content/browser/web_contents/web_contents_view_child_frame.h" 72 #include "content/browser/web_contents/web_contents_view_child_frame.h"
72 #include "content/browser/web_contents/web_contents_view_guest.h" 73 #include "content/browser/web_contents/web_contents_view_guest.h"
73 #include "content/browser/webui/generic_handler.h" 74 #include "content/browser/webui/generic_handler.h"
74 #include "content/browser/webui/web_ui_controller_factory_registry.h" 75 #include "content/browser/webui/web_ui_controller_factory_registry.h"
75 #include "content/browser/webui/web_ui_impl.h" 76 #include "content/browser/webui/web_ui_impl.h"
76 #include "content/common/browser_plugin/browser_plugin_constants.h" 77 #include "content/common/browser_plugin/browser_plugin_constants.h"
77 #include "content/common/browser_plugin/browser_plugin_messages.h" 78 #include "content/common/browser_plugin/browser_plugin_messages.h"
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 render_manager->CreateOuterDelegateProxy( 1408 render_manager->CreateOuterDelegateProxy(
1408 outer_contents_frame->GetSiteInstance(), 1409 outer_contents_frame->GetSiteInstance(),
1409 static_cast<RenderFrameHostImpl*>(outer_contents_frame)); 1410 static_cast<RenderFrameHostImpl*>(outer_contents_frame));
1410 1411
1411 render_manager->SetRWHViewForInnerContents( 1412 render_manager->SetRWHViewForInnerContents(
1412 render_manager->GetRenderWidgetHostView()); 1413 render_manager->GetRenderWidgetHostView());
1413 1414
1414 static_cast<RenderWidgetHostViewChildFrame*>( 1415 static_cast<RenderWidgetHostViewChildFrame*>(
1415 render_manager->GetRenderWidgetHostView()) 1416 render_manager->GetRenderWidgetHostView())
1416 ->RegisterSurfaceNamespaceId(); 1417 ->RegisterSurfaceNamespaceId();
1418
1419 // At this point, we should destroy the TextInputManager which will notify all
1420 // the RWHV in this WebContents. The RWHV in this WebContents should use the
1421 // TextInputManager owned by the outer WebContents.
1422 // TODO(ekaramad): Is it possible to have TextInputState before attaching to
1423 // outer WebContents? In such a case, is this still the right way to hand off
1424 // state tracking from inner WebContents's TextInputManager to that of the
1425 // outer WebContent (crbug.com/609846)?
1426 text_input_manager_.reset(nullptr);
1417 } 1427 }
1418 1428
1419 void WebContentsImpl::Stop() { 1429 void WebContentsImpl::Stop() {
1420 for (FrameTreeNode* node : frame_tree_.Nodes()) 1430 for (FrameTreeNode* node : frame_tree_.Nodes())
1421 node->StopLoading(); 1431 node->StopLoading();
1422 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); 1432 FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped());
1423 } 1433 }
1424 1434
1425 WebContents* WebContentsImpl::Clone() { 1435 WebContents* WebContentsImpl::Clone() {
1426 // We use our current SiteInstance since the cloned entry will use it anyway. 1436 // We use our current SiteInstance since the cloned entry will use it anyway.
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
2379 if (browser_plugin_embedder_) 2389 if (browser_plugin_embedder_)
2380 browser_plugin_embedder_->DidSendScreenRects(); 2390 browser_plugin_embedder_->DidSendScreenRects();
2381 } 2391 }
2382 2392
2383 void WebContentsImpl::OnFirstPaintAfterLoad( 2393 void WebContentsImpl::OnFirstPaintAfterLoad(
2384 RenderWidgetHostImpl* render_widget_host) { 2394 RenderWidgetHostImpl* render_widget_host) {
2385 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2395 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2386 DidFirstPaintAfterLoad(render_widget_host)); 2396 DidFirstPaintAfterLoad(render_widget_host));
2387 } 2397 }
2388 2398
2399 TextInputManager* WebContentsImpl::GetTextInputManager() {
2400 if (GetOuterWebContents())
2401 return GetOuterWebContents()->GetTextInputManager();
2402
2403 if (!text_input_manager_)
2404 text_input_manager_.reset(new TextInputManager());
2405
2406 return text_input_manager_.get();
2407 }
2408
2389 BrowserAccessibilityManager* 2409 BrowserAccessibilityManager*
2390 WebContentsImpl::GetRootBrowserAccessibilityManager() { 2410 WebContentsImpl::GetRootBrowserAccessibilityManager() {
2391 RenderFrameHostImpl* rfh = GetMainFrame(); 2411 RenderFrameHostImpl* rfh = GetMainFrame();
2392 return rfh ? rfh->browser_accessibility_manager() : nullptr; 2412 return rfh ? rfh->browser_accessibility_manager() : nullptr;
2393 } 2413 }
2394 2414
2395 BrowserAccessibilityManager* 2415 BrowserAccessibilityManager*
2396 WebContentsImpl::GetOrCreateRootBrowserAccessibilityManager() { 2416 WebContentsImpl::GetOrCreateRootBrowserAccessibilityManager() {
2397 RenderFrameHostImpl* rfh = GetMainFrame(); 2417 RenderFrameHostImpl* rfh = GetMainFrame();
2398 return rfh ? rfh->GetOrCreateBrowserAccessibilityManager() : nullptr; 2418 return rfh ? rfh->GetOrCreateBrowserAccessibilityManager() : nullptr;
(...skipping 2664 matching lines...) Expand 10 before | Expand all | Expand 10 after
5063 for (RenderViewHost* render_view_host : render_view_host_set) 5083 for (RenderViewHost* render_view_host : render_view_host_set)
5064 render_view_host->OnWebkitPreferencesChanged(); 5084 render_view_host->OnWebkitPreferencesChanged();
5065 } 5085 }
5066 5086
5067 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5087 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5068 JavaScriptDialogManager* dialog_manager) { 5088 JavaScriptDialogManager* dialog_manager) {
5069 dialog_manager_ = dialog_manager; 5089 dialog_manager_ = dialog_manager;
5070 } 5090 }
5071 5091
5072 } // namespace content 5092 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698