Changeset 88998 in webkit

Timestamp:

Jun 15, 2011 8:43:12 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-15 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Remove forceUserGesture bool in favor of UserGestureIndicator
​https://bugs.webkit.org/show_bug.cgi?id=62702

This patch is an intermediate step towards removing the
forceUserGesture bool. In this patch, we use the user gesture
indicator to store the gesture state instead of encoding it in the URL
of the script source code. In a future patch, we'll push the indicator
higher up the stack, closer to the reason for setting it.

• bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::executeScript): (WebCore::ScriptController::executeIfJavaScriptURL):
• bindings/js/ScriptController.cpp: (WebCore::ScriptController::executeScriptInWorld):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/ScriptControllerBase.cpp (modified) (3 diffs)
• bindings/js/ScriptController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-15  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove forceUserGesture bool in favor of UserGestureIndicator
+        https://bugs.webkit.org/show_bug.cgi?id=62702
+
+        This patch is an intermediate step towards removing the
+        forceUserGesture bool.  In this patch, we use the user gesture
+        indicator to store the gesture state instead of encoding it in the URL
+        of the script source code.  In a future patch, we'll push the indicator
+        higher up the stack, closer to the reason for setting it.
+
+        * bindings/ScriptControllerBase.cpp:
+        (WebCore::ScriptController::executeScript):
+        (WebCore::ScriptController::executeIfJavaScriptURL):
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::executeScriptInWorld):
+
 2011-06-15  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebCore/bindings/ScriptControllerBase.cpp

@@ -32 +32 @@
 #include "SecurityOrigin.h"
 #include "Settings.h"
+#include "UserGestureIndicator.h"
 
 namespace WebCore {
@@ -55 +56 @@
 ScriptValue ScriptController::executeScript(const String& script, bool forceUserGesture)
 {
-    // FIXME: Why does the URL of the script depend on forceUserGesture?
-    // This looks suspiciously like an old user-gesture back-channel.
-    return executeScript(ScriptSourceCode(script, forceUserGesture ? KURL() : m_frame->document()->url()));
+    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
+    return executeScript(ScriptSourceCode(script, m_frame->document()->url()));
 }
 
@@ -96 +96 @@
 
     String decodedURL = decodeURLEscapeSequences(url.string());
-    ScriptValue result = executeScript(decodedURL.substring(javascriptSchemeLength), false);
+    ScriptValue result = executeScript(decodedURL.substring(javascriptSchemeLength));
 
     // If executing script caused this frame to be removed from the page, we

trunk/Source/WebCore/bindings/js/ScriptController.cpp

@@ -469 +469 @@
 ScriptValue ScriptController::executeScriptInWorld(DOMWrapperWorld* world, const String& script, bool forceUserGesture)
 {
-    ScriptSourceCode sourceCode(script, forceUserGesture ? KURL() : m_frame->document()->url());
+    UserGestureIndicator gestureIndicator(forceUserGesture ? DefinitelyProcessingUserGesture : PossiblyProcessingUserGesture);
+    ScriptSourceCode sourceCode(script, m_frame->document()->url());
 
     if (!canExecuteScripts(AboutToExecuteScript) || isPaused())