[webkit-changes] [221334] trunk

Tue, 29 Aug 2017 19:13:54 -0700

Title: [221334] trunk
Revision
221334
Author
beid...@apple.com
Date
2017-08-29 19:13:19 -0700 (Tue, 29 Aug 2017)

Log Message

Rename "potentionally trustworthy" to "potentially trustworthy"
https://bugs.webkit.org/show_bug.cgi?id=176081

Reviewed by Daniel Bates.

Source/WebCore:

The Secure Context spec refers to this as "potentially trustworthy"

It's possible that this was done potentionally, but we should follow the spec to alleviate confusion.

* dom/Document.cpp:
(WebCore::Document::isSecureContext const):
* page/SecurityOrigin.cpp:
(WebCore::shouldTreatAsPotentiallyTrustworthy):
(WebCore::shouldTreatAsPotentionallyTrustworthy): Deleted.
* page/SecurityOrigin.h:
(WebCore::SecurityOrigin::isPotentiallyTrustworthy const):
(WebCore::SecurityOrigin::isPotentionallyTrustworthy const): Deleted.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::isSecureContext const):

Tools:

* TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:
(TestWebKitAPI::TEST_F):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (221333 => 221334)


--- trunk/Source/WebCore/ChangeLog	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Source/WebCore/ChangeLog	2017-08-30 02:13:19 UTC (rev 221334)
@@ -1,3 +1,25 @@
+2017-08-29  Brady Eidson  <beid...@apple.com>
+
+        Rename "potentionally trustworthy" to "potentially trustworthy"
+        https://bugs.webkit.org/show_bug.cgi?id=176081
+
+        Reviewed by Daniel Bates.
+
+        The Secure Context spec refers to this as "potentially trustworthy"
+        
+        It's possible that this was done potentionally, but we should follow the spec to alleviate confusion.
+
+        * dom/Document.cpp:
+        (WebCore::Document::isSecureContext const):
+        * page/SecurityOrigin.cpp:
+        (WebCore::shouldTreatAsPotentiallyTrustworthy):
+        (WebCore::shouldTreatAsPotentionallyTrustworthy): Deleted.
+        * page/SecurityOrigin.h:
+        (WebCore::SecurityOrigin::isPotentiallyTrustworthy const):
+        (WebCore::SecurityOrigin::isPotentionallyTrustworthy const): Deleted.
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::isSecureContext const):
+
 2017-08-29  Youenn Fablet  <you...@apple.com>
 
         Add support for FetchRequest.body

Modified: trunk/Source/WebCore/dom/Document.cpp (221333 => 221334)


--- trunk/Source/WebCore/dom/Document.cpp	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Source/WebCore/dom/Document.cpp	2017-08-30 02:13:19 UTC (rev 221334)
@@ -5444,10 +5444,10 @@
 {
     if (!m_frame)
         return true;
-    if (!securityOrigin().isPotentionallyTrustworthy())
+    if (!securityOrigin().isPotentiallyTrustworthy())
         return false;
     for (Frame* frame = m_frame->tree().parent(); frame; frame = frame->tree().parent()) {
-        if (!frame->document()->securityOrigin().isPotentionallyTrustworthy())
+        if (!frame->document()->securityOrigin().isPotentiallyTrustworthy())
             return false;
     }
     return true;

Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (221333 => 221334)


--- trunk/Source/WebCore/page/SecurityOrigin.cpp	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp	2017-08-30 02:13:19 UTC (rev 221334)
@@ -123,7 +123,7 @@
 }
 
 // https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy (Editor's Draft, 17 November 2016)
-static bool shouldTreatAsPotentionallyTrustworthy(const URL& url)
+static bool shouldTreatAsPotentiallyTrustworthy(const URL& url)
 {
     if (!url.isValid())
         return false;
@@ -157,7 +157,7 @@
     if (m_canLoadLocalResources)
         m_filePath = url.fileSystemPath(); // In case enforceFilePathSeparation() is called.
 
-    m_isPotentionallyTrustworthy = shouldTreatAsPotentionallyTrustworthy(url);
+    m_isPotentiallyTrustworthy = shouldTreatAsPotentiallyTrustworthy(url);
 }
 
 SecurityOrigin::SecurityOrigin()
@@ -165,7 +165,7 @@
     , m_host { emptyString() }
     , m_domain { emptyString() }
     , m_isUnique { true }
-    , m_isPotentionallyTrustworthy { true }
+    , m_isPotentiallyTrustworthy { true }
 {
 }
 
@@ -182,7 +182,7 @@
     , m_storageBlockingPolicy { other->m_storageBlockingPolicy }
     , m_enforceFilePathSeparation { other->m_enforceFilePathSeparation }
     , m_needsStorageAccessFromFileURLsQuirk { other->m_needsStorageAccessFromFileURLsQuirk }
-    , m_isPotentionallyTrustworthy { other->m_isPotentionallyTrustworthy }
+    , m_isPotentiallyTrustworthy { other->m_isPotentiallyTrustworthy }
 {
 }

