| Index: Source/bindings/tests/results/V8TestInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestInterface.cpp b/Source/bindings/tests/results/V8TestInterface.cpp
|
| index 41743a2be145fd872868d4a30c015c8d311a4706..722c16b0b49f7ea6720d423da3e68918290b3ef2 100644
|
| --- a/Source/bindings/tests/results/V8TestInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterface.cpp
|
| @@ -1,34 +1,8 @@
|
| -/*
|
| - * Copyright (C) 2013 Google Inc. 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.
|
| - */
|
| -
|
| -// This file has been auto-generated by code_generator_v8.pm. DO NOT MODIFY!
|
| +// Copyright 2014 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.
|
| +
|
| +// This file has been auto-generated by code_generator_v8.py. DO NOT MODIFY!
|
|
|
| #include "config.h"
|
| #if ENABLE(Condition1) || ENABLE(Condition2)
|
| @@ -66,10 +40,6 @@ static void initializeScriptWrappableForInterface(TestInterface* object)
|
|
|
| } // namespace WebCore
|
|
|
| -// In ScriptWrappable::init, the use of a local function declaration has an issue on Windows:
|
| -// the local declaration does not pick up the surrounding namespace. Therefore, we provide this function
|
| -// in the global namespace.
|
| -// (More info on the MSVC bug here: http://connect.microsoft.com/VisualStudio/feedback/details/664619/the-namespace-of-local-function-declarations-in-c)
|
| void webCoreInitializeScriptWrappableForInterface(WebCore::TestInterface* object)
|
| {
|
| WebCore::initializeScriptWrappableForInterface(object);
|
| @@ -622,7 +592,8 @@ static void supplementalMethod4MethodCallback(const v8::FunctionCallbackInfo<v8:
|
|
|
| static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - ExceptionState exceptionState(ExceptionState::ConstructionContext, "TestInterface", info.Holder(), info.GetIsolate());
|
| + v8::Isolate* isolate = info.GetIsolate();
|
| + ExceptionState exceptionState(ExceptionState::ConstructionContext, "TestInterface", info.Holder(), isolate);
|
| if (UNLIKELY(info.Length() < 1)) {
|
| exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(1, info.Length()));
|
| exceptionState.throwIfNeeded();
|
| @@ -630,13 +601,13 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| }
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str1, info[0]);
|
| V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, str2, info[1]);
|
| - ExecutionContext* context = currentExecutionContext(info.GetIsolate());
|
| + ExecutionContext* context = currentExecutionContext(isolate);
|
| RefPtr<TestInterface> impl = TestInterface::create(context, str1, str2, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
|
|
| v8::Handle<v8::Object> wrapper = info.Holder();
|
| - V8DOMWrapper::associateObjectWithWrapper<V8TestInterface>(impl.release(), &V8TestInterface::wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent);
|
| + V8DOMWrapper::associateObjectWithWrapper<V8TestInterface>(impl.release(), &V8TestInterface::wrapperTypeInfo, wrapper, isolate, WrapperConfiguration::Dependent);
|
| v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| @@ -705,14 +676,15 @@ static void namedPropertyQueryCallback(v8::Local<v8::String> name, const v8::Pro
|
| static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
|
| {
|
| TestInterface* impl = V8TestInterface::toNative(info.Holder());
|
| + v8::Isolate* isolate = info.GetIsolate();
|
| Vector<String> names;
|
| - ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestInterface", info.Holder(), info.GetIsolate());
|
| + ExceptionState exceptionState(ExceptionState::EnumerationContext, "TestInterface", info.Holder(), isolate);
|
| impl->namedPropertyEnumerator(names, exceptionState);
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| - v8::Handle<v8::Array> v8names = v8::Array::New(info.GetIsolate(), names.size());
|
| + v8::Handle<v8::Array> v8names = v8::Array::New(isolate, names.size());
|
| for (size_t i = 0; i < names.size(); ++i)
|
| - v8names->Set(v8::Integer::New(info.GetIsolate(), i), v8String(info.GetIsolate(), names[i]));
|
| + v8names->Set(v8::Integer::New(isolate, i), v8String(isolate, names[i]));
|
| v8SetReturnValue(info, v8names);
|
| }
|
|
|
|
|