+1 -1

forkme.lock

reviewed

··· 1 1 - fbb37acf15a24bb9424b7fd6f620b515c2413832 1 1 + 1444aa942bac5acf3291ce780217c2cf086d8cfa

+60 -60

patches/Cargo.lock.patch

reviewed

··· 185 185 name = "data-url" 186 186 version = "0.3.2" 187 187 source = "registry+https://github.com/rust-lang/crates.io-index" 188 188 - @@ -2175,6 +2282,7 @@ 188 188 + @@ -2178,6 +2285,7 @@ 189 189 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" 190 190 dependencies = [ 191 191 "base16ct", ··· 193 193 "crypto-bigint", 194 194 "digest", 195 195 "ff", 196 196 - @@ -2185,6 +2293,8 @@ 196 196 + @@ -2188,6 +2296,8 @@ 197 197 "pkcs8", 198 198 "rand_core 0.6.4", 199 199 "sec1", ··· 202 202 "subtle", 203 203 "zeroize", 204 204 ] 205 205 - @@ -2244,6 +2354,18 @@ 205 205 + @@ -2248,6 +2358,18 @@ 206 206 checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" 207 207 208 208 [[package]] ··· 221 221 name = "enumflags2" 222 222 version = "0.7.12" 223 223 source = "registry+https://github.com/rust-lang/crates.io-index" 224 224 - @@ -2581,12 +2703,21 @@ 224 224 + @@ -2600,12 +2722,21 @@ 225 225 226 226 [[package]] 227 227 name = "foreign-types" ··· 244 244 ] 245 245 246 246 [[package]] 247 247 - @@ -2602,6 +2733,12 @@ 247 247 + @@ -2621,6 +2752,12 @@ 248 248 249 249 [[package]] 250 250 name = "foreign-types-shared" ··· 257 257 version = "0.3.1" 258 258 source = "registry+https://github.com/rust-lang/crates.io-index" 259 259 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" 260 260 - @@ -2809,8 +2946,10 @@ 260 260 + @@ -2828,8 +2965,10 @@ 261 261 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" 262 262 dependencies = [ 263 263 "cfg-if", ··· 268 268 ] 269 269 270 270 [[package]] 271 271 - @@ -2820,9 +2959,11 @@ 271 271 + @@ -2839,9 +2978,11 @@ 272 272 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" 273 273 dependencies = [ 274 274 "cfg-if", ··· 280 280 ] 281 281 282 282 [[package]] 283 283 - @@ -3491,7 +3632,7 @@ 283 283 + @@ -3522,7 +3663,7 @@ 284 284 "cc", 285 285 "core-graphics", 286 286 "core-text", ··· 289 289 "freetype-sys", 290 290 "pkg-config", 291 291 "winapi", 292 292 - @@ -3620,6 +3761,52 @@ 292 292 + @@ -3651,6 +3792,52 @@ 293 293 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" 294 294 295 295 [[package]] ··· 342 342 name = "hilog" 343 343 version = "0.2.2" 344 344 source = "registry+https://github.com/rust-lang/crates.io-index" 345 345 - @@ -3834,6 +4021,22 @@ 345 345 + @@ -3865,6 +4052,22 @@ 346 346 ] 347 347 348 348 [[package]] ··· 365 365 name = "hyper-util" 366 366 version = "0.1.20" 367 367 source = "registry+https://github.com/rust-lang/crates.io-index" 368 368 - @@ -3854,6 +4057,7 @@ 368 368 + @@ -3885,6 +4088,7 @@ 369 369 "tokio", 370 370 "tower-service", 371 371 "tracing", ··· 373 373 ] 374 374 375 375 [[package]] 376 376 - @@ -4468,6 +4672,29 @@ 376 376 + @@ -4499,6 +4703,29 @@ 377 377 ] 378 378 379 379 [[package]] ··· 403 403 name = "ipnet" 404 404 version = "2.12.0" 405 405 source = "registry+https://github.com/rust-lang/crates.io-index" 406 406 - @@ -4474,6 +4701,16 @@ 406 406 + @@ -4505,6 +4732,16 @@ 407 407 checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" 408 408 409 409 [[package]] ··· 420 420 name = "is-terminal" 421 421 version = "0.4.17" 422 422 source = "registry+https://github.com/rust-lang/crates.io-index" 423 423 - @@ -4632,6 +4869,20 @@ 423 423 + @@ -4665,6 +4902,20 @@ 424 424 ] 425 425 426 426 [[package]] ··· 441 441 name = "keccak" 442 442 version = "0.1.6" 443 443 source = "registry+https://github.com/rust-lang/crates.io-index" 444 444 - @@ -4931,6 +5182,17 @@ 444 444 + @@ -4975,6 +5226,17 @@ 445 445 ] 446 446 447 447 [[package]] ··· 459 459 name = "matchers" 460 460 version = "0.2.0" 461 461 source = "registry+https://github.com/rust-lang/crates.io-index" 462 462 - @@ -4982,7 +5244,7 @@ 462 462 + @@ -5026,7 +5288,7 @@ 463 463 "bitflags 2.11.0", 464 464 "block", 465 465 "core-graphics-types 0.2.0", ··· 468 468 "log", 469 469 "objc", 470 470 "paste", 471 471 - @@ -5074,6 +5336,23 @@ 471 471 + @@ -5118,6 +5380,23 @@ 472 472 ] 473 473 474 474 [[package]] ··· 492 492 name = "mozangle" 493 493 version = "0.5.5" 494 494 source = "registry+https://github.com/rust-lang/crates.io-index" 495 495 - @@ -5126,6 +5405,29 @@ 495 495 + @@ -5170,6 +5449,29 @@ 496 496 checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" 497 497 498 498 [[package]] ··· 522 522 name = "naga" 523 523 version = "26.0.0" 524 524 source = "registry+https://github.com/rust-lang/crates.io-index" 525 525 - @@ -5209,6 +5511,23 @@ 525 525 + @@ -5253,6 +5555,23 @@ 526 526 ] 527 527 528 528 [[package]] ··· 546 546 name = "ndk" 547 547 version = "0.9.0" 548 548 source = "registry+https://github.com/rust-lang/crates.io-index" 549 549 - @@ -5933,6 +6252,10 @@ 549 549 + @@ -5989,6 +6308,10 @@ 550 550 version = "1.21.4" 551 551 source = "registry+https://github.com/rust-lang/crates.io-index" 552 552 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" ··· 557 557 558 558 [[package]] 559 559 name = "once_cell_polyfill" 560 560 - @@ -5953,6 +6276,32 @@ 560 560 + @@ -6009,6 +6332,32 @@ 561 561 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" 562 562 563 563 [[package]] ··· 590 590 name = "openssl-probe" 591 591 version = "0.2.1" 592 592 source = "registry+https://github.com/rust-lang/crates.io-index" 593 593 - @@ -5959,6 +6308,18 @@ 593 593 + @@ -6015,6 +6364,18 @@ 594 594 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" 595 595 596 596 [[package]] ··· 609 609 name = "openxr" 610 610 version = "0.20.0" 611 611 source = "registry+https://github.com/rust-lang/crates.io-index" 612 612 - @@ -6605,6 +6966,61 @@ 612 612 + @@ -6674,6 +7035,61 @@ 613 613 ] 614 614 615 615 [[package]] ··· 671 671 name = "quote" 672 672 version = "1.0.45" 673 673 source = "registry+https://github.com/rust-lang/crates.io-index" 674 674 - @@ -6916,6 +7332,56 @@ 674 674 + @@ -6995,6 +7411,56 @@ 675 675 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" 676 676 677 677 [[package]] ··· 728 728 name = "resvg" 729 729 version = "0.45.1" 730 730 source = "registry+https://github.com/rust-lang/crates.io-index" 731 731 - @@ -7082,6 +7548,7 @@ 731 731 + @@ -7161,6 +7627,7 @@ 732 732 "aws-lc-rs", 733 733 "log", 734 734 "once_cell", ··· 736 736 "rustls-pki-types", 737 737 "rustls-webpki", 738 738 "subtle", 739 739 - @@ -7106,6 +7573,7 @@ 739 739 + @@ -7185,6 +7652,7 @@ 740 740 source = "registry+https://github.com/rust-lang/crates.io-index" 741 741 checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" 742 742 dependencies = [ ··· 744 744 "zeroize", 745 745 ] 746 746 747 747 - @@ -7277,6 +7745,7 @@ 747 747 + @@ -7356,6 +7824,7 @@ 748 748 "der", 749 749 "generic-array", 750 750 "pkcs8", ··· 752 752 "subtle", 753 753 "zeroize", 754 754 ] 755 755 - @@ -7383,6 +7852,18 @@ 755 755 + @@ -7468,6 +7937,18 @@ 756 756 ] 757 757 758 758 [[package]] ··· 771 771 name = "serde_json" 772 772 version = "1.0.149" 773 773 source = "registry+https://github.com/rust-lang/crates.io-index" 774 774 - @@ -7438,6 +7919,16 @@ 774 774 + @@ -7523,6 +8004,16 @@ 775 775 ] 776 776 777 777 [[package]] ··· 788 788 name = "servo" 789 789 version = "0.1.0" 790 790 dependencies = [ 791 791 - @@ -7690,6 +8181,7 @@ 791 791 + @@ -7775,6 +8266,7 @@ 792 792 "rand 0.9.2", 793 793 "rustc-hash 2.1.2", 794 794 "serde", ··· 796 796 "servo-background-hang-monitor", 797 797 "servo-background-hang-monitor-api", 798 798 "servo-base", 799 799 - @@ -7716,6 +8208,8 @@ 799 799 + @@ -7801,6 +8293,8 @@ 800 800 "servo-webxr-api", 801 801 "stylo", 802 802 "stylo_traits", ··· 805 805 "tracing", 806 806 ] 807 807 808 808 - @@ -8340,9 +8834,11 @@ 808 808 + @@ -8425,9 +8919,11 @@ 809 809 name = "servo-net" 810 810 version = "0.1.0" 811 811 dependencies = [ ··· 817 817 "base64 0.22.1", 818 818 "bytes", 819 819 "chrono", 820 820 - @@ -8373,6 +8869,7 @@ 820 820 + @@ -8458,6 +8954,7 @@ 821 821 "parking_lot", 822 822 "quick_cache", 823 823 "regex", ··· 825 825 "resvg", 826 826 "rustc-hash 2.1.2", 827 827 "rustls", 828 828 - @@ -8379,9 +8876,11 @@ 828 828 + @@ -8464,9 +8961,11 @@ 829 829 "rustls-pki-types", 830 830 "rustls-platform-verifier", 831 831 "serde", ··· 837 837 "servo-devtools-traits", 838 838 "servo-embedder-traits", 839 839 "servo-hyper-serde", 840 840 - @@ -8394,6 +8893,7 @@ 840 840 + @@ -8479,6 +8978,7 @@ 841 841 "servo-url", 842 842 "servo_arc", 843 843 "sha2", ··· 845 845 "time", 846 846 "tokio", 847 847 "tokio-rustls", 848 848 - @@ -8429,6 +8929,7 @@ 848 848 + @@ -8514,6 +9014,7 @@ 849 849 "rustc-hash 2.1.2", 850 850 "rustls-pki-types", 851 851 "serde", ··· 853 853 "servo-base", 854 854 "servo-config", 855 855 "servo-default-resources", 856 856 - @@ -8440,8 +8941,10 @@ 856 856 + @@ -8525,8 +9026,10 @@ 857 857 "servo-profile-traits", 858 858 "servo-url", 859 859 "servo_arc", ··· 864 864 "url", 865 865 "uuid", 866 866 "webrender_api", 867 867 - @@ -9001,6 +9504,7 @@ 867 867 + @@ -9086,6 +9589,7 @@ 868 868 "bpaf", 869 869 "cc", 870 870 "cfg-if", ··· 872 872 "crossbeam-channel", 873 873 "dirs", 874 874 "dpi", 875 875 - @@ -9015,6 +9519,7 @@ 875 875 + @@ -9100,6 +9604,7 @@ 876 876 "headers 0.4.1", 877 877 "hilog", 878 878 "hitrace", ··· 880 880 "image", 881 881 "ipc-channel", 882 882 "jni 0.21.1", 883 883 - @@ -9035,6 +9540,7 @@ 883 883 + @@ -9120,6 +9625,7 @@ 884 884 "ohos-window-manager-sys", 885 885 "raw-window-handle", 886 886 "rustls", ··· 888 888 "serde_json", 889 889 "servo", 890 890 "servo-allocator", 891 891 - @@ -9041,6 +9547,7 @@ 891 891 + @@ -9126,6 +9632,7 @@ 892 892 "servo-base", 893 893 "servo-webdriver-server", 894 894 "signal-hook-registry", ··· 896 896 "surfman", 897 897 "tokio", 898 898 "tracing", 899 899 - @@ -9596,6 +10103,9 @@ 899 899 + @@ -9691,6 +10198,9 @@ 900 900 version = "1.0.2" 901 901 source = "registry+https://github.com/rust-lang/crates.io-index" 902 902 checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" ··· 906 906 907 907 [[package]] 908 908 name = "synstructure" 909 909 - @@ -9630,6 +10140,27 @@ 909 909 + @@ -9725,6 +10235,27 @@ 910 910 ] 911 911 912 912 [[package]] ··· 934 934 name = "system-deps" 935 935 version = "6.2.2" 936 936 source = "registry+https://github.com/rust-lang/crates.io-index" 937 937 - @@ -9668,6 +10199,12 @@ 937 937 + @@ -9763,6 +10294,12 @@ 938 938 ] 939 939 940 940 [[package]] ··· 947 947 name = "tar" 948 948 version = "0.4.45" 949 949 source = "registry+https://github.com/rust-lang/crates.io-index" 950 950 - @@ -9975,6 +10512,16 @@ 950 950 + @@ -10070,6 +10607,16 @@ 951 951 ] 952 952 953 953 [[package]] ··· 964 964 name = "tokio-rustls" 965 965 version = "0.26.4" 966 966 source = "registry+https://github.com/rust-lang/crates.io-index" 967 967 - @@ -10096,6 +10643,25 @@ 967 967 + @@ -10191,6 +10738,25 @@ 968 968 "futures-util", 969 969 "pin-project-lite", 970 970 "sync_wrapper", ··· 990 990 "tower-layer", 991 991 "tower-service", 992 992 ] 993 993 - @@ -10379,6 +10945,12 @@ 993 993 + @@ -10474,6 +11040,12 @@ 994 994 ] 995 995 996 996 [[package]] ··· 1003 1003 name = "untrusted" 1004 1004 version = "0.9.0" 1005 1005 source = "registry+https://github.com/rust-lang/crates.io-index" 1006 1006 - @@ -10398,6 +10970,12 @@ 1006 1006 + @@ -10493,6 +11065,12 @@ 1007 1007 ] 1008 1008 1009 1009 [[package]] ··· 1016 1016 name = "urlpattern" 1017 1017 version = "0.3.0" 1018 1018 source = "registry+https://github.com/rust-lang/crates.io-index" 1019 1019 - @@ -11166,6 +11744,12 @@ 1019 1019 + @@ -11284,6 +11862,12 @@ 1020 1020 ] 1021 1021 1022 1022 [[package]] ··· 1029 1029 name = "winapi" 1030 1030 version = "0.3.9" 1031 1031 source = "registry+https://github.com/rust-lang/crates.io-index" 1032 1032 - @@ -11387,6 +11971,17 @@ 1032 1032 + @@ -11505,6 +12089,17 @@ 1033 1033 ] 1034 1034 1035 1035 [[package]] ··· 1047 1047 name = "windows-result" 1048 1048 version = "0.2.0" 1049 1049 source = "registry+https://github.com/rust-lang/crates.io-index" 1050 1050 - @@ -11452,6 +12047,15 @@ 1050 1050 + @@ -11570,6 +12165,15 @@ 1051 1051 1052 1052 [[package]] 1053 1053 name = "windows-sys" ··· 1063 1063 version = "0.52.0" 1064 1064 source = "registry+https://github.com/rust-lang/crates.io-index" 1065 1065 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 1066 1066 - @@ -11494,6 +12098,21 @@ 1066 1066 + @@ -11612,6 +12216,21 @@ 1067 1067 1068 1068 [[package]] 1069 1069 name = "windows-targets" ··· 1085 1085 version = "0.52.6" 1086 1086 source = "registry+https://github.com/rust-lang/crates.io-index" 1087 1087 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" 1088 1088 - @@ -11534,6 +12153,12 @@ 1088 1088 + @@ -11652,6 +12271,12 @@ 1089 1089 1090 1090 [[package]] 1091 1091 name = "windows_aarch64_gnullvm" ··· 1098 1098 version = "0.52.6" 1099 1099 source = "registry+https://github.com/rust-lang/crates.io-index" 1100 1100 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" 1101 1101 - @@ -11546,6 +12171,12 @@ 1101 1101 + @@ -11664,6 +12289,12 @@ 1102 1102 1103 1103 [[package]] 1104 1104 name = "windows_aarch64_msvc" ··· 1111 1111 version = "0.52.6" 1112 1112 source = "registry+https://github.com/rust-lang/crates.io-index" 1113 1113 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" 1114 1114 - @@ -11558,6 +12189,12 @@ 1114 1114 + @@ -11676,6 +12307,12 @@ 1115 1115 1116 1116 [[package]] 1117 1117 name = "windows_i686_gnu" ··· 1124 1124 version = "0.52.6" 1125 1125 source = "registry+https://github.com/rust-lang/crates.io-index" 1126 1126 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" 1127 1127 - @@ -11576,6 +12213,12 @@ 1127 1127 + @@ -11694,6 +12331,12 @@ 1128 1128 1129 1129 [[package]] 1130 1130 name = "windows_i686_msvc" ··· 1137 1137 version = "0.52.6" 1138 1138 source = "registry+https://github.com/rust-lang/crates.io-index" 1139 1139 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" 1140 1140 - @@ -11588,6 +12231,12 @@ 1140 1140 + @@ -11706,6 +12349,12 @@ 1141 1141 1142 1142 [[package]] 1143 1143 name = "windows_x86_64_gnu" ··· 1150 1150 version = "0.52.6" 1151 1151 source = "registry+https://github.com/rust-lang/crates.io-index" 1152 1152 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" 1153 1153 - @@ -11600,6 +12249,12 @@ 1153 1153 + @@ -11718,6 +12367,12 @@ 1154 1154 1155 1155 [[package]] 1156 1156 name = "windows_x86_64_gnullvm" ··· 1163 1163 version = "0.52.6" 1164 1164 source = "registry+https://github.com/rust-lang/crates.io-index" 1165 1165 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" 1166 1166 - @@ -11612,6 +12267,12 @@ 1166 1166 + @@ -11730,6 +12385,12 @@ 1167 1167 1168 1168 [[package]] 1169 1169 name = "windows_x86_64_msvc" ··· 1176 1176 version = "0.52.6" 1177 1177 source = "registry+https://github.com/rust-lang/crates.io-index" 1178 1178 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" 1179 1179 - @@ -11678,6 +12339,16 @@ 1179 1179 + @@ -11796,6 +12457,16 @@ 1180 1180 ] 1181 1181 1182 1182 [[package]]

