WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/bindings/js/JSDOMWindowCustom.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 130 matching lines @@
         }
     }
 #endif
 
     if (!activeFrame->loader()->shouldAllowNavigation(impl()->frame()))
         return;
     String dstUrl = activeFrame->loader()->completeURL(value.toString(exec)).string();
     if (!protocolIs(dstUrl, "javascript") || allowsAccessFrom(exec)) {
         bool userGesture = activeFrame->script()->processingUserGesture();
         // We want a new history item if this JS was called via a user gesture
-        impl()->frame()->loader()->scheduleLocationChange(dstUrl, activeFrame->loader()->outgoingReferrer(), false, false, userGesture);
+        impl()->frame()->loader()->scheduleLocationChange(dstUrl, activeFrame->loader()->outgoingReferrer(), !activeFrame->script()->anyPageIsProcessingUserGesture(), false, userGesture);
     }
 }
 
 JSValuePtr JSDOMWindow::postMessage(ExecState* exec, const ArgList& args)
 {
     DOMWindow* window = impl();
 
     DOMWindow* source = asJSDOMWindow(exec->dynamicGlobalObject())->impl();
     String message = args.at(exec, 0).toString(exec);
 
@@ skipping 154 matching lines @@
 {
     return new (exec) PrototypeFunction(exec, 0, propertyName, jsDOMWindowPrototypeFunctionFocus);
 }
 
 JSValuePtr nonCachingStaticPostMessageFunctionGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot&)
 {
     return new (exec) PrototypeFunction(exec, 2, propertyName, jsDOMWindowPrototypeFunctionPostMessage);
 }
 
 } // namespace WebCore