More net/ header/implementation method reordering.

net/disk_cache/bitmap.h

 // Copyright (c) 2009 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_DISK_CACHE_BITMAP_H_
 #define NET_DISK_CACHE_BITMAP_H_
 #pragma once
 
-#include <algorithm>
-
 #include "base/basictypes.h"
 
 namespace disk_cache {
 
 // This class provides support for simple maps of bits.
 class Bitmap {
  public:
   Bitmap() : map_(NULL), num_bits_(0), array_size_(0), alloc_(false) {}

[willchan no longer on Chromium, 2011/01/21 23:07:33]

I'm a bit surprised you didn't define this out of line too. I guess it's small.

[Elliot Glaysher, 2011/01/21 23:11:15]

Yeah; the other ctors called multiple methods and required <algorithm> in the
header. This one is comparably small and just does four integral assignments.

 
   // This constructor will allocate on a uint32 boundary. If |clear_bits| is
   // false, the bitmap bits will not be initialized.
-  Bitmap(int num_bits, bool clear_bits)
-     : num_bits_(num_bits), array_size_(RequiredArraySize(num_bits)),
-       alloc_(true) {
-    map_ = new uint32[array_size_];
-
-    // Initialize all of the bits.
-    if (clear_bits)
-      Clear();
-  }
+  Bitmap(int num_bits, bool clear_bits);
 
   // Constructs a Bitmap with the actual storage provided by the caller. |map|
   // has to be valid until this object destruction. |num_bits| is the number of
   // bits in the bitmap, and |num_words| is the size of |map| in 32-bit words.
-  Bitmap(uint32* map, int num_bits, int num_words)
-     : map_(map), num_bits_(num_bits),
-       // If size is larger than necessary, trim because array_size_ is used
-       // as a bound by various methods.
-       array_size_(std::min(RequiredArraySize(num_bits), num_words)),
-       alloc_(false) {}
+  Bitmap(uint32* map, int num_bits, int num_words);
 
-  ~Bitmap() {
-    if (alloc_)
-      delete[] map_;
-  }
+  ~Bitmap();
 
   // Resizes the bitmap.
   // If |num_bits| < Size(), the extra bits will be discarded.
   // If |num_bits| > Size(), the extra bits will be filled with zeros if
   // |clear_bits| is true.
   // This object cannot be using memory provided during construction.
   void Resize(int num_bits, bool clear_bits);
 
   // Returns the number of bits in the bitmap.
   int Size() const { return num_bits_; }
@@ skipping 89 matching lines @@
   int num_bits_;          // The upper bound of the bitmap.
   int array_size_;        // The physical size (in uint32s) of the bitmap.
   bool alloc_;            // Whether or not we allocated the memory.
 
   DISALLOW_COPY_AND_ASSIGN(Bitmap);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_BITMAP_H_