Remove a bunch of dead code around WindowFeatures

third_party/WebKit/Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 
 #include "web/ChromeClientImpl.h"
 
 #include <memory>
 #include "bindings/core/v8/ScriptController.h"
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/Document.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/Node.h"
-#include "core/events/UIEventWithKeyState.h"
 #include "core/events/WebInputEventConversion.h"
 #include "core/exported/WebFileChooserCompletionImpl.h"
 #include "core/exported/WebPluginContainerBase.h"
 #include "core/exported/WebViewBase.h"
 #include "core/frame/LocalFrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/forms/ColorChooser.h"
@@ skipping 14 matching lines @@
 #include "modules/installedapp/InstalledAppController.h"
 #include "modules/mediastream/UserMediaController.h"
 #include "modules/navigatorcontentutils/NavigatorContentUtils.h"
 #include "modules/presentation/PresentationController.h"
 #include "modules/push_messaging/PushController.h"
 #include "modules/screen_orientation/ScreenOrientationControllerImpl.h"
 #include "modules/vr/VRController.h"
 #include "platform/Cursor.h"
 #include "platform/FileChooser.h"
 #include "platform/Histogram.h"
-#include "platform/KeyboardCodes.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/WebFrameScheduler.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/TouchAction.h"
 #include "platform/scheduler/renderer/web_view_scheduler.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/Optional.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/text/CString.h"
 #include "platform/wtf/text/CharacterNames.h"
 #include "platform/wtf/text/StringBuilder.h"
 #include "platform/wtf/text/StringConcatenate.h"
 #include "public/platform/WebCursorInfo.h"
 #include "public/platform/WebFloatRect.h"
-#include "public/platform/WebInputEvent.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/web/WebAXObject.h"
 #include "public/web/WebAutofillClient.h"
 #include "public/web/WebColorChooser.h"
 #include "public/web/WebColorSuggestion.h"
 #include "public/web/WebConsoleMessage.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebInputElement.h"
 #include "public/web/WebKit.h"
@@ skipping 164 matching lines @@
   WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
   WebReferrerPolicy policy = web_frame->GetDocument().GetReferrerPolicy();
   web_frame->LocalRoot()->FrameWidget()->StartDragging(
       policy, drag_data, mask, drag_image, drag_image_offset);
 }
 
 bool ChromeClientImpl::AcceptsLoadDrops() const {
   return !web_view_->Client() || web_view_->Client()->AcceptsLoadDrops();
 }
 
-namespace {

[Nate Chapin, 2017/05/31 16:55:13]

This whole namespace {} block moved to CreateWindow.cpp.
WebViewBase::CurrentInputEvent() is the only web/ layer concept present here, so
expose that on ChromeClient. Unfortunate to have to add it, but it seems like
less of a layering problem than the old way :)