+3 -3

patches/components/script/dom/document/document.rs.patch

reviewed

··· 169 169 pub(crate) fn handle_no_longer_waiting_on_asynchronous_image_updates(&self) { 170 170 self.waiting_on_canvas_image_updates.set(false); 171 171 } 172 172 - @@ -3680,6 +3767,7 @@ 172 172 + @@ -3670,6 +3757,7 @@ 173 173 active_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), 174 174 creation_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), 175 175 favicon: RefCell::new(None), ··· 177 177 websockets: DOMTracker::new(), 178 178 details_name_groups: Default::default(), 179 179 protocol_handler_automation_mode: Default::default(), 180 180 - @@ -4619,6 +4707,36 @@ 180 180 + @@ -4609,6 +4697,36 @@ 181 181 182 182 pub(crate) fn notify_embedder_favicon(&self) { 183 183 if let Some(ref image) = *self.favicon.borrow() { ··· 214 214 self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone())); 215 215 } 216 216 } 217 217 - @@ -4689,6 +4807,20 @@ 217 217 + @@ -4679,6 +4797,20 @@ 218 218 pub(crate) fn set_css_styling_flag(&self, value: bool) { 219 219 self.css_styling_flag.set(value) 220 220 }

+14 -14

patches/components/script/dom/document/document_event_handler.rs.patch

