WebKit merge 40500:40539 [WebKit side]

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

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2006 Jon Shier (jshier@iastate.edu)
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reseved.
  *  Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
@@ skipping 136 matching lines @@
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
     if (!activeFrame)
         return;
     if (!activeFrame->loader()->shouldAllowNavigation(frame))
         return;
 
     KURL url = activeFrame->loader()->completeURL(value.toString(exec));
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setProtocol(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     url.setProtocol(value.toString(exec));
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setHost(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     url.setHostAndPort(value.toString(exec));
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setHostname(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     url.setHost(value.toString(exec));
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setPort(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     // FIXME: Could make this a little less ugly if String provided a toUnsignedShort function.
     const UString& portString = value.toString(exec);
     int port = charactersToInt(portString.data(), portString.size());
     if (port < 0 || port > 0xFFFF)
         port = 0;
     url.setPort(port);
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setPathname(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     url.setPath(value.toString(exec));
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setSearch(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     url.setQuery(value.toString(exec));
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 void JSLocation::setHash(ExecState* exec, JSValuePtr value)
 {
     Frame* frame = impl()->frame();
     ASSERT(frame);
 
     KURL url = frame->loader()->url();
     String oldRef = url.ref();
     String str = value.toString(exec);
     if (str.startsWith("#"))
         str = str.substring(1);
     if (oldRef == str || (oldRef.isNull() && str.isEmpty()))
         return;
     url.setRef(str);
 
-    navigateIfAllowed(exec, frame, url, false, false);
+    navigateIfAllowed(exec, frame, url, !frame->script()->anyPageIsProcessingUserGesture(), false);
 }
 
 JSValuePtr JSLocation::replace(ExecState* exec, const ArgList& args)
 {
     Frame* frame = impl()->frame();
     if (!frame)
         return jsUndefined();
 
     Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
     if (!activeFrame) 
@@ skipping 28 matching lines @@
     if (!frame)
         return jsUndefined();
 
     Frame* activeFrame = asJSDOMWindow(exec->dynamicGlobalObject())->impl()->frame();
     if (!activeFrame)
         return jsUndefined();
     if (!activeFrame->loader()->shouldAllowNavigation(frame))
         return jsUndefined();
 
     // We want a new history item if this JS was called via a user gesture
-    navigateIfAllowed(exec, frame, activeFrame->loader()->completeURL(args.at(exec, 0).toString(exec)), false, false);
+    navigateIfAllowed(exec, frame, activeFrame->loader()->completeURL(args.at(exec, 0).toString(exec)), !frame->script()->anyPageIsProcessingUserGesture(), false);
     return jsUndefined();
 }
 
 JSValuePtr JSLocation::toString(ExecState* exec, const ArgList&)
 {
     Frame* frame = impl()->frame();
     if (!frame)
         return jsUndefined();
     if (!allowsAccessFromFrame(exec, frame))
         return jsUndefined();
 
     return jsString(exec, impl()->toString());
 }
 
 } // namespace WebCore