mac: Remove features::IsViewsBrowserCocoa() and its last calls.

While here, also remove unused GetAllowOtherViews() / SetAllowOtherViews()
from WebContents and WebContentsView.

Bug: 832676
Change-Id: I18e6385b08599e12e0a8f2d85c06d429e92396c7
Reviewed-on: https://chromium-review.googlesource.com/1251323Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595253}

chrome/browser/ui/views_mode_controller.cc

@@ -12,7 +12,9 @@
 namespace views_mode_controller {
 
 bool IsViewsBrowserCocoa() {
-  return features::IsViewsBrowserCocoa();
+  // TODO(https://crbug.com/832676): Delete all code guarded on this function
+  // returning true and then remove this function.
+  return false;
 }
 
 }  // namespace views_mode_controller

chrome/browser/ui/views_mode_controller.h

@@ -14,7 +14,9 @@
 namespace views_mode_controller {
 
 // Returns whether a Views-capable browser build should use the Cocoa browser
-// UI.
+// UI. Always returns false.
+// TODO(https://crbug.com/832676): Delete all code guarded on this function
+// returning true and then remove this function.
 bool IsViewsBrowserCocoa();
 
 }  // namespace views_mode_controller

content/browser/renderer_host/render_widget_host_view_mac.h

@@ -92,7 +92,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   // |delegate| should be set at most once.
   CONTENT_EXPORT void SetDelegate(
     NSObject<RenderWidgetHostViewMacDelegate>* delegate);
-  void SetAllowPauseForResizeOrRepaint(bool allow);
 
   // RenderWidgetHostView implementation.
   void InitAsChild(gfx::NativeView parent_view) override;

content/browser/renderer_host/render_widget_host_view_mac.mm

@@ -217,13 +217,9 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
   // startup raciness and decrease latency.
   needs_begin_frames_ = needs_begin_frames;
   UpdateNeedsBeginFramesInternal();
-  if (features::IsViewsBrowserCocoa())
-    ui::CATransactionCoordinator::Get().AddPreCommitObserver(this);
 }
 
 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