reviewed

··· 150 150 } 151 151 } 152 152 153 153 - @@ -548,6 +622,198 @@ 153 153 + @@ -562,6 +636,198 @@ 154 154 } 155 155 } 156 156 ··· 349 349 /// <https://w3c.github.io/uievents/#handle-native-mouse-move> 350 350 fn handle_native_mouse_move_event(&self, input_event: &ConstellationInputEvent, can_gc: CanGc) { 351 351 // Ignore all incoming events without a hit test. 352 352 - @@ -562,6 +828,57 @@ 352 352 + @@ -576,6 +842,57 @@ 353 353 return; 354 354 } 355 355 ··· 407 407 // Update the cursor when the mouse moves, if it has changed. 408 408 self.set_cursor(Some(hit_test_result.cursor)); 409 409 410 410 - @@ -796,6 +1113,12 @@ 410 410 + @@ -810,6 +1127,12 @@ 411 411 return; 412 412 }; 413 413 ··· 420 420 debug!( 421 421 "{:?}: at {:?}", 422 422 event.action, hit_test_result.point_in_frame 423 423 - @@ -909,7 +1232,7 @@ 423 423 + @@ -923,7 +1246,7 @@ 424 424 self.maybe_show_context_menu( 425 425 node.upcast(), 426 426 &hit_test_result, ··· 429 429 can_gc, 430 430 ); 431 431 } 432 432 - @@ -1038,9 +1361,30 @@ 432 432 + @@ -1052,9 +1375,30 @@ 433 433 &self, 434 434 target: &EventTarget, 435 435 hit_test_result: &HitTestResult, ··· 461 461 // <https://w3c.github.io/pointerevents/#contextmenu> 462 462 let menu_event = PointerEvent::new( 463 463 &self.window, // window 464 464 - @@ -1054,25 +1398,25 @@ 464 464 + @@ -1068,25 +1412,25 @@ 465 465 hit_test_result 466 466 .point_relative_to_initial_containing_block 467 467 .to_i32(), ··· 506 506 can_gc, 507 507 ); 508 508 menu_event.upcast::<Event>().set_composed(true); 509 509 - @@ -1089,6 +1433,89 @@ 509 509 + @@ -1103,6 +1447,89 @@ 510 510 }; 511 511 } 512 512 ··· 596 596 fn handle_touch_event( 597 597 &self, 598 598 event: EmbedderTouchEvent, 599 599 - @@ -1095,6 +1522,29 @@ 599 599 + @@ -1109,6 +1536,29 @@ 600 600 input_event: &ConstellationInputEvent, 601 601 can_gc: CanGc, 602 602 ) -> InputEventResult { ··· 626 626 // Ignore all incoming events without a hit test. 627 627 let Some(hit_test_result) = self.window.hit_test_from_input_event(input_event) else { 628 628 self.update_active_touch_points_when_early_return(event); 629 629 - @@ -1101,6 +1551,16 @@ 629 629 + @@ -1115,6 +1565,16 @@ 630 630 return Default::default(); 631 631 }; 632 632 ··· 643 643 let TouchId(identifier) = event.touch_id; 644 644 645 645 let Some(element) = hit_test_result 646 646 - @@ -1232,6 +1692,10 @@ 646 646 + @@ -1246,6 +1706,10 @@ 647 647 // <https://html.spec.whatwg.org/multipage/#selector-active> 648 648 // If the element is being actively pointed at the element is being activated. 649 649 self.element_for_activation(element).set_active_state(true); ··· 654 654 (current_target, pointer_touch) 655 655 }, 656 656 _ => { 657 657 - @@ -1264,10 +1728,31 @@ 657 657 + @@ -1278,10 +1742,31 @@ 658 658 can_gc, 659 659 ); 660 660 ··· 687 687 }, 688 688 TouchEventType::Up | TouchEventType::Cancel => { 689 689 active_touch_points.swap_remove(index); 690 690 - @@ -1275,6 +1760,17 @@ 690 690 + @@ -1289,6 +1774,17 @@ 691 691 // <https://html.spec.whatwg.org/multipage/#selector-active> 692 692 // If the element is being actively pointed at the element is being activated. 693 693 self.element_for_activation(element).set_active_state(false); ··· 705 705 }, 706 706 TouchEventType::Down => unreachable!("Should have been handled above"), 707 707 } 708 708 - @@ -1318,6 +1814,19 @@ 708 708 + @@ -1332,6 +1828,19 @@ 709 709 ); 710 710 let event = touch_event.upcast::<Event>(); 711 711 event.fire(&touch_dispatch_target, can_gc); ··· 725 725 event.flags().into() 726 726 } 727 727 728 728 - @@ -1470,6 +1979,16 @@ 728 728 + @@ -1473,6 +1982,16 @@ 729 729 return Default::default(); 730 730 }; 731 731

