Tom spot Callaway
2 years ago
parent
05c57f9975
commit
8242b9a105
@ -0,0 +1,26 @@
|
|||||||
|
From 491bf840da4f76fa3591cc0aa2f4c19cdbe57ec4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Thu, 12 May 2022 11:58:29 +0000
|
||||||
|
Subject: [PATCH] GCC: fix ambiguous references in blink::FrameLoadRequest
|
||||||
|
|
||||||
|
Add namespace to avoid confusion.
|
||||||
|
---
|
||||||
|
third_party/blink/renderer/core/loader/frame_load_request.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/core/loader/frame_load_request.h b/third_party/blink/renderer/core/loader/frame_load_request.h
|
||||||
|
index 444b25c..a86814d 100644
|
||||||
|
--- a/third_party/blink/renderer/core/loader/frame_load_request.h
|
||||||
|
+++ b/third_party/blink/renderer/core/loader/frame_load_request.h
|
||||||
|
@@ -179,7 +179,7 @@ struct CORE_EXPORT FrameLoadRequest {
|
||||||
|
impression_ = impression;
|
||||||
|
}
|
||||||
|
|
||||||
|
- const absl::optional<Impression>& Impression() const { return impression_; }
|
||||||
|
+ const absl::optional<blink::Impression>& Impression() const { return impression_; }
|
||||||
|
|
||||||
|
bool CanDisplay(const KURL&) const;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
From 3d274856e792a361336eb4ae1670bc9c1905f0cb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Steinar H. Gunderson <sesse@chromium.org>
|
||||||
|
Date: Thu, 12 May 2022 16:42:40 +0200
|
||||||
|
Subject: [PATCH] Make AhoCorasickNode 4-aligned.
|
||||||
|
|
||||||
|
This should fix an issue where std::vector could allocate unaligned
|
||||||
|
memory for AhoCorasickNode, and we'd then return a pointer to
|
||||||
|
inline_edges, where a caller would expect the pointer to be aligned
|
||||||
|
but it wasn't.
|
||||||
|
|
||||||
|
Change-Id: Id9dff044c61f8e46062c63b8480b18ebc68c4862
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc
|
||||||
|
index e110047..ef0b750 100644
|
||||||
|
--- a/base/substring_set_matcher/substring_set_matcher.cc
|
||||||
|
+++ b/base/substring_set_matcher/substring_set_matcher.cc
|
||||||
|
@@ -424,7 +424,12 @@
|
||||||
|
edges_.inline_edges[num_edges()] = AhoCorasickEdge{label, node};
|
||||||
|
if (label == kFailureNodeLabel) {
|
||||||
|
// Make sure that kFailureNodeLabel is first.
|
||||||
|
- std::swap(edges_.inline_edges[0], edges_.inline_edges[num_edges()]);
|
||||||
|
+ // NOTE: We don't use std::swap here, because GCC
|
||||||
|
+ // doesn't understand that inline_edges[] is 4-aligned
|
||||||
|
+ // and gives a warning.
|
||||||
|
+ AhoCorasickEdge temp = edges_.inline_edges[0];
|
||||||
|
+ edges_.inline_edges[0] = edges_.inline_edges[num_edges()];
|
||||||
|
+ edges_.inline_edges[num_edges()] = temp;
|
||||||
|
}
|
||||||
|
--num_free_edges_;
|
||||||
|
return;
|
||||||
|
diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc
|
||||||
|
index e110047..ef0b750 100644
|
||||||
|
--- a/base/substring_set_matcher/substring_set_matcher.h
|
||||||
|
+++ b/base/substring_set_matcher/substring_set_matcher.h
|
||||||
|
@@ -154,8 +154,9 @@
|
||||||
|
static constexpr uint32_t kEmptyLabel = 0x103;
|
||||||
|
|
||||||
|
// A node in the trie, packed tightly together so that it occupies 12 bytes
|
||||||
|
- // (both on 32- and 64-bit platforms).
|
||||||
|
- class AhoCorasickNode {
|
||||||
|
+ // (both on 32- and 64-bit platforms), but aligned to at least 4 (see the
|
||||||
|
+ // comment on edges_).
|
||||||
|
+ class alignas(AhoCorasickEdge) AhoCorasickNode {
|
||||||
|
public:
|
||||||
|
AhoCorasickNode();
|
||||||
|
~AhoCorasickNode();
|
||||||
|
@@ -178,6 +179,10 @@
|
||||||
|
NodeID GetEdgeNoInline(uint32_t label) const;
|
||||||
|
void SetEdge(uint32_t label, NodeID node);
|
||||||
|
const AhoCorasickEdge* edges() const {
|
||||||
|
+ // NOTE: Returning edges_.inline_edges here is fine, because it's
|
||||||
|
+ // the first thing in the struct (see the comment on edges_).
|
||||||
|
+ DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(edges_.inline_edges) %
|
||||||
|
+ alignof(AhoCorasickEdge));
|
||||||
|
return edges_capacity_ == 0 ? edges_.inline_edges : edges_.edges;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -258,6 +263,11 @@
|
||||||
|
// in the first slot if it exists (ie., is not equal to kRootID), since we
|
||||||
|
// need to access that label during every single node we look at during
|
||||||
|
// traversal.
|
||||||
|
+ //
|
||||||
|
+ // NOTE: Keep this the first member in the struct, so that inline_edges gets
|
||||||
|
+ // 4-aligned (since the class is marked as such, despite being packed.
|
||||||
|
+ // Otherwise, edges() can return an unaligned pointer marked as aligned
|
||||||
|
+ // (the unalignedness gets lost).
|
||||||
|
static constexpr int kNumInlineEdges = 2;
|
||||||
|
union {
|
||||||
|
// Out-of-line edge storage, having room for edges_capacity_ elements.
|
||||||
@ -0,0 +1,231 @@
|
|||||||
|
From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Sun, 16 Jan 2022 19:15:26 +0000
|
||||||
|
Subject: [PATCH] sql: make VirtualCursor standard layout type
|
||||||
|
|
||||||
|
sql::recover::VirtualCursor needs to be a standard layout type, but
|
||||||
|
has members of type std::unique_ptr. However, std::unique_ptr is not
|
||||||
|
guaranteed to be standard layout. Compiling with clang combined with
|
||||||
|
gcc-11 libstdc++ fails because of this.
|
||||||
|
|
||||||
|
Bug: 1189788
|
||||||
|
Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
|
||||||
|
index cc9420e5..f12d8fa 100644
|
||||||
|
--- a/sql/recover_module/btree.cc
|
||||||
|
+++ b/sql/recover_module/btree.cc
|
||||||
|
@@ -136,16 +136,22 @@
|
||||||
|
"Move the destructor to the .cc file if it's non-trival");
|
||||||
|
#endif // !DCHECK_IS_ON()
|
||||||
|
|
||||||
|
-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
|
||||||
|
- : page_id_(db_reader->page_id()),
|
||||||
|
- db_reader_(db_reader),
|
||||||
|
- cell_count_(ComputeCellCount(db_reader)),
|
||||||
|
- next_read_index_(0),
|
||||||
|
- last_record_size_(0) {
|
||||||
|
+LeafPageDecoder::LeafPageDecoder() noexcept = default;
|
||||||
|
+
|
||||||
|
+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
|
||||||
|
+ page_id_ = db_reader->page_id();
|
||||||
|
+ db_reader_ = db_reader;
|
||||||
|
+ cell_count_ = ComputeCellCount(db_reader);
|
||||||
|
+ next_read_index_ = 0;
|
||||||
|
+ last_record_size_ = 0;
|
||||||
|
DCHECK(IsOnValidPage(db_reader));
|
||||||
|
DCHECK(DatabasePageReader::IsValidPageId(page_id_));
|
||||||
|
}
|
||||||
|
|
||||||
|
+void LeafPageDecoder::Reset() {
|
||||||
|
+ db_reader_ = nullptr;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
bool LeafPageDecoder::TryAdvance() {
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
DCHECK(CanAdvance());
|
||||||
|
diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
|
||||||
|
index eaa087a5..df0e0c9 100644
|
||||||
|
--- a/sql/recover_module/btree.h
|
||||||
|
+++ b/sql/recover_module/btree.h
|
||||||
|
@@ -101,9 +101,7 @@
|
||||||
|
public:
|
||||||
|
// Creates a decoder for a DatabasePageReader's last read page.
|
||||||
|
//
|
||||||
|
- // |db_reader| must have been used to read an inner page of a table B-tree.
|
||||||
|
- // |db_reader| must outlive this instance.
|
||||||
|
- explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
|
||||||
|
+ LeafPageDecoder() noexcept;
|
||||||
|
~LeafPageDecoder() noexcept = default;
|
||||||
|
|
||||||
|
LeafPageDecoder(const LeafPageDecoder&) = delete;
|
||||||
|
@@ -151,6 +149,17 @@
|
||||||
|
// read as long as CanAdvance() returns true.
|
||||||
|
bool TryAdvance();
|
||||||
|
|
||||||
|
+ // Initialize with DatabasePageReader
|
||||||
|
+ // |db_reader| must have been used to read an inner page of a table B-tree.
|
||||||
|
+ // |db_reader| must outlive this instance.
|
||||||
|
+ void Initialize(DatabasePageReader* db_reader);
|
||||||
|
+
|
||||||
|
+ // Reset internal DatabasePageReader
|
||||||
|
+ void Reset();
|
||||||
|
+
|
||||||
|
+ // True if DatabasePageReader is valid
|
||||||
|
+ bool IsValid() { return (db_reader_ != nullptr); }
|
||||||
|
+
|
||||||
|
// 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.
|
||||||
|
@@ -164,14 +173,14 @@
|
||||||
|
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.
|
||||||
|
- DatabasePageReader* const db_reader_;
|
||||||
|
+ 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 4f827ed..240de499 100644
|
||||||
|
--- a/sql/recover_module/cursor.cc
|
||||||
|
+++ b/sql/recover_module/cursor.cc
|
||||||
|
@@ -28,7 +28,7 @@
|
||||||
|
int VirtualCursor::First() {
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
inner_decoders_.clear();
|
||||||
|
- leaf_decoder_ = nullptr;
|
||||||
|
+ leaf_decoder_.Reset();
|
||||||
|
|
||||||
|
AppendPageDecoder(table_->root_page_id());
|
||||||
|
return Next();
|
||||||
|
@@ -38,18 +38,18 @@
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
record_reader_.Reset();
|
||||||
|
|
||||||
|
- while (!inner_decoders_.empty() || leaf_decoder_.get()) {
|
||||||
|
- if (leaf_decoder_.get()) {
|
||||||
|
- if (!leaf_decoder_->CanAdvance()) {
|
||||||
|
+ while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
|
||||||
|
+ if (leaf_decoder_.IsValid()) {
|
||||||
|
+ if (!leaf_decoder_.CanAdvance()) {
|
||||||
|
// The leaf has been exhausted. Remove it from the DFS stack.
|
||||||
|
- leaf_decoder_ = nullptr;
|
||||||
|
+ leaf_decoder_.Reset();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
- if (!leaf_decoder_->TryAdvance())
|
||||||
|
+ if (!leaf_decoder_.TryAdvance())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
- if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
|
||||||
|
- leaf_decoder_->last_record_offset())) {
|
||||||
|
+ if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
|
||||||
|
+ leaf_decoder_.last_record_offset())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!record_reader_.Initialize())
|
||||||
|
@@ -101,13 +101,13 @@
|
||||||
|
int64_t VirtualCursor::RowId() {
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
DCHECK(record_reader_.IsInitialized());
|
||||||
|
- DCHECK(leaf_decoder_.get());
|
||||||
|
- return leaf_decoder_->last_record_rowid();
|
||||||
|
+ DCHECK(leaf_decoder_.IsValid());
|
||||||
|
+ return leaf_decoder_.last_record_rowid();
|
||||||
|
}
|
||||||
|
|
||||||
|
void VirtualCursor::AppendPageDecoder(int page_id) {
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
- DCHECK(leaf_decoder_.get() == nullptr)
|
||||||
|
+ DCHECK(!leaf_decoder_.IsValid())
|
||||||
|
<< __func__
|
||||||
|
<< " must only be called when the current path has no leaf decoder";
|
||||||
|
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
|
||||||
|
- leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
|
||||||
|
+ leaf_decoder_.Initialize(&db_reader_);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
|
||||||
|
index 845b785..cc4e85f8 100644
|
||||||
|
--- a/sql/recover_module/cursor.h
|
||||||
|
+++ b/sql/recover_module/cursor.h
|
||||||
|
@@ -130,7 +130,7 @@
|
||||||
|
std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
|
||||||
|
|
||||||
|
// Decodes the leaf page containing records.
|
||||||
|
- std::unique_ptr<LeafPageDecoder> leaf_decoder_;
|
||||||
|
+ LeafPageDecoder leaf_decoder_;
|
||||||
|
|
||||||
|
SEQUENCE_CHECKER(sequence_checker_);
|
||||||
|
};
|
||||||
|
diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
|
||||||
|
index 58e75de..69d98cef 100644
|
||||||
|
--- a/sql/recover_module/pager.cc
|
||||||
|
+++ b/sql/recover_module/pager.cc
|
||||||
|
@@ -23,8 +23,7 @@
|
||||||
|
"ints are not appropriate for representing page IDs");
|
||||||
|
|
||||||
|
DatabasePageReader::DatabasePageReader(VirtualTable* table)
|
||||||
|
- : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
|
||||||
|
- table_(table) {
|
||||||
|
+ : page_data_(table->page_size()), table_(table) {
|
||||||
|
DCHECK(table != nullptr);
|
||||||
|
DCHECK(IsValidPageSize(table->page_size()));
|
||||||
|
}
|
||||||
|
@@ -58,7 +57,7 @@
|
||||||
|
"The |read_offset| computation above may overflow");
|
||||||
|
|
||||||
|
int sqlite_status =
|
||||||
|
- RawRead(sqlite_file, read_size, read_offset, page_data_.get());
|
||||||
|
+ RawRead(sqlite_file, read_size, read_offset, page_data_.data());
|
||||||
|
|
||||||
|
// |page_id_| needs to be set to kInvalidPageId if the read failed.
|
||||||
|
// Otherwise, future ReadPage() calls with the previous |page_id_| value
|
||||||
|
diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
|
||||||
|
index 07cac3cb..d08f093 100644
|
||||||
|
--- a/sql/recover_module/pager.h
|
||||||
|
+++ b/sql/recover_module/pager.h
|
||||||
|
@@ -6,8 +6,8 @@
|
||||||
|
#define SQL_RECOVER_MODULE_PAGER_H_
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
-#include <memory>
|
||||||
|
#include <ostream>
|
||||||
|
+#include <vector>
|
||||||
|
|
||||||
|
#include "base/check_op.h"
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
|
@@ -72,7 +72,7 @@
|
||||||
|
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||||
|
DCHECK_NE(page_id_, kInvalidPageId)
|
||||||
|
<< "Successful ReadPage() required before accessing pager state";
|
||||||
|
- return page_data_.get();
|
||||||
|
+ return page_data_.data();
|
||||||
|
}
|
||||||
|
|
||||||
|
// The number of bytes in the page read by the last ReadPage() call.
|
||||||
|
@@ -139,7 +139,7 @@
|
||||||
|
int page_id_ = kInvalidPageId;
|
||||||
|
// Stores the bytes of the last page successfully read by ReadPage().
|
||||||
|
// The content is undefined if the last call to ReadPage() did not succeed.
|
||||||
|
- const std::unique_ptr<uint8_t[]> page_data_;
|
||||||
|
+ std::vector<uint8_t> page_data_;
|
||||||
|
// Raw pointer usage is acceptable because this instance's owner is expected
|
||||||
|
// to ensure that the VirtualTable outlives this.
|
||||||
|
const raw_ptr<VirtualTable> table_;
|
||||||
@ -0,0 +1,219 @@
|
|||||||
|
diff -up chromium-103.0.5060.53/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification chromium-103.0.5060.53/remoting/host/mojom/remoting_mojom_traits.h
|
||||||
|
--- chromium-103.0.5060.53/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification 2022-06-27 22:16:20.214876025 +0000
|
||||||
|
+++ chromium-103.0.5060.53/remoting/host/mojom/remoting_mojom_traits.h 2022-06-28 12:44:09.663890774 +0000
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
namespace mojo {
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::BoolDataView, bool> {
|
||||||
|
+class StructTraits<remoting::mojom::BoolDataView, bool> {
|
||||||
|
public:
|
||||||
|
static bool value(bool value) { return value; }
|
||||||
|
|
||||||
|
@@ -48,7 +48,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::FloatDataView, float> {
|
||||||
|
+class StructTraits<remoting::mojom::FloatDataView, float> {
|
||||||
|
public:
|
||||||
|
static float value(float value) { return value; }
|
||||||
|
|
||||||
|
@@ -59,7 +59,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::Int32DataView, int32_t> {
|
||||||
|
+class StructTraits<remoting::mojom::Int32DataView, int32_t> {
|
||||||
|
public:
|
||||||
|
static int32_t value(int32_t value) { return value; }
|
||||||
|
|
||||||
|
@@ -71,7 +71,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::UInt32DataView, uint32_t> {
|
||||||
|
+class StructTraits<remoting::mojom::UInt32DataView, uint32_t> {
|
||||||
|
public:
|
||||||
|
static uint32_t value(uint32_t value) { return value; }
|
||||||
|
|
||||||
|
@@ -83,7 +83,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::DesktopCaptureOptionsDataView,
|
||||||
|
+class StructTraits<remoting::mojom::DesktopCaptureOptionsDataView,
|
||||||
|
::webrtc::DesktopCaptureOptions> {
|
||||||
|
public:
|
||||||
|
static bool use_update_notifications(
|
||||||
|
@@ -108,7 +108,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::DesktopEnvironmentOptionsDataView,
|
||||||
|
+class StructTraits<remoting::mojom::DesktopEnvironmentOptionsDataView,
|
||||||
|
::remoting::DesktopEnvironmentOptions> {
|
||||||
|
public:
|
||||||
|
static bool enable_curtaining(
|
||||||
|
@@ -205,7 +205,7 @@ struct EnumTraits<remoting::mojom::Deskt
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::DesktopRectDataView,
|
||||||
|
+class StructTraits<remoting::mojom::DesktopRectDataView,
|
||||||
|
::webrtc::DesktopRect> {
|
||||||
|
public:
|
||||||
|
static int32_t left(const ::webrtc::DesktopRect& rect) { return rect.left(); }
|
||||||
|
@@ -225,7 +225,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::DesktopSizeDataView,
|
||||||
|
+class StructTraits<remoting::mojom::DesktopSizeDataView,
|
||||||
|
::webrtc::DesktopSize> {
|
||||||
|
public:
|
||||||
|
static int32_t width(const ::webrtc::DesktopSize& size) {
|
||||||
|
@@ -241,7 +241,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::DesktopVectorDataView,
|
||||||
|
+class StructTraits<remoting::mojom::DesktopVectorDataView,
|
||||||
|
::webrtc::DesktopVector> {
|
||||||
|
public:
|
||||||
|
static int32_t x(const ::webrtc::DesktopVector& vector) { return vector.x(); }
|
||||||
|
@@ -253,7 +253,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::MouseCursorDataView,
|
||||||
|
+class StructTraits<remoting::mojom::MouseCursorDataView,
|
||||||
|
::webrtc::MouseCursor> {
|
||||||
|
public:
|
||||||
|
static const webrtc::DesktopSize& image_size(
|
||||||
|
@@ -506,7 +506,7 @@ struct EnumTraits<remoting::mojom::Audio
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::AudioPacketDataView,
|
||||||
|
+class StructTraits<remoting::mojom::AudioPacketDataView,
|
||||||
|
::std::unique_ptr<::remoting::AudioPacket>> {
|
||||||
|
public:
|
||||||
|
static int32_t timestamp(
|
||||||
|
@@ -544,7 +544,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::ClipboardEventDataView,
|
||||||
|
+class StructTraits<remoting::mojom::ClipboardEventDataView,
|
||||||
|
::remoting::protocol::ClipboardEvent> {
|
||||||
|
public:
|
||||||
|
static const std::string& mime_type(
|
||||||
|
@@ -562,7 +562,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::KeyboardLayoutDataView,
|
||||||
|
+class StructTraits<remoting::mojom::KeyboardLayoutDataView,
|
||||||
|
::remoting::protocol::KeyboardLayout> {
|
||||||
|
public:
|
||||||
|
static const ::google::protobuf::
|
||||||
|
@@ -576,7 +576,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::UnionTraits<remoting::mojom::KeyActionDataView,
|
||||||
|
+class UnionTraits<remoting::mojom::KeyActionDataView,
|
||||||
|
::remoting::protocol::KeyboardLayout_KeyAction> {
|
||||||
|
public:
|
||||||
|
static remoting::mojom::KeyActionDataView::Tag GetTag(
|
||||||
|
@@ -609,7 +609,7 @@ class mojo::UnionTraits<remoting::mojom:
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::KeyBehaviorDataView,
|
||||||
|
+class StructTraits<remoting::mojom::KeyBehaviorDataView,
|
||||||
|
::remoting::protocol::KeyboardLayout_KeyBehavior> {
|
||||||
|
public:
|
||||||
|
static const ::google::protobuf::Map<
|
||||||
|
@@ -967,7 +967,7 @@ struct EnumTraits<remoting::mojom::Layou
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::KeyEventDataView,
|
||||||
|
+class StructTraits<remoting::mojom::KeyEventDataView,
|
||||||
|
::remoting::protocol::KeyEvent> {
|
||||||
|
public:
|
||||||
|
static bool pressed(const ::remoting::protocol::KeyEvent& event) {
|
||||||
|
@@ -1003,7 +1003,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::MouseEventDataView,
|
||||||
|
+class StructTraits<remoting::mojom::MouseEventDataView,
|
||||||
|
::remoting::protocol::MouseEvent> {
|
||||||
|
public:
|
||||||
|
static absl::optional<int32_t> x(
|
||||||
|
@@ -1092,7 +1092,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::ScreenResolutionDataView,
|
||||||
|
+class StructTraits<remoting::mojom::ScreenResolutionDataView,
|
||||||
|
::remoting::ScreenResolution> {
|
||||||
|
public:
|
||||||
|
static const ::webrtc::DesktopSize& dimensions(
|
||||||
|
@@ -1110,7 +1110,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::TextEventDataView,
|
||||||
|
+class StructTraits<remoting::mojom::TextEventDataView,
|
||||||
|
::remoting::protocol::TextEvent> {
|
||||||
|
public:
|
||||||
|
static const std::string& text(const ::remoting::protocol::TextEvent& event) {
|
||||||
|
@@ -1122,7 +1122,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::TouchEventPointDataView,
|
||||||
|
+class StructTraits<remoting::mojom::TouchEventPointDataView,
|
||||||
|
::remoting::protocol::TouchEventPoint> {
|
||||||
|
public:
|
||||||
|
static uint32_t id(const ::remoting::protocol::TouchEventPoint& event) {
|
||||||
|
@@ -1199,7 +1199,7 @@ struct EnumTraits<remoting::mojom::Touch
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::TouchEventDataView,
|
||||||
|
+class StructTraits<remoting::mojom::TouchEventDataView,
|
||||||
|
::remoting::protocol::TouchEvent> {
|
||||||
|
public:
|
||||||
|
static ::remoting::protocol::TouchEvent::TouchEventType event_type(
|
||||||
|
@@ -1259,7 +1259,7 @@ struct EnumTraits<remoting::mojom::Trans
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::TransportRouteDataView,
|
||||||
|
+class StructTraits<remoting::mojom::TransportRouteDataView,
|
||||||
|
::remoting::protocol::TransportRoute> {
|
||||||
|
public:
|
||||||
|
static ::remoting::protocol::TransportRoute::RouteType type(
|
||||||
|
@@ -1406,7 +1406,7 @@ struct EnumTraits<remoting::mojom::Proto
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::VideoLayoutDataView,
|
||||||
|
+class StructTraits<remoting::mojom::VideoLayoutDataView,
|
||||||
|
::remoting::protocol::VideoLayout> {
|
||||||
|
public:
|
||||||
|
static const ::google::protobuf::RepeatedPtrField<
|
||||||
|
@@ -1425,7 +1425,7 @@ class mojo::StructTraits<remoting::mojom
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
-class mojo::StructTraits<remoting::mojom::VideoTrackLayoutDataView,
|
||||||
|
+class StructTraits<remoting::mojom::VideoTrackLayoutDataView,
|
||||||
|
::remoting::protocol::VideoTrackLayout> {
|
||||||
|
public:
|
||||||
|
static int64_t screen_id(
|
||||||
Loading…
Reference in new issue