ui/base/resource: Roll our own version of ReadBigEndian() function.

base/big_endian.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_BIG_ENDIAN_H_
-#define NET_BASE_BIG_ENDIAN_H_
+#ifndef BASE_BIG_ENDIAN_H_
+#define BASE_BIG_ENDIAN_H_
 
+#include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
-#include "net/base/net_export.h"
 
-namespace net {
+namespace base {
 
 // Read an integer (signed or unsigned) from |buf| in Big Endian order.
 // Note: this loop is unrolled with -O1 and above.
 // NOTE(szym): glibc dns-canon.c and SpdyFrameBuilder use
 // ntohs(*(uint16_t*)ptr) which is potentially unaligned.
 // This would cause SIGBUS on ARMv5 or earlier and ARMv6-M.
 template<typename T>
 inline void ReadBigEndian(const char buf[], T* out) {
   *out = buf[0];
   for (size_t i = 1; i < sizeof(T); ++i) {
@@ skipping 19 matching lines @@
   *out = buf[0];
 }
 
 template<>
 inline void WriteBigEndian<uint8>(char buf[], uint8 val) {
   buf[0] = static_cast<char>(val);
 }
 
 // Allows reading integers in network order (big endian) while iterating over
 // an underlying buffer. All the reading functions advance the internal pointer.
-class NET_EXPORT BigEndianReader {
+class BASE_EXPORT BigEndianReader {
  public:
   BigEndianReader(const void* buf, size_t len);

[Mark Mentovai, 2014/02/18 17:14:30]

I would be more comfortable if buf were typed (const char*?). Same on line 80
(char*?). This might put a casting onus on callers—how many callers would need
to be changed if the interface changed to char*?

(Reading through some of the rest of this change, I see that some users of
BigEndianReader/Writer already cast to char*.)

[tfarina, 2014/02/23 03:45:01]

Done.

 
   const char* ptr() const { return ptr_; }
   int remaining() const { return end_ - ptr_; }
 
   bool Skip(size_t len);
   bool ReadBytes(void* out, size_t len);
   // Creates a StringPiece in |out| that points to the underlying buffer.
   bool ReadPiece(base::StringPiece* out, size_t len);
   bool ReadU8(uint8* value);
   bool ReadU16(uint16* value);
   bool ReadU32(uint32* value);
 
  private:
   // Hidden to promote type safety.
   template<typename T>
   bool Read(T* v);
 
   const char* ptr_;
   const char* end_;
 };
 
 // Allows writing integers in network order (big endian) while iterating over
 // an underlying buffer. All the writing functions advance the internal pointer.
-class NET_EXPORT BigEndianWriter {
+class BASE_EXPORT BigEndianWriter {
  public:
   BigEndianWriter(void* buf, size_t len);
 
   char* ptr() const { return ptr_; }
   int remaining() const { return end_ - ptr_; }
 
   bool Skip(size_t len);
   bool WriteBytes(const void* buf, size_t len);
   bool WriteU8(uint8 value);
   bool WriteU16(uint16 value);
   bool WriteU32(uint32 value);
 
  private:
   // Hidden to promote type safety.
   template<typename T>
   bool Write(T v);
 
   char* ptr_;
   char* end_;
 };
 
-}  // namespace net
+}  // namespace base
 
-#endif  // NET_BASE_BIG_ENDIAN_H_
-
+#endif  // BASE_BIG_ENDIAN_H_