diff options
Diffstat (limited to 'chromium/net/tools/huffman_trie')
13 files changed, 32 insertions, 84 deletions
diff --git a/chromium/net/tools/huffman_trie/bit_writer.cc b/chromium/net/tools/huffman_trie/bit_writer.cc index 74f5e5ecfb8..077024862a9 100644 --- a/chromium/net/tools/huffman_trie/bit_writer.cc +++ b/chromium/net/tools/huffman_trie/bit_writer.cc @@ -6,9 +6,7 @@ #include "base/check.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { BitWriter::BitWriter() = default; @@ -40,6 +38,4 @@ void BitWriter::Flush() { current_byte_ = 0; } -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/bit_writer.h b/chromium/net/tools/huffman_trie/bit_writer.h index eae701c7f10..e91b487c1b0 100644 --- a/chromium/net/tools/huffman_trie/bit_writer.h +++ b/chromium/net/tools/huffman_trie/bit_writer.h @@ -9,9 +9,7 @@ #include <vector> -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { // BitWriter acts as a buffer to which bits can be written. The bits are stored // as bytes in a vector. BitWriter will buffer bits until it contains 8 bits at @@ -55,8 +53,6 @@ class BitWriter { std::vector<uint8_t> bytes_; }; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie #endif // NET_TOOLS_HUFFMAN_TRIE_BIT_WRITER_H_ diff --git a/chromium/net/tools/huffman_trie/bit_writer_unittest.cc b/chromium/net/tools/huffman_trie/bit_writer_unittest.cc index 3301174cb0d..deb373167df 100644 --- a/chromium/net/tools/huffman_trie/bit_writer_unittest.cc +++ b/chromium/net/tools/huffman_trie/bit_writer_unittest.cc @@ -6,9 +6,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { @@ -112,6 +110,4 @@ TEST(BitWriterTest, WriteBoth) { } // namespace -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc b/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc index 8551d8effe9..cc7945a1180 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder.cc @@ -9,9 +9,7 @@ #include "base/check.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { @@ -149,8 +147,8 @@ std::unique_ptr<HuffmanNode> HuffmanBuilder::BuildTree() { uint32_t count_a = a->count(); uint32_t count_b = b->count(); - std::unique_ptr<HuffmanNode> parent( - new HuffmanNode(0, count_a + count_b, std::move(a), std::move(b))); + auto parent = std::make_unique<HuffmanNode>(0, count_a + count_b, + std::move(a), std::move(b)); nodes.erase(nodes.begin()); nodes[0] = std::move(parent); @@ -161,6 +159,4 @@ std::unique_ptr<HuffmanNode> HuffmanBuilder::BuildTree() { return std::move(nodes[0]); } -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder.h b/chromium/net/tools/huffman_trie/huffman/huffman_builder.h index b185e8b287c..3126650db6f 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder.h +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder.h @@ -11,9 +11,7 @@ #include <memory> #include <vector> -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { class HuffmanNode; @@ -78,8 +76,6 @@ class HuffmanBuilder { std::map<uint8_t, uint32_t> counts_; }; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie #endif // NET_TOOLS_HUFFMAN_TRIE_HUFFMAN_HUFFMAN_BUILDER_H_ diff --git a/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc b/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc index c68a85a8ddc..249065d218f 100644 --- a/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc +++ b/chromium/net/tools/huffman_trie/huffman/huffman_builder_unittest.cc @@ -6,9 +6,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { @@ -153,6 +151,4 @@ TEST(HuffmanBuilderTest, ToVectorSingle) { } // namespace -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc index 33b2aad37b8..920f5b616e9 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.cc @@ -10,9 +10,7 @@ #include "base/check.h" #include "net/tools/huffman_trie/bit_writer.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { TrieBitBuffer::TrieBitBuffer() = default; @@ -146,6 +144,4 @@ void TrieBitBuffer::Flush() { } } -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h index 51ad4b7777c..02cd1e3f38e 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer.h @@ -11,9 +11,7 @@ #include "net/tools/huffman_trie/huffman/huffman_builder.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { class BitWriter; @@ -83,8 +81,6 @@ class TrieBitBuffer { std::vector<BitsOrPosition> elements_; }; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie #endif // NET_TOOLS_HUFFMAN_TRIE_TRIE_TRIE_BIT_BUFFER_H_ diff --git a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc index 73929ad07b6..19289a1a1c7 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_bit_buffer_unittest.cc @@ -8,9 +8,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { @@ -221,6 +219,4 @@ TEST(TrieBitBufferTest, WriteMix) { } // namespace -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/trie/trie_writer.cc b/chromium/net/tools/huffman_trie/trie/trie_writer.cc index 6c4ff8b0092..61217051791 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_writer.cc +++ b/chromium/net/tools/huffman_trie/trie/trie_writer.cc @@ -10,9 +10,7 @@ #include "base/check.h" #include "net/tools/huffman_trie/trie/trie_bit_buffer.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { namespace { @@ -107,8 +105,8 @@ bool TrieWriter::WriteEntries(const TrieEntries& entries, ReversedEntries reversed_entries; for (auto* const entry : entries) { - std::unique_ptr<ReversedEntry> reversed_entry( - new ReversedEntry(ReverseName(entry->name()), entry)); + auto reversed_entry = + std::make_unique<ReversedEntry>(ReverseName(entry->name()), entry); reversed_entries.push_back(std::move(reversed_entry)); } @@ -130,8 +128,8 @@ bool TrieWriter::WriteDispatchTables(ReversedEntries::iterator start, writer.WriteSize(prefix.size()); if (prefix.size()) { - for (size_t i = 0; i < prefix.size(); ++i) { - writer.WriteChar(prefix.at(i), huffman_table_, huffman_builder_); + for (uint8_t c : prefix) { + writer.WriteChar(c, huffman_table_, huffman_builder_); } } @@ -186,6 +184,4 @@ void TrieWriter::Flush() { buffer_.Flush(); } -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/trie/trie_writer.h b/chromium/net/tools/huffman_trie/trie/trie_writer.h index 9fdc1ee362f..51863ca22de 100644 --- a/chromium/net/tools/huffman_trie/trie/trie_writer.h +++ b/chromium/net/tools/huffman_trie/trie/trie_writer.h @@ -11,9 +11,7 @@ #include "net/tools/huffman_trie/huffman/huffman_builder.h" #include "net/tools/huffman_trie/trie_entry.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { enum : uint8_t { kTerminalValue = 0, kEndOfTableValue = 127 }; @@ -56,8 +54,6 @@ class TrieWriter { HuffmanBuilder* huffman_builder_; }; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie #endif // NET_TOOLS_HUFFMAN_TRIE_TRIE_TRIE_WRITER_H_ diff --git a/chromium/net/tools/huffman_trie/trie_entry.cc b/chromium/net/tools/huffman_trie/trie_entry.cc index 81c8da69476..a2dc0e62972 100644 --- a/chromium/net/tools/huffman_trie/trie_entry.cc +++ b/chromium/net/tools/huffman_trie/trie_entry.cc @@ -4,14 +4,10 @@ #include "net/tools/huffman_trie/trie_entry.h" -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { TrieEntry::TrieEntry() = default; TrieEntry::~TrieEntry() = default; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie diff --git a/chromium/net/tools/huffman_trie/trie_entry.h b/chromium/net/tools/huffman_trie/trie_entry.h index fe70260f981..9cf03587014 100644 --- a/chromium/net/tools/huffman_trie/trie_entry.h +++ b/chromium/net/tools/huffman_trie/trie_entry.h @@ -9,9 +9,7 @@ #include <string> #include <vector> -namespace net { - -namespace huffman_trie { +namespace net::huffman_trie { class TrieBitBuffer; @@ -42,8 +40,6 @@ struct ReversedEntry { using ReversedEntries = std::vector<std::unique_ptr<ReversedEntry>>; -} // namespace huffman_trie - -} // namespace net +} // namespace net::huffman_trie #endif // NET_TOOLS_HUFFMAN_TRIE_TRIE_ENTRY_H_ |