| Index: src/factory.h
|
| diff --git a/src/factory.h b/src/factory.h
|
| index 00f20ff8ba4c4a3435f136abbca2aee8a07930f8..da58a71bc111d80a127d6a010458806ba3f76bab 100644
|
| --- a/src/factory.h
|
| +++ b/src/factory.h
|
| @@ -1,43 +1,18 @@
|
| -// 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.
|
| +// 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_FACTORY_H_
|
| #define V8_FACTORY_H_
|
|
|
| -#include "globals.h"
|
| -#include "handles.h"
|
| -#include "heap.h"
|
| +#include "isolate.h"
|
|
|
| namespace v8 {
|
| namespace internal {
|
|
|
| // Interface for handle based allocation.
|
|
|
| -class Factory {
|
| +class Factory V8_FINAL {
|
| public:
|
| // Allocate a new boxed value.
|
| Handle<Box> NewBox(
|
| @@ -312,8 +287,14 @@ class Factory {
|
| PretenureFlag pretenure = NOT_TENURED);
|
| Handle<Object> NewNumberFromUint(uint32_t value,
|
| PretenureFlag pretenure = NOT_TENURED);
|
| - inline Handle<Object> NewNumberFromSize(size_t value,
|
| - PretenureFlag pretenure = NOT_TENURED);
|
| + Handle<Object> NewNumberFromSize(size_t value,
|
| + PretenureFlag pretenure = NOT_TENURED) {
|
| + if (Smi::IsValid(static_cast<intptr_t>(value))) {
|
| + return Handle<Object>(Smi::FromIntptr(static_cast<intptr_t>(value)),
|
| + isolate());
|
| + }
|
| + return NewNumber(static_cast<double>(value), pretenure);
|
| + }
|
| Handle<HeapNumber> NewHeapNumber(double value,
|
| PretenureFlag pretenure = NOT_TENURED);
|
|
|
| @@ -619,18 +600,6 @@ class Factory {
|
| Handle<Map> map);
|
| };
|
|
|
| -
|
| -Handle<Object> Factory::NewNumberFromSize(size_t value,
|
| - PretenureFlag pretenure) {
|
| - if (Smi::IsValid(static_cast<intptr_t>(value))) {
|
| - return Handle<Object>(Smi::FromIntptr(static_cast<intptr_t>(value)),
|
| - isolate());
|
| - } else {
|
| - return NewNumber(static_cast<double>(value), pretenure);
|
| - }
|
| -}
|
| -
|
| -
|
| } } // namespace v8::internal
|
|
|
| #endif // V8_FACTORY_H_
|
|
|