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

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

Issue 1889313002: Revert of Browser Side Text Input State Tracking for OOPIF (Manual). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <functional> 10 #include <functional>
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 bool IsFullscreenForCurrentTab( 606 bool IsFullscreenForCurrentTab(
607 RenderWidgetHostImpl* render_widget_host) const override; 607 RenderWidgetHostImpl* render_widget_host) const override;
608 blink::WebDisplayMode GetDisplayMode( 608 blink::WebDisplayMode GetDisplayMode(
609 RenderWidgetHostImpl* render_widget_host) const override; 609 RenderWidgetHostImpl* render_widget_host) const override;
610 void LostCapture(RenderWidgetHostImpl* render_widget_host) override; 610 void LostCapture(RenderWidgetHostImpl* render_widget_host) override;
611 void LostMouseLock(RenderWidgetHostImpl* render_widget_host) override; 611 void LostMouseLock(RenderWidgetHostImpl* render_widget_host) override;
612 void ForwardCompositorProto(RenderWidgetHostImpl* render_widget_host, 612 void ForwardCompositorProto(RenderWidgetHostImpl* render_widget_host,
613 const std::vector<uint8_t>& proto) override; 613 const std::vector<uint8_t>& proto) override;
614 void OnRenderFrameProxyVisibilityChanged(bool visible) override; 614 void OnRenderFrameProxyVisibilityChanged(bool visible) override;
615 void SendScreenRects() override; 615 void SendScreenRects() override;
616 const TextInputState* GetTextInputState() override;
617 void UpdateTextInputState(RenderWidgetHostViewBase* rwhv,
618 bool text_input_state_changed) override;
619 616
620 // RenderFrameHostManager::Delegate ------------------------------------------ 617 // RenderFrameHostManager::Delegate ------------------------------------------
621 618
622 bool CreateRenderViewForRenderManager( 619 bool CreateRenderViewForRenderManager(
623 RenderViewHost* render_view_host, 620 RenderViewHost* render_view_host,
624 int opener_frame_routing_id, 621 int opener_frame_routing_id,
625 int proxy_routing_id, 622 int proxy_routing_id,
626 const FrameReplicationState& replicated_frame_state) override; 623 const FrameReplicationState& replicated_frame_state) override;
627 void CreateRenderWidgetHostViewForRenderManager( 624 void CreateRenderWidgetHostViewForRenderManager(
628 RenderViewHost* render_view_host) override; 625 RenderViewHost* render_view_host) override;
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 1349
1353 // Manages media players, CDMs, and power save blockers for media. 1350 // Manages media players, CDMs, and power save blockers for media.
1354 std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_; 1351 std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_;
1355 1352
1356 std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_; 1353 std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
1357 1354
1358 PageImportanceSignals page_importance_signals_; 1355 PageImportanceSignals page_importance_signals_;
1359 1356
1360 bool page_scale_factor_is_one_; 1357 bool page_scale_factor_is_one_;
1361 1358
1362 // The RWHV which is currently focused.
1363 base::WeakPtr<RenderWidgetHostViewBase> view_with_active_text_input_;
1364
1365 // A copy of the text input state from |view_with_active_text_input_| when
1366 // there exists one, or empty (type == ui::TEXT_INPUT_TYPE_NONE) if otherwise.
1367 std::unique_ptr<TextInputState> text_input_state_;
1368
1369 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1359 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1370 base::WeakPtrFactory<WebContentsImpl> weak_factory_; 1360 base::WeakPtrFactory<WebContentsImpl> weak_factory_;
1371 1361
1372 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1362 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1373 }; 1363 };
1374 1364
1375 // Dangerous methods which should never be made part of the public API, so we 1365 // Dangerous methods which should never be made part of the public API, so we
1376 // grant their use only to an explicit friend list (c++ attorney/client idiom). 1366 // grant their use only to an explicit friend list (c++ attorney/client idiom).
1377 class CONTENT_EXPORT WebContentsImpl::FriendZone { 1367 class CONTENT_EXPORT WebContentsImpl::FriendZone {
1378 private: 1368 private:
1379 friend class TestNavigationObserver; 1369 friend class TestNavigationObserver;
1380 friend class WebContentsAddedObserver; 1370 friend class WebContentsAddedObserver;
1381 friend class ContentBrowserSanityChecker; 1371 friend class ContentBrowserSanityChecker;
1382 1372
1383 FriendZone(); // Not instantiable. 1373 FriendZone(); // Not instantiable.
1384 1374
1385 // Adds/removes a callback called on creation of each new WebContents. 1375 // Adds/removes a callback called on creation of each new WebContents.
1386 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1376 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1387 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1377 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1388 1378
1389 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1379 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1390 }; 1380 };
1391 1381
1392 } // namespace content 1382 } // namespace content
1393 1383
1394 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1384 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698