+4 -4

patches/components/script/dom/document/focus.rs.patch

reviewed

··· 1 1 --- original 2 2 +++ modified 3 3 - @@ -179,6 +179,11 @@ 3 3 + @@ -204,6 +204,11 @@ 4 4 focus_initiator: FocusInitiator, 5 5 can_gc: CanGc, 6 6 ) { ··· 9 9 + return; 10 10 + } 11 11 + 12 12 - let (mut new_focused, new_focus_state) = match focus_operation { 13 13 - FocusOperation::Focus(focusable_area) => ( 14 14 - match focusable_area { 12 12 + let (new_focused, new_focus_state) = match focus_operation { 13 13 + FocusOperation::Focus(focusable_area) => (focusable_area, true), 14 14 + FocusOperation::Unfocus => (FocusableArea::Viewport, false),

+1 -1

patches/components/script/dom/html/htmlbodyelement.rs.patch

reviewed

··· 8 8 use style::attr::AttrValue; 9 9 use style::color::AbsoluteColor; 10 10 11 11 - @@ -136,6 +137,12 @@ 11 11 + @@ -131,6 +132,12 @@ 12 12 window.webview_id(), 13 13 LoadStatus::HeadParsed, 14 14 ));

+2 -2

patches/components/script/dom/html/htmlembeddedwebview.rs.patch

reviewed

··· 231 231 + }) 232 232 + .collect(); 233 233 + // For now we know there's a one selected option at most. 234 234 - + let selectedIndex = if select_request.selected_options.is_empty() { 234 234 + + let selected_index = if select_request.selected_options.is_empty() { 235 235 + -1 236 236 + } else { 237 237 + select_request.selected_options[0] as i32 238 238 + }; 239 239 + select_parameters = Some(EmbedderSelectParameters { 240 240 + options: Some(select_options), 241 241 - + selectedIndex, 241 241 + + selectedIndex: selected_index, 242 242 + }); 243 243 + }, 244 244 + EmbedderControlRequest::ColorPicker(color) => {

