| Index: Source/bindings/v8/custom/V8PopStateEventCustom.cpp
|
| diff --git a/Source/bindings/v8/custom/V8PopStateEventCustom.cpp b/Source/bindings/v8/custom/V8PopStateEventCustom.cpp
|
| deleted file mode 100644
|
| index 83385ca297fdcae7e1029f4b526c02d33d4984e6..0000000000000000000000000000000000000000
|
| --- a/Source/bindings/v8/custom/V8PopStateEventCustom.cpp
|
| +++ /dev/null
|
| @@ -1,102 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2010 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.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "bindings/core/v8/V8PopStateEvent.h"
|
| -
|
| -#include "bindings/core/v8/V8History.h"
|
| -#include "bindings/v8/SerializedScriptValue.h"
|
| -#include "bindings/v8/V8HiddenValue.h"
|
| -#include "core/events/PopStateEvent.h"
|
| -#include "core/frame/History.h"
|
| -
|
| -namespace WebCore {
|
| -
|
| -// Save the state value to a hidden attribute in the V8PopStateEvent, and return it, for convenience.
|
| -static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8::Handle<v8::Value> state, v8::Isolate* isolate)
|
| -{
|
| - V8HiddenValue::setHiddenValue(isolate, popStateEvent, V8HiddenValue::state(isolate), state);
|
| - return state;
|
| -}
|
| -
|
| -void V8PopStateEvent::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
|
| -{
|
| - v8::Handle<v8::Value> result = V8HiddenValue::getHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValue::state(info.GetIsolate()));
|
| -
|
| - if (!result.IsEmpty()) {
|
| - v8SetReturnValue(info, result);
|
| - return;
|
| - }
|
| -
|
| - PopStateEvent* event = V8PopStateEvent::toNative(info.Holder());
|
| - History* history = event->history();
|
| - if (!history || !event->serializedState()) {
|
| - if (!event->serializedState()) {
|
| - // If we're in an isolated world and the event was created in the main world,
|
| - // we need to find the 'state' property on the main world wrapper and clone it.
|
| - v8::Local<v8::Value> mainWorldState = V8HiddenValue::getHiddenValueFromMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::state(info.GetIsolate()));
|
| - if (!mainWorldState.IsEmpty())
|
| - event->setSerializedState(SerializedScriptValue::createAndSwallowExceptions(mainWorldState, info.GetIsolate()));
|
| - }
|
| - if (event->serializedState())
|
| - result = event->serializedState()->deserialize();
|
| - else
|
| - result = v8::Null(info.GetIsolate());
|
| - v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
|
| - return;
|
| - }
|
| -
|
| - // There's no cached value from a previous invocation, nor a state value was provided by the
|
| - // event, but there is a history object, so first we need to see if the state object has been
|
| - // deserialized through the history object already.
|
| - // The current history state object might've changed in the meantime, so we need to take care
|
| - // of using the correct one, and always share the same deserialization with history.state.
|
| -
|
| - bool isSameState = history->isSameAsCurrentState(event->serializedState());
|
| -
|
| - if (isSameState) {
|
| - v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.GetIsolate()).As<v8::Object>();
|
| - if (!history->stateChanged()) {
|
| - result = V8HiddenValue::getHiddenValue(info.GetIsolate(), v8History, V8HiddenValue::state(info.GetIsolate()));
|
| - if (!result.IsEmpty()) {
|
| - v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
|
| - return;
|
| - }
|
| - }
|
| - result = event->serializedState()->deserialize(info.GetIsolate());
|
| - V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValue::state(info.GetIsolate()), result);
|
| - } else {
|
| - result = event->serializedState()->deserialize(info.GetIsolate());
|
| - }
|
| -
|
| - v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()));
|
| -}
|
| -
|
| -} // namespace WebCore
|
|
|