diff options
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch | 42 |
2 files changed, 22 insertions, 22 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 3cf6686..cfa1741 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -11,7 +11,7 @@ AUX chromium-112-disable-global-media-controls.patch 611 BLAKE2B 36ec28102e447ec AUX chromium-113-authenticator-request-dialog-model-include.patch 437 BLAKE2B ffd9a925e098f65a6a00aa04834f417b40e1bf381592c7bf6eeb35e0822e6f9928ba4554b8983f1565c61eb2fdbb98da471885a2337640d8b9b5e87d61609f61 SHA512 185ad39c2a27126974dee037480eb39a99cc3e8ce3199b89e46a6ec812a89bd6fbd5f4ab6c7aacf255aa3e7b0e565c0c49161c9a25da26dce8e96e385457a8fb AUX chromium-113-compiler.patch 8453 BLAKE2B 3ede3b4f36e47edfc172a2c3d74e6b6e165a930054f80a9bd374bf5d25460abe0c108687e98458cfe79d36ec5ee47b4d7f787fd3af6d96a7f06831ed798bb670 SHA512 36505e8f969c2858bcf15b3f698cc8bfc5da7f9a8b2ec000a4f38d841fb6e5c90937d3cd3d2116cd71b58072f68a2ce8b1ac29beb4b8bc28fe951b0e1c8e9d29 AUX chromium-113-web-view-impl-include.patch 435 BLAKE2B c04791b2efc45b0f86c20c2c639b4477a857f519b07aaa60eb89239daf1fe404f2a27cb01d2b0e7c625d439c2200c774f89966e5fbada5c924a96e97fe5ce215 SHA512 3559b7c936b4683e77a6e1da7d9ed419d2d20a822f0189623badf0cb0364dd0df83c87ff3eaf53f45a7367d4713e0af7b7694d13e0985ab22c94cd8d424ba272 -AUX chromium-114-VirtualCursor-std-layout.patch 8444 BLAKE2B 6d0bb13947ee384e393cbcb197adb0a06064d152a41d130355de742f325d47cc00ea7aa4751fb38121874af0acac4a4bfc7a465566210a9490fa5590be3e1d08 SHA512 154aba7cd012129d390a013344b29f76480cf85e2088e8a6e3ed98cec09bd9f7f710716c96f614ab8f8ab1fe1642fbf4eb2e884cc58a3d19f9600657a4fa0409 +AUX chromium-114-VirtualCursor-std-layout.patch 8453 BLAKE2B 7753197ccac634783009d7e2c26e007790e889b74a71966efe0a428222f847d52d62953577bc75368170f72db622ab4e69a411319d25c086fe99ba51f54a86f8 SHA512 4b13b86dfe3d95b542231d682652c00a5ad1996383de101149e602b1371bf7c8a9f8a86825b6bc26648dca60b68976ce8e81e38468902b0beced20bd99b47701 AUX chromium-114-compiler.patch 8433 BLAKE2B 373ef48debcb4c07fdcece70cc95c4f01c68b49f7fa9f38f5d6d85cfd0c61dfcbc80cce1afe7e6da58627a7b5df8dad44de708d9002321b61c65bc88677ed595 SHA512 f1256f1b65c2f6fbc746f929a662e96496afddc952469d1fb701295944286bcba434f401315a6293cf8d973e230e73d61641f9f2ad60d1f3836115e444903f04 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff diff --git a/www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch b/www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch index 3b682d7..41bf522 100644 --- a/www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch +++ b/www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch @@ -32,29 +32,9 @@ index 56fee9ae5..a0c2dd6eb 100644 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(CanAdvance()); diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h -index 155be1ef1..5b2f211a8 100644 +index 155be1ef1..ed2710780 100644 --- a/sql/recover_module/btree.h +++ b/sql/recover_module/btree.h -@@ -70,16 +70,16 @@ class InnerPageDecoder { - static int ComputeCellCount(DatabasePageReader* db_reader); - - // The number of the B-tree page this reader is reading. -- const int page_id_; -+ int page_id_; - // Used to read the tree page. - // - // Raw pointer usage is acceptable because this instance's owner is expected - // to ensure that the DatabasePageReader outlives this. - // This field is not a raw_ptr<> because it caused a - // std::is_trivially_destructible static_assert failure. -- RAW_PTR_EXCLUSION DatabasePageReader* const db_reader_; -+ RAW_PTR_EXCLUSION DatabasePageReader* db_reader_; - // Caches the ComputeCellCount() value for this reader's page. -- const int cell_count_ = ComputeCellCount(db_reader_); -+ int cell_count_; - - // The reader's cursor state. - // @@ -104,9 +104,7 @@ class LeafPageDecoder { public: // Creates a decoder for a DatabasePageReader's last read page. @@ -84,6 +64,26 @@ index 155be1ef1..5b2f211a8 100644 // True if the given reader may point to an inner page in a table B-tree. // // The last ReadPage() call on |db_reader| must have succeeded. +@@ -167,16 +176,16 @@ class LeafPageDecoder { + static int ComputeCellCount(DatabasePageReader* db_reader); + + // The number of the B-tree page this reader is reading. +- const int64_t page_id_; ++ int64_t page_id_; + // Used to read the tree page. + // + // Raw pointer usage is acceptable because this instance's owner is expected + // to ensure that the DatabasePageReader outlives this. + // This field is not a raw_ptr<> because it caused a + // std::is_trivially_destructible static_assert failure. +- RAW_PTR_EXCLUSION DatabasePageReader* const db_reader_; ++ RAW_PTR_EXCLUSION DatabasePageReader* db_reader_; + // Caches the ComputeCellCount() value for this reader's page. +- const int cell_count_ = ComputeCellCount(db_reader_); ++ int cell_count_; + + // The reader's cursor state. + // diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc index 06a4cd2d2..6ede54837 100644 --- a/sql/recover_module/cursor.cc |