Revert "Some code cleanup, esp. includes and copyright headers."

src/zone-inl.h

-// Copyright 2014 the V8 project authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// Copyright 2012 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_ZONE_INL_H_
 #define V8_ZONE_INL_H_
 
 #include "zone.h"
 
 #ifdef V8_USE_ADDRESS_SANITIZER
   #include <sanitizer/asan_interface.h>
 #else
   #define ASAN_UNPOISON_MEMORY_REGION(start, size) ((void) 0)
 #endif
 
+#include "counters.h"
 #include "isolate.h"
 #include "utils.h"
 #include "v8-counters.h"
 
 namespace v8 {
 namespace internal {
 
 
 static const int kASanRedzoneBytes = 24;  // Must be a multiple of 8.
 
@@ skipping 63 matching lines @@
   // in the destructor.  For a zone-allocated tree, nodes will be
   // freed by the Zone.
   SplayTree<Config, ZoneAllocationPolicy>::ResetRoot();
 }
 
 
 void* ZoneObject::operator new(size_t size, Zone* zone) {
   return zone->New(static_cast<int>(size));
 }
 
-
 inline void* ZoneAllocationPolicy::New(size_t size) {
   ASSERT(zone_);
   return zone_->New(static_cast<int>(size));
 }
 
 
 template <typename T>
 void* ZoneList<T>::operator new(size_t size, Zone* zone) {
   return zone->New(static_cast<int>(size));
 }
 
 
 template <typename T>
 void* ZoneSplayTree<T>::operator new(size_t size, Zone* zone) {
   return zone->New(static_cast<int>(size));
 }
 
+
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_INL_H_