Title: [202719] trunk/Source
Revision
202719
Author
jiewen_...@apple.com
Date
2016-06-30 17:03:58 -0700 (Thu, 30 Jun 2016)

Log Message

Create a generic "linked-on-or-after" check for new CSP Rules
https://bugs.webkit.org/show_bug.cgi?id=159322
<rdar://problem/27117220>

Reviewed by Brent Fulgham.

Source/WebCore:

Create a generic "linked-on-or-after" check for new CSP Rules and cleanup
quirks for Ecobee, Quora and XtraMat.

* platform/RuntimeApplicationChecks.h:
* platform/RuntimeApplicationChecks.mm:
(WebCore::IOSApplication::isEcobee): Deleted.
(WebCore::IOSApplication::isQuora): Deleted.
(WebCore::IOSApplication::isXtraMath): Deleted.

Source/WebKit/mac:

* WebView/WebView.mm:
(shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (202718 => 202719)


--- trunk/Source/WebCore/ChangeLog	2016-06-30 23:48:50 UTC (rev 202718)
+++ trunk/Source/WebCore/ChangeLog	2016-07-01 00:03:58 UTC (rev 202719)
@@ -1,3 +1,20 @@
+2016-06-30  Jiewen Tan  <jiewen_...@apple.com>
+
+        Create a generic "linked-on-or-after" check for new CSP Rules
+        https://bugs.webkit.org/show_bug.cgi?id=159322
+        <rdar://problem/27117220>
+
+        Reviewed by Brent Fulgham.
+
+        Create a generic "linked-on-or-after" check for new CSP Rules and cleanup
+        quirks for Ecobee, Quora and XtraMat.
+
+        * platform/RuntimeApplicationChecks.h:
+        * platform/RuntimeApplicationChecks.mm:
+        (WebCore::IOSApplication::isEcobee): Deleted.
+        (WebCore::IOSApplication::isQuora): Deleted.
+        (WebCore::IOSApplication::isXtraMath): Deleted.
+
 2016-06-30  Antti Koivisto  <an...@apple.com>
 
         WebContent crash due to RELEASE_ASSERT(!m_inLoadPendingImages) in StyleResolver::~StyleResolver()

Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (202718 => 202719)


--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h	2016-06-30 23:48:50 UTC (rev 202718)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h	2016-07-01 00:03:58 UTC (rev 202719)
@@ -72,9 +72,6 @@
 WEBCORE_EXPORT bool isTheEconomistOnIphone();
 WEBCORE_EXPORT bool isWebProcess();
 bool isIBooks();
-WEBCORE_EXPORT bool isEcobee();
-WEBCORE_EXPORT bool isQuora();
-WEBCORE_EXPORT bool isXtraMath();
 WEBCORE_EXPORT bool isTheSecretSocietyHiddenMystery();
 
 } // IOSApplication

Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm (202718 => 202719)


--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm	2016-06-30 23:48:50 UTC (rev 202718)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm	2016-07-01 00:03:58 UTC (rev 202719)
@@ -235,24 +235,6 @@
     return isIBooks;
 }
 
-bool IOSApplication::isEcobee()
-{
-    static bool isEcobee = applicationBundleIsEqualTo("com.ecobee.athenamobile");
-    return isEcobee;
-}
-
-bool IOSApplication::isQuora()
-{
-    static bool isQuora = applicationBundleIsEqualTo("com.quora.app.mobile");
-    return isQuora;
-}
-
-bool IOSApplication::isXtraMath()
-{
-    static bool isXtraMath = applicationBundleIsEqualTo("org.xtramath.mathfacts");
-    return isXtraMath;
-}
-
 bool IOSApplication::isTheSecretSocietyHiddenMystery()
 {
     static bool isTheSecretSocietyHiddenMystery = applicationBundleIsEqualTo("com.g5e.secretsociety");

Modified: trunk/Source/WebKit/mac/ChangeLog (202718 => 202719)


--- trunk/Source/WebKit/mac/ChangeLog	2016-06-30 23:48:50 UTC (rev 202718)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-07-01 00:03:58 UTC (rev 202719)
@@ -1,3 +1,14 @@
+2016-06-30  Jiewen Tan  <jiewen_...@apple.com>
+
+        Create a generic "linked-on-or-after" check for new CSP Rules
+        https://bugs.webkit.org/show_bug.cgi?id=159322
+        <rdar://problem/27117220>
+
+        Reviewed by Brent Fulgham.
+
+        * WebView/WebView.mm:
+        (shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol):
+
 2016-06-30  Anders Carlsson  <ander...@apple.com>
 
         Mail crashes on launch at WebCore::PaymentCoordinator::~PaymentCoordinator() + 20

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202718 => 202719)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2016-06-30 23:48:50 UTC (rev 202718)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2016-07-01 00:03:58 UTC (rev 202719)
@@ -869,7 +869,7 @@
 static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol()
 {
 #if PLATFORM(IOS)
-    static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol = (IOSApplication::isEcobee() || IOSApplication::isQuora() || IOSApplication::isXtraMath()) && !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION);
+    static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol = !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION);
     return shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol;
 #else
     return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to