Changeset 234658 in webkit

Timestamp:

Aug 7, 2018 10:36:47 AM (6 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-sierra-wk2/http (added)
• LayoutTests/platform/mac-sierra-wk2/http/tests (added)
• LayoutTests/platform/mac-sierra-wk2/http/tests/navigation (added)
• LayoutTests/platform/mac-sierra-wk2/http/tests/navigation/keyboard-events-during-provisional-navigation-expected.txt (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp (modified) (3 diffs)
• Source/WebKit/config.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-07  Alex Christensen  <achristensen@webkit.org>
+
+        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  <yusukesuzuki@slowstart.org>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-07  Alex Christensen  <achristensen@webkit.org>
+
+        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  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/WebFramePolicyListenerProxy.cpp

@@ -58 +58 @@
 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 }};
 }
@@ -68 +67 @@
 void WebFramePolicyListenerProxy::download()
 {
-    ASSERT(!m_policyResult);
     if (m_reply)
         m_reply(WebCore::PolicyAction::Download, nullptr, ShouldProcessSwapIfPossible::No, { });
@@ -75 +73 @@
 void WebFramePolicyListenerProxy::ignore()
 {
-    ASSERT(!m_policyResult);
     if (m_reply)
         m_reply(WebCore::PolicyAction::Ignore, nullptr, ShouldProcessSwapIfPossible::No, { });

trunk/Source/WebKit/config.h

@@ -128 +128 @@
 #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