+12 -14

patches/components/script/dom/html/htmliframeelement.rs.patch

reviewed

··· 8 8 use js::context::JSContext; 9 9 use js::rust::HandleObject; 10 10 use net_traits::ReferrerPolicy; 11 11 - @@ -18,40 +19,46 @@ 11 11 + @@ -18,38 +19,44 @@ 12 12 use profile_traits::ipc as ProfiledIpc; 13 13 use script_bindings::script_runtime::temp_cx; 14 14 use script_traits::{NewPipelineInfo, UpdatePipelineIdReason}; ··· 42 42 +use crate::dom::console::Console; 43 43 use crate::dom::document::Document; 44 44 use crate::dom::domtokenlist::DOMTokenList; 45 45 - use crate::dom::element::{ 46 46 - AttributeMutation, Element, LayoutElementHelpers, reflect_referrer_policy_attribute, 47 47 - }; 45 45 + use crate::dom::element::{AttributeMutation, Element, reflect_referrer_policy_attribute}; 48 46 +use crate::dom::embedder::Embedder; 49 47 use crate::dom::eventtarget::EventTarget; 50 48 use crate::dom::globalscope::GlobalScope; ··· 59 57 use crate::navigation::{ 60 58 determine_creation_sandboxing_flags, determine_iframe_element_referrer_policy, 61 59 }; 62 62 - @@ -80,6 +87,12 @@ 60 60 + @@ -78,6 +85,12 @@ 63 61 SrcDoc, 64 62 } 65 63 ··· 72 70 #[dom_struct] 73 71 pub(crate) struct HTMLIFrameElement { 74 72 htmlelement: HTMLElement, 75 75 - @@ -116,6 +129,30 @@ 73 73 + @@ -114,6 +127,30 @@ 76 74 /// an empty iframe is attached. In that case, we shouldn't fire a 77 75 /// subsequent asynchronous load event. 78 76 already_fired_synchronous_load_event: Cell<bool>, ··· 103 101 } 104 102 105 103 impl HTMLIFrameElement { 106 106 - @@ -312,6 +349,8 @@ 104 104 + @@ -310,6 +347,8 @@ 107 105 user_content_manager_id: None, 108 106 theme: window.theme(), 109 107 target_snapshot_params, ··· 112 110 }; 113 111 114 112 self.pipeline_id.set(Some(new_pipeline_id)); 115 115 - @@ -626,6 +665,158 @@ 113 113 + @@ -624,6 +663,158 @@ 116 114 ); 117 115 } 118 116 ··· 271 269 fn destroy_nested_browsing_context(&self) { 272 270 self.pipeline_id.set(None); 273 271 self.pending_pipeline_id.set(None); 274 274 - @@ -688,6 +879,13 @@ 272 272 + @@ -686,6 +877,13 @@ 275 273 lazy_load_resumption_steps: Default::default(), 276 274 pending_navigation: Default::default(), 277 275 already_fired_synchronous_load_event: Default::default(), ··· 285 283 } 286 284 } 287 285 288 288 - @@ -723,6 +921,157 @@ 286 286 + @@ -721,6 +919,157 @@ 289 287 self.webview_id.get() 290 288 } 291 289 ··· 443 441 #[inline] 444 442 pub(crate) fn sandboxing_flag_set(&self) -> SandboxingFlagSet { 445 443 self.sandboxing_flag_set 446 446 - @@ -1107,6 +1456,89 @@ 444 444 + @@ -1098,6 +1447,89 @@ 447 445 448 446 // https://html.spec.whatwg.org/multipage/#dom-iframe-longdesc 449 447 make_url_setter!(SetLongDesc, "longdesc"); ··· 533 531 } 534 532 535 533 impl VirtualMethods for HTMLIFrameElement { 536 536 - @@ -1162,9 +1594,54 @@ 534 534 + @@ -1153,9 +1585,54 @@ 537 535 // may be in a different script thread. Instead, we check to see if the parent 538 536 // is in a document tree and has a browsing context, which is what causes 539 537 // the child browsing context to be created. ··· 590 588 } 591 589 }, 592 590 local_name!("loading") => { 593 593 - @@ -1229,6 +1706,23 @@ 591 591 + @@ -1220,6 +1697,23 @@ 594 592 595 593 debug!("<iframe> running post connection steps"); 596 594 ··· 614 612 // Step 1. Create a new child navigable for insertedNode. 615 613 self.create_nested_browsing_context(cx); 616 614 617 617 - @@ -1252,11 +1746,25 @@ 615 615 + @@ -1243,11 +1737,25 @@ 618 616 fn unbind_from_tree(&self, context: &UnbindContext, can_gc: CanGc) { 619 617 self.super_type().unwrap().unbind_from_tree(context, can_gc); 620 618