| Index: src/bootstrapper.h
|
| diff --git a/src/bootstrapper.h b/src/bootstrapper.h
|
| index e683a45f048c6a32349fb66e1c26f4fc4333f539..6dea116a58245f182c8fb4af4b66530728c0a02b 100644
|
| --- a/src/bootstrapper.h
|
| +++ b/src/bootstrapper.h
|
| @@ -1,46 +1,21 @@
|
| -// Copyright 2006-2008 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.
|
| -
|
| +// 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.
|
|
|
| #ifndef V8_BOOTSTRAPPER_H_
|
| #define V8_BOOTSTRAPPER_H_
|
|
|
| -#include "allocation.h"
|
| +#include "factory.h"
|
|
|
| namespace v8 {
|
| namespace internal {
|
|
|
| -
|
| // A SourceCodeCache uses a FixedArray to store pairs of
|
| // (AsciiString*, JSFunction*), mapping names of native code files
|
| // (runtime.js, etc.) to precompiled functions. Instead of mapping
|
| // names to functions it might make sense to let the JS2C tool
|
| // generate an index for each native JS file.
|
| -class SourceCodeCache BASE_EMBEDDED {
|
| +class SourceCodeCache V8_FINAL BASE_EMBEDDED {
|
| public:
|
| explicit SourceCodeCache(Script::Type type): type_(type), cache_(NULL) { }
|
|
|
| @@ -88,7 +63,7 @@ class SourceCodeCache BASE_EMBEDDED {
|
|
|
| // The Boostrapper is the public interface for creating a JavaScript global
|
| // context.
|
| -class Bootstrapper {
|
| +class Bootstrapper V8_FINAL {
|
| public:
|
| static void InitializeOncePerProcess();
|
| static void TearDownExtensions();
|
| @@ -158,7 +133,7 @@ class Bootstrapper {
|
| };
|
|
|
|
|
| -class BootstrapperActive BASE_EMBEDDED {
|
| +class BootstrapperActive V8_FINAL BASE_EMBEDDED {
|
| public:
|
| explicit BootstrapperActive(Bootstrapper* bootstrapper)
|
| : bootstrapper_(bootstrapper) {
|
| @@ -176,20 +151,15 @@ class BootstrapperActive BASE_EMBEDDED {
|
| };
|
|
|
|
|
| -class NativesExternalStringResource
|
| +class NativesExternalStringResource V8_FINAL
|
| : public v8::String::ExternalAsciiStringResource {
|
| public:
|
| NativesExternalStringResource(Bootstrapper* bootstrapper,
|
| const char* source,
|
| size_t length);
|
| + virtual const char* data() const V8_OVERRIDE { return data_; }
|
| + virtual size_t length() const V8_OVERRIDE { return length_; }
|
|
|
| - const char* data() const {
|
| - return data_;
|
| - }
|
| -
|
| - size_t length() const {
|
| - return length_;
|
| - }
|
| private:
|
| const char* data_;
|
| size_t length_;
|
|
|