Changeset 89260 in webkit

Timestamp:

Jun 20, 2011 10:54:45 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Dimitri Glazkov.

Several pyauto tests are failing because some infobars
​https://bugs.webkit.org/show_bug.cgi?id=62968

This function used to evaluate script as if there was a user gesture
(due to the lack of a source URL). This patch re-introduces the user
gesture (this time explicitly), which causes the pyauto tests listed in
​http://code.google.com/p/chromium/issues/detail?id=86397 to start
passing again. It's unclear whether this forced gesture is needed in
non-test scenarios.

• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::executeScriptAndReturnValue):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-20  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Several pyauto tests are failing because some infobars
+        https://bugs.webkit.org/show_bug.cgi?id=62968
+
+        This function used to evaluate script as if there was a user gesture
+        (due to the lack of a source URL). This patch re-introduces the user
+        gesture (this time explicitly), which causes the pyauto tests listed in
+        http://code.google.com/p/chromium/issues/detail?id=86397 to start
+        passing again.  It's unclear whether this forced gesture is needed in
+        non-test scenarios.
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::executeScriptAndReturnValue):
+
 2011-06-20  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -133 +133 @@
 #include "TextAffinity.h"
 #include "TextIterator.h"
+#include "UserGestureIndicator.h"
 #include "WebAnimationControllerImpl.h"
 #include "WebConsoleMessage.h"
@@ -849 +850 @@
 
 #if USE(V8)
-v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(
-    const WebScriptSource& source)
-{
+v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
+{
+    // FIXME: This fake user gesture is required to make a bunch of pyauto
+    // tests pass. If this isn't needed in non-test situations, we should
+    // consider removing this code and changing the tests.
+    // http://code.google.com/p/chromium/issues/detail?id=86397
+    UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
+
     TextPosition1 position(WTF::OneBasedNumber::fromOneBasedInt(source.startLine), WTF::OneBasedNumber::base());
-    return m_frame->script()->executeScript(
-        ScriptSourceCode(source.code, source.url, position)).v8Value();
+    return m_frame->script()->executeScript(ScriptSourceCode(source.code, source.url, position)).v8Value();
 }