Diff
Modified: trunk/LayoutTests/ChangeLog (274614 => 274615)
--- trunk/LayoutTests/ChangeLog 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/LayoutTests/ChangeLog 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,3 +1,15 @@
+2021-03-17 Alex Christensen <[email protected]>
+
+ Make fast/images/missing-content-image-crash.html results consistent with internal build
+ https://bugs.webkit.org/show_bug.cgi?id=223399
+ <rdar://75443811>
+
+ Reviewed by Darin Adler.
+
+ * fast/images/missing-content-image-crash-expected.txt:
+ * http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt:
+ * platform/mac-wk1/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt:
+
2021-03-17 Peng Liu <[email protected]>
[GPUP] WebGL2RenderingContext::texImage2D() does not work with a video as the image source
Modified: trunk/LayoutTests/fast/images/missing-content-image-crash-expected.txt (274614 => 274615)
--- trunk/LayoutTests/fast/images/missing-content-image-crash-expected.txt 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/LayoutTests/fast/images/missing-content-image-crash-expected.txt 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,3 +1,4 @@
-Blocked access to external URL http://webkit.org/resources/missing.jpg
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/resources/missing.jpg to https
+Blocked access to external URL https://webkit.org/resources/missing.jpg
PASS if no crash or assert.
Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt (274614 => 274615)
--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,8 +1,11 @@
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
-Blocked access to external URL http://webkit.org/report
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
+Blocked access to external URL https://webkit.org/report
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
-Blocked access to external URL http://webkit.org/report
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
+Blocked access to external URL https://webkit.org/report
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
-Blocked access to external URL http://webkit.org/report
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
+Blocked access to external URL https://webkit.org/report
The iframe below triggers a violation report creating the initial empty document. It should not crash the web process.
Modified: trunk/LayoutTests/platform/mac-wk1/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt (274614 => 274615)
--- trunk/LayoutTests/platform/mac-wk1/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/LayoutTests/platform/mac-wk1/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,5 +1,8 @@
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff because it does not appear in the font-src directive of the Content Security Policy.
+CONSOLE MESSAGE: Promoted URL from http://webkit.org/report to https
The iframe below triggers a violation report creating the initial empty document. It should not crash the web process.
Modified: trunk/Source/WebCore/ChangeLog (274614 => 274615)
--- trunk/Source/WebCore/ChangeLog 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/Source/WebCore/ChangeLog 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,3 +1,15 @@
+2021-03-17 Alex Christensen <[email protected]>
+
+ Make fast/images/missing-content-image-crash.html results consistent with internal build
+ https://bugs.webkit.org/show_bug.cgi?id=223399
+ <rdar://75443811>
+
+ Reviewed by Darin Adler.
+
+ webkit.org is in the internal upgrade list. Add it to the open source list and make our test expectations consistent.
+
+ * contentextensions/ContentExtensionsBackend.cpp:
+
2021-03-17 Yusuke Suzuki <[email protected]>
modern-media-controls css should not allocate heap memory
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (274614 => 274615)
--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2021-03-18 05:30:54 UTC (rev 274615)
@@ -62,7 +62,11 @@
if (redirectFrom.host() == url.host() && redirectFrom.protocolIs("https"))
return;
- if (url.protocolIs("http") && (url.host() == "www.opengl.org" || url.host() == "download"))
+ if (!url.protocolIs("http"))
+ return;
+ if (url.host() == "www.opengl.org"
+ || url.host() == "webkit.org"
+ || url.host() == "download")
results.summary.madeHTTPS = true;
}
#endif
Modified: trunk/Tools/ChangeLog (274614 => 274615)
--- trunk/Tools/ChangeLog 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/Tools/ChangeLog 2021-03-18 05:30:54 UTC (rev 274615)
@@ -1,3 +1,14 @@
+2021-03-17 Alex Christensen <[email protected]>
+
+ Make fast/images/missing-content-image-crash.html results consistent with internal build
+ https://bugs.webkit.org/show_bug.cgi?id=223399
+ <rdar://75443811>
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
+ (TestWebKitAPI::TEST):
+
2021-03-17 Darin Adler <[email protected]>
"multile" typo in website and one other place
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm (274614 => 274615)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2021-03-18 05:20:19 UTC (rev 274614)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2021-03-18 05:30:54 UTC (rev 274615)
@@ -203,7 +203,7 @@
const char* body =
"<script>"
"fetch("
- "'http://webkit.org/path3',"
+ "'http://www.webkit.org/path3',"
"{credentials:'include'}"
").then(()=>{"
"alert('fetched')"
@@ -213,7 +213,7 @@
"</script>";
switch (connectionCount) {
case 1: {
- EXPECT_TRUE(strstr(request.data(), "GET http://webkit.org/path1 HTTP/1.1\r\n"));
+ EXPECT_TRUE(strstr(request.data(), "GET http://www.webkit.org/path1 HTTP/1.1\r\n"));
reply = makeString(
"HTTP/1.1 200 OK\r\n"
"Content-Length: ", strlen(body), "\r\n"
@@ -240,7 +240,7 @@
EXPECT_TRUE(strstr(request.data(), "Cookie: a=b\r\n"));
else
EXPECT_FALSE(strstr(request.data(), "Cookie: a=b\r\n"));
- EXPECT_TRUE(strstr(request.data(), "GET http://webkit.org/path3 HTTP/1.1\r\n"));
+ EXPECT_TRUE(strstr(request.data(), "GET http://www.webkit.org/path3 HTTP/1.1\r\n"));
reply =
"HTTP/1.1 200 OK\r\n"
"Content-Length: 0\r\n"
@@ -269,7 +269,7 @@
[viewConfiguration setWebsiteDataStore:dataStore.get()];
auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) configuration:viewConfiguration.get()]);
- [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://webkit.org/path1"]]];
+ [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.webkit.org/path1"]]];
EXPECT_WK_STREQ([webView _test_waitForAlert], "fetched");
[webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://example.com/path2"]]];