-
-void UpdatePolicyForEvent(const WebInputEvent* input_event,
-                          NavigationPolicy* policy) {
-  if (!input_event)
-    return;
-
-  unsigned short button_number = 0;
-  if (input_event->GetType() == WebInputEvent::kMouseUp) {
-    const WebMouseEvent* mouse_event =
-        static_cast<const WebMouseEvent*>(input_event);
-
-    switch (mouse_event->button) {
-      case WebMouseEvent::Button::kLeft:
-        button_number = 0;
-        break;
-      case WebMouseEvent::Button::kMiddle:
-        button_number = 1;
-        break;
-      case WebMouseEvent::Button::kRight:
-        button_number = 2;
-        break;
-      default:
-        return;
-    }
-  } else if ((WebInputEvent::IsKeyboardEventType(input_event->GetType()) &&
-              static_cast<const WebKeyboardEvent*>(input_event)
-                      ->windows_key_code == VKEY_RETURN) ||
-             WebInputEvent::IsGestureEventType(input_event->GetType())) {
-    // Keyboard and gesture events can simulate mouse events.
-    button_number = 0;
-  } else {
-    return;
-  }
-
-  bool ctrl = input_event->GetModifiers() & WebInputEvent::kControlKey;
-  bool shift = input_event->GetModifiers() & WebInputEvent::kShiftKey;
-  bool alt = input_event->GetModifiers() & WebInputEvent::kAltKey;
-  bool meta = input_event->GetModifiers() & WebInputEvent::kMetaKey;
-
-  NavigationPolicy user_policy = *policy;
-  NavigationPolicyFromMouseEvent(button_number, ctrl, shift, alt, meta,
-                                 &user_policy);
-
-  // When the input event suggests a download, but the navigation was initiated
-  // by script, we should not override it.
-  if (user_policy == kNavigationPolicyDownload &&
-      *policy != kNavigationPolicyIgnore)
-    return;
-
-  // User and app agree that we want a new window; let the app override the
-  // decorations.
-  if (user_policy == kNavigationPolicyNewWindow &&
-      *policy == kNavigationPolicyNewPopup)
-    return;
-  *policy = user_policy;
-}
-
-WebNavigationPolicy GetNavigationPolicy(const WindowFeatures& features) {
-  // If the window features didn't enable the toolbar, or this window wasn't
-  // created by a user gesture, show as a popup instead of a new tab.
-  //
-  // Note: this previously also checked that menubar, resizable, scrollbar, and
-  // statusbar are enabled too. When no feature string is specified, these
-  // features default to enabled (and the window opens as a new tab). However,
-  // when a feature string is specified, any *unspecified* features default to
-  // disabled, often causing the window to open as a popup instead.
-  //
-  // As specifying menubar, resizable, scrollbar, and statusbar have no effect
-  // on the UI, just ignore them and only consider whether or not the toolbar is
-  // enabled, which matches Firefox's behavior.
-  bool as_popup = !features.tool_bar_visible;
-
-  NavigationPolicy policy = kNavigationPolicyNewForegroundTab;
-  if (as_popup)
-    policy = kNavigationPolicyNewPopup;
-  UpdatePolicyForEvent(WebViewBase::CurrentInputEvent(), &policy);
-
-  return static_cast<WebNavigationPolicy>(policy);
-}
-
-WebNavigationPolicy EffectiveNavigationPolicy(
-    NavigationPolicy navigation_policy,
-    const WindowFeatures& features) {
-  WebNavigationPolicy policy =
-      static_cast<WebNavigationPolicy>(navigation_policy);
-  if (policy == kWebNavigationPolicyIgnore)
-    return GetNavigationPolicy(features);
-  if (policy == kWebNavigationPolicyNewBackgroundTab &&
-      GetNavigationPolicy(features) != kWebNavigationPolicyNewBackgroundTab &&
-      !UIEventWithKeyState::NewTabModifierSetFromIsolatedWorld())
-    return kWebNavigationPolicyNewForegroundTab;
-
-  return policy;
-}
-
-}  // namespace
-
 Page* ChromeClientImpl::CreateWindow(LocalFrame* frame,
                                      const FrameLoadRequest& r,
                                      const WindowFeatures& features,
                                      NavigationPolicy navigation_policy) {
   if (!web_view_->Client())
     return nullptr;
 
   if (!frame->GetPage() || frame->GetPage()->Suspended())
     return nullptr;
-
-  WebNavigationPolicy policy =
-      EffectiveNavigationPolicy(navigation_policy, features);
   DCHECK(frame->GetDocument());
   Fullscreen::FullyExitFullscreen(*frame->GetDocument());
 
   WebViewBase* new_view =
       static_cast<WebViewBase*>(web_view_->Client()->CreateView(
           WebLocalFrameImpl::FromFrame(frame),
           WrappedResourceRequest(r.GetResourceRequest()), features,
-          r.FrameName(), policy,
-          r.GetShouldSetOpener() == kNeverSetOpener || features.noopener));
+          r.FrameName(), static_cast<WebNavigationPolicy>(navigation_policy),
+          r.GetShouldSetOpener() == kNeverSetOpener));
   if (!new_view)
     return nullptr;
   return new_view->GetPage();
 }
 
 void ChromeClientImpl::DidOverscroll(const FloatSize& overscroll_delta,
                                      const FloatSize& accumulated_overscroll,
                                      const FloatPoint& position_in_viewport,
                                      const FloatSize& velocity_in_viewport) {
   if (!web_view_->Client())
     return;
 
   web_view_->Client()->DidOverscroll(overscroll_delta, accumulated_overscroll,
                                      position_in_viewport,
                                      velocity_in_viewport);
 }
 
 void ChromeClientImpl::Show(NavigationPolicy navigation_policy) {
-  if (web_view_->Client())
+  if (web_view_->Client()) {
     web_view_->Client()->Show(
-        EffectiveNavigationPolicy(navigation_policy, window_features_));
-}
-
-void ChromeClientImpl::SetToolbarsVisible(bool value) {
-  window_features_.tool_bar_visible = value;
-}
-
-bool ChromeClientImpl::ToolbarsVisible() {
-  return window_features_.tool_bar_visible;
-}
-
-void ChromeClientImpl::SetStatusbarVisible(bool value) {
-  window_features_.status_bar_visible = value;
-}
-
-bool ChromeClientImpl::StatusbarVisible() {
-  return window_features_.status_bar_visible;
-}
-
-void ChromeClientImpl::SetScrollbarsVisible(bool value) {
-  window_features_.scrollbars_visible = value;
-  if (WebLocalFrameImpl* web_frame =
-          ToWebLocalFrameImpl(web_view_->MainFrame()))
-    web_frame->SetCanHaveScrollbars(value);
-}
-
-bool ChromeClientImpl::ScrollbarsVisible() {
-  return window_features_.scrollbars_visible;
-}
-
-void ChromeClientImpl::SetMenubarVisible(bool value) {
-  window_features_.menu_bar_visible = value;
-}
-
-bool ChromeClientImpl::MenubarVisible() {
-  return window_features_.menu_bar_visible;
-}
-
-void ChromeClientImpl::SetResizable(bool value) {
-  window_features_.resizable = value;
+        static_cast<WebNavigationPolicy>(navigation_policy));
+  }
 }
 
 bool ChromeClientImpl::ShouldReportDetailedMessageForSource(
     LocalFrame& local_frame,
     const String& url) {
   WebLocalFrameImpl* webframe =
       WebLocalFrameImpl::FromFrame(&local_frame.LocalFrameRoot());
   return webframe && webframe->Client() &&
          webframe->Client()->ShouldReportDetailedMessageForSource(url);
 }