Modified: trunk/Source/WebCore/page/SecurityOrigin.h (221333 => 221334)


--- trunk/Source/WebCore/page/SecurityOrigin.h	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Source/WebCore/page/SecurityOrigin.h	2017-08-30 02:13:19 UTC (rev 221334)
@@ -200,7 +200,7 @@
 
     static URL urlWithUniqueSecurityOrigin();
 
-    bool isPotentionallyTrustworthy() const { return m_isPotentionallyTrustworthy; }
+    bool isPotentiallyTrustworthy() const { return m_isPotentiallyTrustworthy; }
 
     static bool isLocalHostOrLoopbackIPAddress(const URL&);
 
@@ -231,7 +231,7 @@
     StorageBlockingPolicy m_storageBlockingPolicy { AllowAllStorage };
     bool m_enforceFilePathSeparation { false };
     bool m_needsStorageAccessFromFileURLsQuirk { false };
-    bool m_isPotentionallyTrustworthy { false };
+    bool m_isPotentiallyTrustworthy { false };
 };
 
 // Returns true if the Origin header values serialized from these two origins would be the same.

Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (221333 => 221334)


--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp	2017-08-30 02:13:19 UTC (rev 221334)
@@ -108,7 +108,7 @@
 
 bool WorkerGlobalScope::isSecureContext() const
 {
-    return securityOrigin() && securityOrigin()->isPotentionallyTrustworthy();
+    return securityOrigin() && securityOrigin()->isPotentiallyTrustworthy();
 }
 
 void WorkerGlobalScope::applyContentSecurityPolicyResponseHeaders(const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders)

Modified: trunk/Tools/ChangeLog (221333 => 221334)


--- trunk/Tools/ChangeLog	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Tools/ChangeLog	2017-08-30 02:13:19 UTC (rev 221334)
@@ -1,3 +1,13 @@
+2017-08-29  Brady Eidson  <beid...@apple.com>
+
+        Rename "potentionally trustworthy" to "potentially trustworthy"
+        https://bugs.webkit.org/show_bug.cgi?id=176081
+
+        Reviewed by Daniel Bates.
+
+        * TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2017-08-29  Stephan Szabo  <stephan.sz...@sony.com>
 
         [Win][JSCOnly] Fix call for updating wincairo-libs in build-jsc

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp (221333 => 221334)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp	2017-08-30 01:38:32 UTC (rev 221333)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp	2017-08-30 02:13:19 UTC (rev 221334)
@@ -147,40 +147,40 @@
 TEST_F(SecurityOriginTest, IsPotentiallyTrustworthy)
 {
     // Potentially Trustworthy
-    EXPECT_TRUE(SecurityOrigin::create(URL(URL(), "file:///" + tempFilePath()))->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://127.0.0.1/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://localhost/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://[::1]/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("blob:https://example.com/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("data:,a")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("about:")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("about:blank")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("about:srcdoc")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("wss://example.com")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("https://example.com")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.0")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.1")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.2")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.1.1")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.1.1.1")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://localhost")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://loCALhoST")->isPotentionallyTrustworthy());
-    EXPECT_TRUE(SecurityOrigin::createFromString("http://[::1]")->isPotentionallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::create(URL(URL(), "file:///" + tempFilePath()))->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://127.0.0.1/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://localhost/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("blob:http://[::1]/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("blob:https://example.com/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("data:,a")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("about:")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("about:blank")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("about:srcdoc")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("wss://example.com")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("https://example.com")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.0")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.1")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.0.2")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.0.1.1")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://127.1.1.1")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://localhost")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://loCALhoST")->isPotentiallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("http://[::1]")->isPotentiallyTrustworthy());
 #if PLATFORM(COCOA)
-    EXPECT_TRUE(SecurityOrigin::createFromString("applewebdata:a")->isPotentionallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("applewebdata:a")->isPotentiallyTrustworthy());
 #endif
 #if PLATFORM(GTK) || PLATFORM(WPE)
-    EXPECT_TRUE(SecurityOrigin::createFromString("resource:a")->isPotentionallyTrustworthy());
+    EXPECT_TRUE(SecurityOrigin::createFromString("resource:a")->isPotentiallyTrustworthy());
 #endif
 
     // Not Trustworthy
-    EXPECT_FALSE(SecurityOrigin::createFromString("http:/malformed")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("http://example.com")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("http://31.13.77.36")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("http://[2a03:2880:f10d:83:face:b00c::25de]")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("ws://example.com")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("blob:http://example.com/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentionallyTrustworthy());
-    EXPECT_FALSE(SecurityOrigin::createFromString("dummy:a")->isPotentionallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("http:/malformed")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("http://example.com")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("http://31.13.77.36")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("http://[2a03:2880:f10d:83:face:b00c::25de]")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("ws://example.com")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("blob:http://example.com/3D45F36F-C126-493A-A8AA-457FA495247B")->isPotentiallyTrustworthy());
+    EXPECT_FALSE(SecurityOrigin::createFromString("dummy:a")->isPotentiallyTrustworthy());
 }
 
 } // namespace TestWebKitAPI

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to