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

ui/base/resource/resource_bundle.cc

 // Copyright (c) 2012 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.
 
 #include "ui/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 #include "grit/app_locale_settings.h"
-#include "net/base/big_endian.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 723 matching lines @@
   }
   return empty_image_;
 }
 
 // static
 bool ResourceBundle::ShouldHighlightMissingScaledResources() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kHighlightMissingScaledResources);
 }
 
+uint32_t ReadBigEndian32(const void* ptr) {

[tfarina, 2014/02/12 02:08:22]

Where I should put this function?

[tfarina, 2014/02/12 02:08:22]

I copied this function from ppapi/tests/test_truetype_font.cc

[tfarina, 2014/02/12 02:08:22]

There is another one in content/browser/speech/chunked_byte_buffer.cc and one in
sql/test/test_helpers.cc

[tony, 2014/02/12 02:23:02]

Probably somewhere in base since it's used in so many places.  I would ask one
of the base OWNERS if they think that is appropriate.  Maybe in base/numerics,
although that seems to be more for security sensitive code?

+  const uint8_t* data = reinterpret_cast<const uint8_t*>(ptr);
+  return (data[3] << 0) | (data[2] << 8) | (data[1] << 16) | (data[0] << 24);
+}
+
 // static
 bool ResourceBundle::PNGContainsFallbackMarker(const unsigned char* buf,
-                               size_t size) {
+                                               size_t size) {
   if (size < arraysize(kPngMagic) ||
       memcmp(buf, kPngMagic, arraysize(kPngMagic)) != 0) {
     // Data invalid or a JPEG.
     return false;
   }
   size_t pos = arraysize(kPngMagic);
 
   // Scan for custom chunks until we find one, find the IDAT chunk, or run out
   // of chunks.
   for (;;) {
     if (size - pos < kPngChunkMetadataSize)
       break;
-    uint32 length = 0;
-    net::ReadBigEndian(reinterpret_cast<const char*>(buf + pos), &length);
+    uint32 length = ReadBigEndian32(buf + pos);
     if (size - pos - kPngChunkMetadataSize < length)
       break;
     if (length == 0 && memcmp(buf + pos + sizeof(uint32), kPngScaleChunkType,
                               arraysize(kPngScaleChunkType)) == 0) {
       return true;
     }
     if (memcmp(buf + pos + sizeof(uint32), kPngDataChunkType,
                arraysize(kPngDataChunkType)) == 0) {
       // Stop looking for custom chunks, any custom chunks should be before an
       // IDAT chunk.
       break;
     }
     pos += length + kPngChunkMetadataSize;
   }
   return false;
 }
 
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui