Changeset 89002 in webkit

Timestamp:

Jun 15, 2011, 9:25:11 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Anders Carlsson.

Remove ScriptController::isJavaScriptAnchorNavigation
​https://bugs.webkit.org/show_bug.cgi?id=62775

This function no longer plays a role in the user gesture code now that
we're not encoding the user gesture state into the ScriptSourceCode
URL.

• bindings/js/ScriptController.cpp: (WebCore::ScriptController::processingUserGesture):
• bindings/js/ScriptController.h:
• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::processingUserGesture):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptController.cpp (modified) (2 diffs)
• bindings/js/ScriptController.h (modified) (2 diffs)
• bindings/v8/ScriptController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-15  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Remove ScriptController::isJavaScriptAnchorNavigation
+        https://bugs.webkit.org/show_bug.cgi?id=62775
+
+        This function no longer plays a role in the user gesture code now that
+        we're not encoding the user gesture state into the ScriptSourceCode
+        URL.
+
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::processingUserGesture):
+        * bindings/js/ScriptController.h:
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::processingUserGesture):
+
 2011-06-15  Adam Barth  <abarth@webkit.org>
 

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

@@ -252 +252 @@
         return UserGestureIndicator::getUserGestureState() != DefinitelyNotProcessingUserGesture;
 
-    // FIXME: Remove the isJavaScriptAnchorNavigation check once https://bugs.webkit.org/show_bug.cgi?id=62702 is fixed.
-    if (frame->script()->isJavaScriptAnchorNavigation())
-        return true;
-
     // If a DOM event is being processed, check that it was initiated by the user
     // and that it is in the whitelist of event types allowed to generate pop-ups.
@@ -263 +259 @@
 
     return UserGestureIndicator::processingUserGesture();
-}
-
-// FIXME: This seems like an insufficient check to verify a click on a javascript: anchor.
-bool ScriptController::isJavaScriptAnchorNavigation() const
-{
-    // This is the <a href="javascript:window.open('...')> case -> we let it through
-    if (m_sourceURL && m_sourceURL->isNull() && !m_processingTimerCallback)
-        return true;
-
-    // This is the <script>window.open(...)</script> case or a timer callback -> block it
-    return false;
 }
 

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

@@ -170 +170 @@
     void disconnectPlatformScriptObjects();
 
-    bool isJavaScriptAnchorNavigation() const;
-
     ShellMap m_windowShells;
     Frame* m_frame;
@@ -178 +176 @@
     bool m_inExecuteScript;
 
-    bool m_processingTimerCallback;
     bool m_paused;
 

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

@@ -171 +171 @@
         return event->fromUserGesture();
 
-    // FIXME: Remove this check once https://bugs.webkit.org/show_bug.cgi?id=62702 is fixed.
-    const String* sourceURL = firstFrame->script()->sourceURL();
-    if (sourceURL && sourceURL->isNull() && !firstFrame->script()->proxy()->timerCallback())
-        return true;
-
     return UserGestureIndicator::processingUserGesture();
 }