Title: [89002] trunk/Source/WebCore
- Revision
- 89002
- Author
- [email protected]
- Date
- 2011-06-15 21:25:11 -0700 (Wed, 15 Jun 2011)
Log Message
2011-06-15 Adam Barth <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89001 => 89002)
--- trunk/Source/WebCore/ChangeLog 2011-06-16 04:10:36 UTC (rev 89001)
+++ trunk/Source/WebCore/ChangeLog 2011-06-16 04:25:11 UTC (rev 89002)
@@ -1,5 +1,22 @@
2011-06-15 Adam Barth <[email protected]>
+ 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 <[email protected]>
+
Reviewed by Eric Seidel.
Remove ScriptController::setAllowPopupsFromPlugin
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (89001 => 89002)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2011-06-16 04:10:36 UTC (rev 89001)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2011-06-16 04:25:11 UTC (rev 89002)
@@ -251,10 +251,6 @@
if (!frame)
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.
if (JSDOMWindowShell* shell = frame->script()->existingWindowShell(currentWorld(exec)))
@@ -264,17 +260,6 @@
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="" 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;
-}
-
bool ScriptController::canAccessFromCurrentOrigin(Frame *frame)
{
ExecState* exec = JSMainThreadExecState::currentState();
Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (89001 => 89002)
--- trunk/Source/WebCore/bindings/js/ScriptController.h 2011-06-16 04:10:36 UTC (rev 89001)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h 2011-06-16 04:25:11 UTC (rev 89002)
@@ -169,15 +169,12 @@
void disconnectPlatformScriptObjects();
- bool isJavaScriptAnchorNavigation() const;
-
ShellMap m_windowShells;
Frame* m_frame;
const String* m_sourceURL;
bool m_inExecuteScript;
- bool m_processingTimerCallback;
bool m_paused;
// The root object used for objects bound outside the context of a plugin, such
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.cpp (89001 => 89002)
--- trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2011-06-16 04:10:36 UTC (rev 89001)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2011-06-16 04:25:11 UTC (rev 89002)
@@ -170,11 +170,6 @@
if (event)
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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
