| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 56 } |
| 57 | 57 |
| 58 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); | 58 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); |
| 59 History* history = event->history(); | 59 History* history = event->history(); |
| 60 if (!history || !event->serializedState()) { | 60 if (!history || !event->serializedState()) { |
| 61 if (!event->serializedState()) { | 61 if (!event->serializedState()) { |
| 62 // If we're in an isolated world and the event was created in the ma
in world, | 62 // 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. | 63 // 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())); | 64 v8::Local<v8::Value> mainWorldState = V8HiddenValue::getHiddenValueF
romMainWorldWrapper(info.GetIsolate(), event, V8HiddenValue::state(info.GetIsola
te())); |
| 65 if (!mainWorldState.IsEmpty()) | 65 if (!mainWorldState.IsEmpty()) |
| 66 event->setSerializedState(SerializedScriptValue::createAndSwallo
wExceptions(mainWorldState, info.GetIsolate())); | 66 event->setSerializedState(SerializedScriptValue::createAndSwallo
wExceptions(info.GetIsolate(), mainWorldState)); |
| 67 } | 67 } |
| 68 if (event->serializedState()) | 68 if (event->serializedState()) |
| 69 result = event->serializedState()->deserialize(); | 69 result = event->serializedState()->deserialize(); |
| 70 else | 70 else |
| 71 result = v8::Null(info.GetIsolate()); | 71 result = v8::Null(info.GetIsolate()); |
| 72 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); | 72 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate
())); |
| 73 return; | 73 return; |
| 74 } | 74 } |
| 75 | 75 |
| 76 // There's no cached value from a previous invocation, nor a state value was
provided by the | 76 // 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()); | 93 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 94 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); | 94 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); |
| 95 } else { | 95 } else { |
| 96 result = event->serializedState()->deserialize(info.GetIsolate()); | 96 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 97 } | 97 } |
| 98 | 98 |
| 99 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; | 99 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; |
| 100 } | 100 } |
| 101 | 101 |
| 102 } // namespace blink | 102 } // namespace blink |
| OLD | NEW |