Changeset 245366 in webkit

Timestamp:

May 15, 2019 3:42:00 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: user gesture toggle should also force user interaction flag
​https://bugs.webkit.org/show_bug.cgi?id=197269

Reviewed by Joseph Pecoraro.

Source/WebCore:

Test: inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html

• inspector/agents/page/PageRuntimeAgent.cpp:

(WebCore::PageRuntimeAgent::evaluate):

• page/ChromeClient.h:

(WebCore::ChromeClient::userIsInteracting const): Added.
(WebCore::ChromeClient::setUserIsInteracting): Added.

• testing/Internals.idl:
• testing/Internals.h:
• testing/Internals.cpp:

(WebCore::Internals::userIsInteracting): Added.

Source/WebKit:

• WebProcess/WebCoreSupport/WebChromeClient.h:
• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::userIsInteracting const): Added.
(WebKit::WebChromeClient::setUserIsInteracting): Added.

• WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::userIsInteracting const): Added.
(WebKit::WebPage::setUserIsInteracting): Added.

LayoutTests:

• inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html: Added.
• inspector/runtime/evaluate-userGestureEmulation-userIsInteracting-expected.txt: Added.

• TestExpectations:
• platform/wk2/TestExpectations:

Only enable the above test on WK2, as the user interaction state is only supported by WK2.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/inspector/runtime/evaluate-userGestureEmulation-userIsInteracting-expected.txt (added)
• LayoutTests/inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html (added)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp (modified) (2 diffs)
• Source/WebCore/page/ChromeClient.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: user gesture toggle should also force user interaction flag
+        https://bugs.webkit.org/show_bug.cgi?id=197269
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html: Added.
+        * inspector/runtime/evaluate-userGestureEmulation-userIsInteracting-expected.txt: Added.
+
+        * TestExpectations:
+        * platform/wk2/TestExpectations:
+        Only enable the above test on WK2, as the user interaction state is only supported by WK2.
+
 2019-05-15  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -543 +543 @@
 # Debugger stepping tests can timeout if they run slowly due to a short timer scheduled in the frontend.
 webkit.org/b/161951 [ Debug ] inspector/debugger/paused-scopes.html [ Skip ]
+
+# User interaction is a WK2 concept.
+inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html [ Skip ]
 
 # These conformance tests are no longer in sync with the latest specification

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -502 +502 @@
 # First two lines are reversed when test is flaky.
 fast/preloader/document-write-2.html [ Pass Failure ]
+
+# User interaction is a WK2 concept.
+inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html [ Skip ]
 
 ### END OF (3) Unclassified failures

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: user gesture toggle should also force user interaction flag
+        https://bugs.webkit.org/show_bug.cgi?id=197269
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: inspector/runtime/evaluate-userGestureEmulation-userIsInteracting.html
+
+        * inspector/agents/page/PageRuntimeAgent.cpp:
+        (WebCore::PageRuntimeAgent::evaluate):
+
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::userIsInteracting const): Added.
+        (WebCore::ChromeClient::setUserIsInteracting): Added.
+
+        * testing/Internals.idl:
+        * testing/Internals.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::userIsInteracting): Added.
+
 2019-05-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp

@@ -33 +33 @@
 #include "PageRuntimeAgent.h"
 
+#include "Chrome.h"
+#include "ChromeClient.h"
 #include "Document.h"
 #include "Frame.h"
@@ -162 +164 @@
 void PageRuntimeAgent::evaluate(ErrorString& errorString, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, const bool* emulateUserGesture, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Optional<bool>& wasThrown, Optional<int>& savedResultIndex)
 {
-    Optional<ProcessingUserGestureState> userGestureState = (emulateUserGesture && *emulateUserGesture) ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : WTF::nullopt;
+    auto& pageChromeClient = m_inspectedPage.chrome().client();
+
+    auto shouldEmulateUserGesture = emulateUserGesture && *emulateUserGesture;
+
+    Optional<ProcessingUserGestureState> userGestureState = shouldEmulateUserGesture ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : WTF::nullopt;
     UserGestureIndicator gestureIndicator(userGestureState);
+
+    bool userWasInteracting = false;
+    if (shouldEmulateUserGesture) {
+        userWasInteracting = pageChromeClient.userIsInteracting();
+        if (!userWasInteracting)
+            pageChromeClient.setUserIsInteracting(true);
+    }
+
     InspectorRuntimeAgent::evaluate(errorString, expression, objectGroup, includeCommandLineAPI, doNotPauseOnExceptionsAndMuteConsole, executionContextId, returnByValue, generatePreview, saveResult, emulateUserGesture, result, wasThrown, savedResultIndex);
+
+    if (shouldEmulateUserGesture && !userWasInteracting && pageChromeClient.userIsInteracting())
+        pageChromeClient.setUserIsInteracting(false);
 }
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -508 +508 @@
     virtual void configureLoggingChannel(const String&, WTFLogChannelState, WTFLogLevel) { }
 
+    virtual bool userIsInteracting() const { return false; }
+    virtual void setUserIsInteracting(bool) { }
+
 protected:
     virtual ~ChromeClient() = default;

trunk/Source/WebCore/testing/Internals.cpp

@@ -48 +48 @@
 #include "CertificateInfo.h"
 #include "Chrome.h"
+#include "ChromeClient.h"
 #include "ClientOrigin.h"
 #include "ComposedTreeIterator.h"
@@ -4424 +4425 @@
 }
 
+bool Internals::userIsInteracting()
+{
+    if (auto* document = contextDocument()) {
+        if (auto* page = document->page())
+            return page->chrome().client().userIsInteracting();
+    }
+    return false;
+}
+
 double Internals::lastHandledUserGestureTimestamp()
 {

trunk/Source/WebCore/testing/Internals.h

@@ -656 +656 @@
     void withUserGesture(RefPtr<VoidCallback>&&);
 
+    bool userIsInteracting();
+
     RefPtr<GCObservation> observeGC(JSC::JSValue);
 

trunk/Source/WebCore/testing/Internals.idl

@@ -639 +639 @@
     void withUserGesture(VoidCallback callback);
 
+    boolean userIsInteracting();
+
     GCObservation? observeGC(any observed);
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: user gesture toggle should also force user interaction flag
+        https://bugs.webkit.org/show_bug.cgi?id=197269
+
+        Reviewed by Joseph Pecoraro.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::userIsInteracting const): Added.
+        (WebKit::WebChromeClient::setUserIsInteracting): Added.
+
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::userIsInteracting const): Added.
+        (WebKit::WebPage::setUserIsInteracting): Added.
+
 2019-05-15  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -1341 +1341 @@
 }
 
+bool WebChromeClient::userIsInteracting() const
+{
+    return m_page.userIsInteracting();
+}
+
+void WebChromeClient::setUserIsInteracting(bool userIsInteracting)
+{
+    m_page.setUserIsInteracting(userIsInteracting);
+}
+
 } // namespace WebKit

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -380 +380 @@
     void configureLoggingChannel(const String&, WTFLogChannelState, WTFLogLevel) final;
 
+    bool userIsInteracting() const final;
+    void setUserIsInteracting(bool) final;
+
     String m_cachedToolTip;
     mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -1194 +1194 @@
     bool isThrottleable() const;
 
+    bool userIsInteracting() const { return m_userIsInteracting; }
+    void setUserIsInteracting(bool userIsInteracting) { m_userIsInteracting = userIsInteracting; }
+
 private:
     WebPage(uint64_t pageID, WebPageCreationParameters&&);