Skip to content

Commit

Permalink
#457 fix trailing blanks
Browse files Browse the repository at this point in the history
Git apply result for master branch
  • Loading branch information
uazo authored Oct 25, 2023
2 parents c27f2e5 + 4f6e5fb commit 1bf3120
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 127 deletions.
14 changes: 7 additions & 7 deletions build/patches/00Add-support-to-jxl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ new file mode 100644
+ #include "net/test/embedded_test_server/http_request.h"
+ #include "third_party/blink/public/common/buildflags.h"
++#include "third_party/blink/public/common/features.h"
+
+
+ using ChromeAcceptHeaderTest = InProcessBrowserTest;
+
+
+-#if BUILDFLAG(ENABLE_AV1_DECODER)
++#if BUILDFLAG(ENABLE_AV1_DECODER) || BUILDFLAG(ENABLE_JXL_DECODER)
+ namespace {
Expand All @@ -312,7 +312,7 @@ new file mode 100644
+ } // namespace
+-#endif // BUILDFLAG(ENABLE_AV1_DECODER)
++#endif // BUILDFLAG(ENABLE_AV1_DECODER) || BUILDFLAG(ENABLE_JXL_DECODER)
+
+
+ IN_PROC_BROWSER_TEST_F(ChromeAcceptHeaderTest, Check) {
+ net::EmbeddedTestServer server(net::EmbeddedTestServer::TYPE_HTTP);
+@@ -55,7 +63,7 @@
Expand All @@ -325,7 +325,7 @@ new file mode 100644
+ "text/html,application/xhtml+xml,application/xml;q=0.9," +
+ GetOptionalImageCodecs() +
+@@ -66,7 +74,7 @@
+
+
+ std::string expected_favicon_accept_header =
+ "image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8";
+-#if BUILDFLAG(ENABLE_AV1_DECODER)
Expand Down Expand Up @@ -353,7 +353,7 @@ new file mode 100644
+@@ -71,13 +72,20 @@
+ return it->second;
+ }
+
+
+-#if BUILDFLAG(ENABLE_AV1_DECODER)
++#if BUILDFLAG(ENABLE_AV1_DECODER) || BUILDFLAG(ENABLE_JXL_DECODER)
+ std::string GetOptionalImageCodecs() const {
Expand All @@ -370,7 +370,7 @@ new file mode 100644
+ }
+-#endif // BUILDFLAG(ENABLE_AV1_DECODER)
++#endif // BUILDFLAG(ENABLE_AV1_DECODER) || BUILDFLAG(ENABLE_JXL_DECODER)
+
+
+ private:
+ void Monitor(const net::test_server::HttpRequest& request) {
+@@ -113,7 +121,7 @@
Expand Down Expand Up @@ -2424,7 +2424,7 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
--- a/third_party/blink/web_tests/VirtualTestSuites
+++ b/third_party/blink/web_tests/VirtualTestSuites
@@ -449,6 +449,15 @@
@@ -450,6 +450,15 @@
"--disable-threaded-compositing", "--disable-threaded-animation"],
"expires": "Jul 1, 2023"
},
Expand Down
Loading

0 comments on commit 1bf3120

Please sign in to comment.