@@ skipping 607 matching lines @@
   DCHECK(frame);
   WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
   WebFrameWidgetBase* widget = web_frame->LocalRoot()->FrameWidget();
   if (!widget)
     return;
 
   if (WebWidgetClient* client = widget->Client())
     client->SetTouchAction(static_cast<TouchAction>(touch_action));
 }
 
+const WebInputEvent* ChromeClientImpl::GetCurrentInputEvent() const {

[Nate Chapin, 2017/05/31 16:55:13]

Unfortunate to have to add this, but it seems like less of a layering problem
than the old way :)

+  return WebViewBase::CurrentInputEvent();

[kinuko, 2017/06/01 06:39:28]

WebViewBase.h is now in core/exported, would just calling this in Page.cpp
works? (Maybe not as it's still implemented in Source/web?)

[Nate Chapin, 2017/06/01 20:57:11]

Linker error :(

+}
+
 bool ChromeClientImpl::RequestPointerLock(LocalFrame* frame) {
   LocalFrame& local_root = frame->LocalFrameRoot();
   return WebLocalFrameImpl::FromFrame(&local_root)
       ->FrameWidget()
       ->Client()
       ->RequestPointerLock();
 }
 
 void ChromeClientImpl::RequestPointerUnlock(LocalFrame* frame) {
   LocalFrame& local_root = frame->LocalFrameRoot();
@@ skipping 175 matching lines @@
   if (RuntimeEnabledFeatures::presentationEnabled())
     PresentationController::ProvideTo(frame, client->PresentationClient());
   if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) {
     ProvideAudioOutputDeviceClientTo(frame,
                                      new AudioOutputDeviceClientImpl(frame));
   }
   InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher());
 }
 
 }  // namespace blink