diff options
Diffstat (limited to 'www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch')
| -rw-r--r-- | www-client/chromium/files/chromium-114-VirtualCursor-std-layout.patch | 42 |
1 files changed, 21 insertions, 21 deletions
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 |