Common up the determination of navigation policy.

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 186 matching lines @@
     m_webView->client()->setKeyboardFocusURL(focusURL);
 }
 
 void ChromeClientImpl::focusedFrameChanged(LocalFrame* frame)
 {
     WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame);
     if (webframe && webframe->client())
         webframe->client()->frameFocused();
 }
 
-Page* ChromeClientImpl::createWindow(LocalFrame* frame, const FrameLoadRequest& r, const WindowFeatures& features,
-    NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer)
-{
-    if (!m_webView->client())
-        return nullptr;
+namespace {
 
-    WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPolicy);
-    if (policy == WebNavigationPolicyIgnore)
-        policy = getNavigationPolicy(features);
-    else if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolicy(features) != WebNavigationPolicyNewBackgroundTab && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
-        policy = WebNavigationPolicyNewForegroundTab;
-
-    ASSERT(frame->document());
-    Fullscreen::fullyExitFullscreen(*frame->document());
-
-    WebViewImpl* newView = toWebViewImpl(
-        m_webView->client()->createView(WebLocalFrameImpl::fromFrame(frame), WrappedResourceRequest(r.resourceRequest()), features, r.frameName(), policy, shouldSendReferrer == NeverSendReferrer));
-    if (!newView)
-        return nullptr;
-    return newView->page();
-}
-
-static inline void updatePolicyForEvent(const WebInputEvent* inputEvent, NavigationPolicy* policy)
+inline void updatePolicyForEvent(const WebInputEvent* inputEvent, NavigationPolicy* policy)

[Mike West, 2015/05/18 15:07:56]

Why drop 'static'?

[jochen (gone - plz use gerrit), 2015/05/18 22:45:14]

it's in an anon namespace now

 {
     if (!inputEvent || inputEvent->type != WebInputEvent::MouseUp)
         return;
 
     const WebMouseEvent* mouseEvent = static_cast<const WebMouseEvent*>(inputEvent);
 
     unsigned short buttonNumber;
     switch (mouseEvent->button) {
     case WebMouseEvent::ButtonLeft:
         buttonNumber = 0;
@@ skipping 13 matching lines @@
     bool meta = mouseEvent->modifiers & WebMouseEvent::MetaKey;
 
     NavigationPolicy userPolicy = *policy;
     navigationPolicyFromMouseEvent(buttonNumber, ctrl, shift, alt, meta, &userPolicy);
     // User and app agree that we want a new window; let the app override the decorations.
     if (userPolicy == NavigationPolicyNewWindow && *policy == NavigationPolicyNewPopup)
         return;
     *policy = userPolicy;
 }
 
-WebNavigationPolicy ChromeClientImpl::getNavigationPolicy(const WindowFeatures& features)
+WebNavigationPolicy getNavigationPolicy(const WindowFeatures& features)

[Mike West, 2015/05/18 15:09:44]

Nit: static?

 {
     // If our default configuration was modified by a script or wasn't
     // created by a user gesture, then show as a popup. Else, let this
     // new window be opened as a toplevel window.
     bool asPopup = !features.toolBarVisible
         || !features.statusBarVisible
         || !features.scrollbarsVisible
         || !features.menuBarVisible
         || !features.resizable;
 
     NavigationPolicy policy = NavigationPolicyNewForegroundTab;
     if (asPopup)
         policy = NavigationPolicyNewPopup;
     updatePolicyForEvent(WebViewImpl::currentInputEvent(), &policy);
 
     return static_cast<WebNavigationPolicy>(policy);
 }
 
+WebNavigationPolicy effectiveNavigationPolicy(NavigationPolicy navigationPolicy, const WindowFeatures& features)

[Mike West, 2015/05/18 15:09:44]

Nit: static?

+{
+    WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPolicy);
+    if (policy == WebNavigationPolicyIgnore)
+        return getNavigationPolicy(features);
+    if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolicy(features) != WebNavigationPolicyNewBackgroundTab && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
+        return WebNavigationPolicyNewForegroundTab;
+
+    return policy;
+}
+
+} // namespace
+
+Page* ChromeClientImpl::createWindow(LocalFrame* frame, const FrameLoadRequest& r, const WindowFeatures& features,
+    NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer)
+{
+    if (!m_webView->client())
+        return nullptr;
+
+    WebNavigationPolicy policy = effectiveNavigationPolicy(navigationPolicy, features);
+    ASSERT(frame->document());
+    Fullscreen::fullyExitFullscreen(*frame->document());
+
+    WebViewImpl* newView = toWebViewImpl(
+        m_webView->client()->createView(WebLocalFrameImpl::fromFrame(frame), WrappedResourceRequest(r.resourceRequest()), features, r.frameName(), policy, shouldSendReferrer == NeverSendReferrer));
+    if (!newView)
+        return nullptr;
+    return newView->page();
+}
+
 void ChromeClientImpl::show(NavigationPolicy navigationPolicy)
 {
     if (!m_webView->client())
         return;
 
-    WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPolicy);
-    if (policy == WebNavigationPolicyIgnore)
-        policy = getNavigationPolicy(m_windowFeatures);
-    else if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolicy(m_windowFeatures) != WebNavigationPolicyNewBackgroundTab && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
-        policy = WebNavigationPolicyNewForegroundTab;
+    WebNavigationPolicy policy = effectiveNavigationPolicy(navigationPolicy, m_windowFeatures);
     m_webView->client()->show(policy);
 }
 
 void ChromeClientImpl::setToolbarsVisible(bool value)
 {
     m_windowFeatures.toolBarVisible = value;
 }
 
 bool ChromeClientImpl::toolbarsVisible()
 {
@@ skipping 608 matching lines @@
     if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView())
         m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeView(m_webView->layerTreeView());
 }
 
 void ChromeClientImpl::didUpdateTopControls() const
 {
     m_webView->didUpdateTopControls();
 }
 
 } // namespace blink