| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "bindings/core/v8/V8PopStateEvent.h" | 32 #include "bindings/core/v8/V8PopStateEvent.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/SerializedScriptValue.h" | 34 #include "bindings/core/v8/SerializedScriptValue.h" |
| 35 #include "bindings/core/v8/SerializedScriptValueFactory.h" |
| 35 #include "bindings/core/v8/V8HiddenValue.h" | 36 #include "bindings/core/v8/V8HiddenValue.h" |
| 36 #include "bindings/core/v8/V8History.h" | 37 #include "bindings/core/v8/V8History.h" |
| 37 #include "core/events/PopStateEvent.h" | 38 #include "core/events/PopStateEvent.h" |
| 38 #include "core/frame/History.h" | 39 #include "core/frame/History.h" |
| 39 | 40 |
| 40 namespace blink { | 41 namespace blink { |
| 41 | 42 |
| 42 // Save the state value to a hidden attribute in the V8PopStateEvent, and return
it, for convenience. | 43 // Save the state value to a hidden attribute in the V8PopStateEvent, and return
it, for convenience. |
| 43 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8
::Handle<v8::Value> state, v8::Isolate* isolate) | 44 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8
::Handle<v8::Value> state, v8::Isolate* isolate) |
| 44 { | 45 { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 56 } | 57 } |
| 57 | 58 |
| 58 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); | 59 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); |
| 59 History* history = event->history(); | 60 History* history = event->history(); |
| 60 if (!history || !event->serializedState()) { | 61 if (!history || !event->serializedState()) { |
| 61 if (!event->serializedState()) { | 62 if (!event->serializedState()) { |
| 62 // If we're in an isolated world and the event was created in the ma
in world, | 63 // If we're in an isolated world and the event was created in the ma
in world, |
| 63 // we need to find the 'state' property on the main world wrapper an
d clone it. | 64 // we need to find the 'state' property on the main world wrapper an
d clone it. |
| 64 v8::Local<v8::Value> mainWorldState = V8HiddenValue::getHiddenValueF
romMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::state(info.GetIsola
te())); | 65 v8::Local<v8::Value> mainWorldState = V8HiddenValue::getHiddenValueF
romMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::state(info.GetIsola
te())); |
| 65 if (!mainWorldState.IsEmpty()) | 66 if (!mainWorldState.IsEmpty()) |
| 66 event->setSerializedState(SerializedScriptValue::createAndSwallo
wExceptions(info.GetIsolate(), mainWorldState)); | 67 event->setSerializedState(SerializedScriptValueFactory::factory(
).createAndSwallowExceptions(info.GetIsolate(), mainWorldState)); |
| 67 } | 68 } |
| 68 if (event->serializedState()) | 69 if (event->serializedState()) |
| 69 result = event->serializedState()->deserialize(); | 70 result = event->serializedState()->deserialize(); |
| 70 else | 71 else |
| 71 result = v8::Null(info.GetIsolate()); | 72 result = v8::Null(info.GetIsolate()); |
| 72 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); | 73 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); |
| 73 return; | 74 return; |
| 74 } | 75 } |
| 75 | 76 |
| 76 // There's no cached value from a previous invocation, nor a state value was
provided by the | 77 // There's no cached value from a previous invocation, nor a state value was
provided by the |
| (...skipping 16 matching lines...) Expand all Loading... |
| 93 result = event->serializedState()->deserialize(info.GetIsolate()); | 94 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 94 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); | 95 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); |
| 95 } else { | 96 } else { |
| 96 result = event->serializedState()->deserialize(info.GetIsolate()); | 97 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 97 } | 98 } |
| 98 | 99 |
| 99 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; | 100 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; |
| 100 } | 101 } |
| 101 | 102 |
| 102 } // namespace blink | 103 } // namespace blink |
| OLD | NEW |