Title: [234658] trunk
- Revision
- 234658
- Author
- [email protected]
- Date
- 2018-08-07 10:36:47 -0700 (Tue, 07 Aug 2018)
Log Message
Fix things after r234640
https://bugs.webkit.org/show_bug.cgi?id=188133
Source/WebKit:
* UIProcess/WebFramePolicyListenerProxy.cpp:
(WebKit::WebFramePolicyListenerProxy::use):
(WebKit::WebFramePolicyListenerProxy::download):
(WebKit::WebFramePolicyListenerProxy::ignore):
Fix assertions as I had in r234552. Also fix a possible race condition with fragment navigations by only keeping the first "use" response.
* config.h:
Fix IOSMAC build.
LayoutTests:
* platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt: Added.
Added test expectation for Sierra, which has no safe browsing framework.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (234657 => 234658)
--- trunk/LayoutTests/ChangeLog 2018-08-07 17:21:04 UTC (rev 234657)
+++ trunk/LayoutTests/ChangeLog 2018-08-07 17:36:47 UTC (rev 234658)
@@ -1,3 +1,11 @@
+2018-08-07 Alex Christensen <[email protected]>
+
+ Fix things after r234640
+ https://bugs.webkit.org/show_bug.cgi?id=188133
+
+ * platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt: Added.
+ Added test expectation for Sierra, which has no safe browsing framework.
+
2018-08-07 Yusuke Suzuki <[email protected]>
Unreviewed, Layout Test imported/w3c/web-platform-tests/service-workers/service-worker/skip-waiting-installed.https.html is flaky
Added: trunk/LayoutTests/platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt (0 => 234658)
--- trunk/LayoutTests/platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt 2018-08-07 17:36:47 UTC (rev 234658)
@@ -0,0 +1,46 @@
+CONSOLE MESSAGE: line 16: Provisional navigation started.
+CONSOLE MESSAGE: line 17: No trusted events should be logged and the input element should have the value "".
+CONSOLE MESSAGE: line 34: Dispatching untrusted keypress event.
+CONSOLE MESSAGE: line 18: keypressevent dispatched (isTrusted: false).
+CONSOLE MESSAGE: line 42: Pressing tab.
+CONSOLE MESSAGE: line 44: Active element after pressing tab: [object HTMLInputElement].
+CONSOLE MESSAGE: line 46: Pressing "a".
+CONSOLE MESSAGE: line 49: Setting marked text to "b".
+CONSOLE MESSAGE: line 52: Inserting text "c".
+CONSOLE MESSAGE: line 55: Pasting text "d".
+CONSOLE MESSAGE: line 58: Input element value after text input events: "".
+CONSOLE MESSAGE: line 20: Pressing "z" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html.
+CONSOLE MESSAGE: line 6: Finished navigating to resources/keyboard-events-after-navigation.html.
+CONSOLE MESSAGE: line 7: Trusted events should be logged and the input element should have the value "acd".
+CONSOLE MESSAGE: line 34: Dispatching untrusted keypress event.
+CONSOLE MESSAGE: line 18: keypressevent dispatched (isTrusted: false).
+CONSOLE MESSAGE: line 42: Pressing tab.
+CONSOLE MESSAGE: line 18: keydownevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: keyupevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 44: Active element after pressing tab: [object HTMLInputElement].
+CONSOLE MESSAGE: line 46: Pressing "a".
+CONSOLE MESSAGE: line 18: keydownevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: keypressevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: textInputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: beforeinputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: inputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: keyupevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 49: Setting marked text to "b".
+CONSOLE MESSAGE: line 18: compositionstartevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: compositionupdateevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: beforeinputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: inputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 52: Inserting text "c".
+CONSOLE MESSAGE: line 18: beforeinputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: inputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: textInputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: beforeinputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: inputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: compositionendevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 55: Pasting text "d".
+CONSOLE MESSAGE: line 18: pasteevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: textInputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: beforeinputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 18: inputevent dispatched (isTrusted: true).
+CONSOLE MESSAGE: line 58: Input element value after text input events: "acd".
+
Modified: trunk/Source/WebKit/ChangeLog (234657 => 234658)
--- trunk/Source/WebKit/ChangeLog 2018-08-07 17:21:04 UTC (rev 234657)
+++ trunk/Source/WebKit/ChangeLog 2018-08-07 17:36:47 UTC (rev 234658)
@@ -1,3 +1,16 @@
+2018-08-07 Alex Christensen <[email protected]>
+
+ Fix things after r234640
+ https://bugs.webkit.org/show_bug.cgi?id=188133
+
+ * UIProcess/WebFramePolicyListenerProxy.cpp:
+ (WebKit::WebFramePolicyListenerProxy::use):
+ (WebKit::WebFramePolicyListenerProxy::download):
+ (WebKit::WebFramePolicyListenerProxy::ignore):
+ Fix assertions as I had in r234552. Also fix a possible race condition with fragment navigations by only keeping the first "use" response.
+ * config.h:
+ Fix IOSMAC build.
+
2018-08-07 Per Arne Vollan <[email protected]>
[macOS] Scrollbars are not visible when using 3rd party mouse
Modified: trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp (234657 => 234658)
--- trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2018-08-07 17:21:04 UTC (rev 234657)
+++ trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp 2018-08-07 17:36:47 UTC (rev 234658)
@@ -57,17 +57,15 @@
void WebFramePolicyListenerProxy::use(API::WebsitePolicies* policies, ShouldProcessSwapIfPossible swap)
{
- ASSERT(!m_policyResult);
if (m_safeBrowsingResults) {
if (m_reply)
m_reply(WebCore::PolicyAction::Use, policies, swap, WTFMove(*m_safeBrowsingResults));
- } else
+ } else if (!m_policyResult)
m_policyResult = {{ policies, swap }};
}
void WebFramePolicyListenerProxy::download()
{
- ASSERT(!m_policyResult);
if (m_reply)
m_reply(WebCore::PolicyAction::Download, nullptr, ShouldProcessSwapIfPossible::No, { });
}
@@ -74,7 +72,6 @@
void WebFramePolicyListenerProxy::ignore()
{
- ASSERT(!m_policyResult);
if (m_reply)
m_reply(WebCore::PolicyAction::Ignore, nullptr, ShouldProcessSwapIfPossible::No, { });
}
Modified: trunk/Source/WebKit/config.h (234657 => 234658)
--- trunk/Source/WebKit/config.h 2018-08-07 17:21:04 UTC (rev 234657)
+++ trunk/Source/WebKit/config.h 2018-08-07 17:36:47 UTC (rev 234658)
@@ -127,7 +127,7 @@
#endif
#endif
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)) && !defined(__i386__)
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)) && !defined(__i386__) && !PLATFORM(IOSMAC)
#define HAVE_SAFE_BROWSING 1
#else
#define HAVE_SAFE_BROWSING 0
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