-  if (features::IsViewsBrowserCocoa())
-    ui::CATransactionCoordinator::Get().RemovePreCommitObserver(this);
   if (popup_parent_host_view_) {
     DCHECK(!popup_parent_host_view_->popup_child_host_view_ ||
            popup_parent_host_view_->popup_child_host_view_ == this);
@@ -308,11 +304,6 @@ void RenderWidgetHostViewMac::SetDelegate(
   [cocoa_view() setResponderDelegate:delegate];
 }
 
-void RenderWidgetHostViewMac::SetAllowPauseForResizeOrRepaint(bool allow) {
-  // TODO: Remove SetAllowPauseForResizeOrRepaint and SetAllowOtherViews, since
-  // they aren't used anymore.
-}
-
 ui::TextInputType RenderWidgetHostViewMac::GetTextInputType() {
   if (!GetActiveWidget())
     return ui::TEXT_INPUT_TYPE_NONE;
@@ -409,9 +400,6 @@ void RenderWidgetHostViewMac::UpdateNSViewAndDisplayProperties() {
     LOG(ERROR) << "Failed to create display link.";
   }
 
-  if (features::IsViewsBrowserCocoa())
-    ui::CATransactionCoordinator::Get().Synchronize();
-
   // During auto-resize it is the responsibility of the caller to ensure that
   // the NSView and RenderWidgetHostImpl are kept in sync.
   if (host()->auto_resize_enabled())

content/browser/web_contents/web_contents_impl.cc

@@ -6229,16 +6229,6 @@ service_manager::InterfaceProvider* WebContentsImpl::GetJavaInterfaces() {
   return java_interfaces_.get();
 }
 
-#elif defined(OS_MACOSX)
-
-void WebContentsImpl::SetAllowOtherViews(bool allow) {
-  view_->SetAllowOtherViews(allow);
-}
-
-bool WebContentsImpl::GetAllowOtherViews() {
-  return view_->GetAllowOtherViews();
-}
-
 #endif
 
 bool WebContentsImpl::CompletedFirstVisuallyNonEmptyPaint() const {

content/browser/web_contents/web_contents_impl.h

@@ -464,9 +464,6 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
   void ActivateNearestFindResult(float x, float y) override;
   void RequestFindMatchRects(int current_version) override;
   service_manager::InterfaceProvider* GetJavaInterfaces() override;
-#elif defined(OS_MACOSX)
-  void SetAllowOtherViews(bool allow) override;
-  bool GetAllowOtherViews() override;
 #endif
 
   bool HasRecentInteractiveInputEvent() const override;

content/browser/web_contents/web_contents_view.h

@@ -123,13 +123,6 @@ class WebContentsView {
   virtual void SetOverscrollControllerEnabled(bool enabled) = 0;
 
 #if defined(OS_MACOSX)
-  // Allowing other views disables optimizations which assume that only a single
-  // WebContents is present.
-  virtual void SetAllowOtherViews(bool allow) = 0;
-
-  // Returns true if other views are allowed, false otherwise.
-  virtual bool GetAllowOtherViews() const = 0;
-
   // If we close the tab while a UI control is in an event-tracking
   // loop, the control may message freed objects and crash.
   // WebContents::Close() calls IsEventTracking(), and if it returns

content/browser/web_contents/web_contents_view_child_frame.cc

@@ -117,15 +117,6 @@ bool WebContentsViewChildFrame::IsEventTracking() const {
 void WebContentsViewChildFrame::CloseTabAfterEventTracking() {
   NOTREACHED();
 }
-
-void WebContentsViewChildFrame::SetAllowOtherViews(bool allow) {
-  NOTREACHED();
-}
-
-bool WebContentsViewChildFrame::GetAllowOtherViews() const {
-  NOTREACHED();
-  return false;
-}
 #endif
 
 void WebContentsViewChildFrame::RestoreFocus() {

content/browser/web_contents/web_contents_view_child_frame.h

@@ -50,8 +50,6 @@ class WebContentsViewChildFrame : public WebContentsView,
                              RenderViewHost* new_host) override;
   void SetOverscrollControllerEnabled(bool enabled) override;
 #if defined(OS_MACOSX)
-  void SetAllowOtherViews(bool allow) override;
-  bool GetAllowOtherViews() const override;
   bool IsEventTracking() const override;
   void CloseTabAfterEventTracking() override;
 #endif

content/browser/web_contents/web_contents_view_guest.cc

@@ -117,16 +117,6 @@ gfx::Rect WebContentsViewGuest::GetViewBounds() const {
   return gfx::Rect(size_);
 }
 
-#if defined(OS_MACOSX)
-void WebContentsViewGuest::SetAllowOtherViews(bool allow) {
-  platform_view_->SetAllowOtherViews(allow);
-}
-
-bool WebContentsViewGuest::GetAllowOtherViews() const {
-  return platform_view_->GetAllowOtherViews();
-}
-#endif
-
 void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
                                       gfx::NativeView context) {
   platform_view_->CreateView(initial_size, context);

content/browser/web_contents/web_contents_view_guest.h

@@ -68,8 +68,6 @@ class WebContentsViewGuest : public WebContentsView,
                              RenderViewHost* new_host) override;
   void SetOverscrollControllerEnabled(bool enabled) override;
 #if defined(OS_MACOSX)
-  void SetAllowOtherViews(bool allow) override;
-  bool GetAllowOtherViews() const override;
   bool IsEventTracking() const override;
   void CloseTabAfterEventTracking() override;
 #endif

content/browser/web_contents/web_contents_view_mac.h

@@ -91,8 +91,6 @@ class WebContentsViewMac : public WebContentsView,
   void FocusThroughTabTraversal(bool reverse) override;
   DropData* GetDropData() const override;
   gfx::Rect GetViewBounds() const override;
-  void SetAllowOtherViews(bool allow) override;
-  bool GetAllowOtherViews() const override;
   void CreateView(const gfx::Size& initial_size,
                   gfx::NativeView context) override;
   RenderWidgetHostViewBase* CreateViewForWidget(
@@ -165,9 +163,6 @@ class WebContentsViewMac : public WebContentsView,
   // Our optional delegate.
   std::unique_ptr<WebContentsViewDelegate> delegate_;
 
-  // Whether to allow other views.
-  bool allow_other_views_;
-
   // This contains all RenderWidgetHostViewMacs that have been added as child
   // NSViews to this NSView. Note that this list may contain RWHVMacs besides
   // just |web_contents_->GetRenderWidgetHostView()|. The only time that the

content/browser/web_contents/web_contents_view_mac.mm

@@ -105,10 +105,7 @@ WebContentsView* CreateWebContentsView(
 
 WebContentsViewMac::WebContentsViewMac(WebContentsImpl* web_contents,
                                        WebContentsViewDelegate* delegate)
-    : web_contents_(web_contents),
-      delegate_(delegate),
-      allow_other_views_(false) {
-}
+    : web_contents_(web_contents), delegate_(delegate) {}
 
 WebContentsViewMac::~WebContentsViewMac() {
   // This handles the case where a renderer close call was deferred
@@ -322,21 +319,6 @@ gfx::Rect WebContentsViewMac::GetViewBounds() const {
   return gfx::ScreenRectFromNSRect(window_bounds);
 }
 
-void WebContentsViewMac::SetAllowOtherViews(bool allow) {
-  if (allow_other_views_ == allow)
-    return;
-
-  allow_other_views_ = allow;
-  RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (view)
-    view->SetAllowPauseForResizeOrRepaint(!allow_other_views_);
-}
-
-bool WebContentsViewMac::GetAllowOtherViews() const {
-  return allow_other_views_;
-}
-
 void WebContentsViewMac::CreateView(
     const gfx::Size& initial_size, gfx::NativeView context) {
   WebContentsViewCocoa* view =
@@ -369,7 +351,6 @@ RenderWidgetHostViewBase* WebContentsViewMac::CreateViewForWidget(
 
     view->SetDelegate(rw_delegate.get());
   }
-  view->SetAllowPauseForResizeOrRepaint(!allow_other_views_);
 
   // Add the RenderWidgetHostView to the ui::Layer heirarchy.
   child_views_.push_back(view->GetWeakPtr());

content/public/browser/web_contents.h

@@ -912,13 +912,6 @@ class WebContents : public PageNavigator,
   // scoped to this WebContents. This provides access to interfaces implemented
   // in Java in the browser process to C++ code in the browser process.
   virtual service_manager::InterfaceProvider* GetJavaInterfaces() = 0;
-#elif defined(OS_MACOSX)
-  // Allowing other views disables optimizations which assume that only a single
-  // WebContents is present.
-  virtual void SetAllowOtherViews(bool allow) = 0;
-
-  // Returns true if other views are allowed, false otherwise.
-  virtual bool GetAllowOtherViews() = 0;
 #endif  // OS_ANDROID
 
   // Returns true if the WebContents has completed its first meaningful paint

ui/base/ui_base_features.cc

@@ -153,14 +153,6 @@ const base::Feature kHostWindowsInAppShimProcess{
 bool HostWindowsInAppShimProcess() {
   return base::FeatureList::IsEnabled(kHostWindowsInAppShimProcess);
 }
-
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-bool IsViewsBrowserCocoa() {
-  // TODO(https://crbug.com/832676): Delete all code guarded on this function
-  // returning true and then remove this function.
-  return false;
-}
-#endif  //  BUILDFLAG(MAC_VIEWS_BROWSER)
 #endif  //  defined(OS_MACOSX)
 
 const base::Feature kEnableOzoneDrmMojo = {"OzoneDrmMojo",

ui/base/ui_base_features.h

@@ -73,14 +73,6 @@ UI_BASE_EXPORT extern const base::Feature kHostWindowsInAppShimProcess;
 // Returns true if the NSWindows for apps will be created in the app's process,
 // and will forward input to the browser process.
 UI_BASE_EXPORT bool HostWindowsInAppShimProcess();
-
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-// Returns whether a Views-capable browser build should use the Cocoa browser
-// UI. Always returns false.
-// TODO(https://crbug.com/832676): Delete all code guarded on this function
-// returning true and then remove this function.
-UI_BASE_EXPORT bool IsViewsBrowserCocoa();
-#endif  //  BUILDFLAG(MAC_VIEWS_BROWSER)
 #endif  //  defined(OS_MACOSX)
 
 // Use mojo communication in the drm platform instead of paramtraits. Remove