Reland "Correctly set ScriptState in the image loader microtask"

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 231 matching lines @@
     bool meta = inputEvent->modifiers & WebInputEvent::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 getNavigationPolicy(const WindowFeatures& features)
+WebNavigationPolicy getNavigationPolicy(const WindowFeatures& features, CreateWindowReason createWindowReason)
 {
     // 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);
+    if (createWindowReason == CreatedFromLoadRequest)
+        updatePolicyForEvent(WebViewImpl::currentInputEvent(), &policy);
 
     return static_cast<WebNavigationPolicy>(policy);
 }
 
-WebNavigationPolicy effectiveNavigationPolicy(NavigationPolicy navigationPolicy, const WindowFeatures& features)
+WebNavigationPolicy effectiveNavigationPolicy(NavigationPolicy navigationPolicy, const WindowFeatures& features, CreateWindowReason createWindowReason)
 {
     WebNavigationPolicy policy = static_cast<WebNavigationPolicy>(navigationPolicy);
     if (policy == WebNavigationPolicyIgnore)
-        return getNavigationPolicy(features);
-    if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolicy(features) != WebNavigationPolicyNewBackgroundTab && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
+        return getNavigationPolicy(features, createWindowReason);
+    if (policy == WebNavigationPolicyNewBackgroundTab && getNavigationPolicy(features, createWindowReason) != WebNavigationPolicyNewBackgroundTab && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
         return WebNavigationPolicyNewForegroundTab;
 
     return policy;
 }
 
 } // namespace
 
 Page* ChromeClientImpl::createWindow(LocalFrame* frame, const FrameLoadRequest& r, const WindowFeatures& features,
-    NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer)
+    NavigationPolicy navigationPolicy, ShouldSendReferrer shouldSendReferrer, CreateWindowReason createWindowReason)
 {
     if (!m_webView->client())
         return nullptr;
 
-    WebNavigationPolicy policy = effectiveNavigationPolicy(navigationPolicy, features);
+    WebNavigationPolicy policy = effectiveNavigationPolicy(navigationPolicy, features, createWindowReason);
     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::didOverscroll(const FloatSize& unusedDelta, const FloatSize& accumulatedRootOverScroll, const FloatPoint& position, const FloatSize& velocity)
 {
     if (!m_webView->client())
         return;
 
     m_webView->client()->didOverscroll(unusedDelta, accumulatedRootOverScroll, position, velocity);
 }
 
-void ChromeClientImpl::show(NavigationPolicy navigationPolicy)
+void ChromeClientImpl::show(NavigationPolicy navigationPolicy, CreateWindowReason createWindowReason)
 {
     if (m_webView->client())
-        m_webView->client()->show(effectiveNavigationPolicy(navigationPolicy, m_windowFeatures));
+        m_webView->client()->show(effectiveNavigationPolicy(navigationPolicy, m_windowFeatures, createWindowReason));
 }
 
 void ChromeClientImpl::setToolbarsVisible(bool value)
 {
     m_windowFeatures.toolBarVisible = value;
 }
 
 bool ChromeClientImpl::toolbarsVisible()
 {
     return m_windowFeatures.toolBarVisible;
@@ skipping 637 matching lines @@
     for (const auto& observer : observers)
         observer->willOpenPopup();
 }
 
 FloatSize ChromeClientImpl::elasticOverscroll() const
 {
     return m_webView->elasticOverscroll();
 }
 
 } // namespace blink