| 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 23 matching lines...) Expand all Loading... |
| 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/SerializedScriptValueFactory.h" |
| 36 #include "bindings/core/v8/V8HiddenValue.h" | 36 #include "bindings/core/v8/V8HiddenValue.h" |
| 37 #include "bindings/core/v8/V8History.h" | 37 #include "bindings/core/v8/V8History.h" |
| 38 #include "core/events/PopStateEvent.h" | 38 #include "core/events/PopStateEvent.h" |
| 39 #include "core/frame/History.h" | 39 #include "core/frame/History.h" |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 // 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. |
| 44 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8
::Handle<v8::Value> state, v8::Isolate* isolate) | 44 static v8::Local<v8::Value> cacheState(v8::Local<v8::Object> popStateEvent, v8::
Local<v8::Value> state, v8::Isolate* isolate) |
| 45 { | 45 { |
| 46 V8HiddenValue::setHiddenValue(isolate, popStateEvent, V8HiddenValue::state(i
solate), state); | 46 V8HiddenValue::setHiddenValue(isolate, popStateEvent, V8HiddenValue::state(i
solate), state); |
| 47 return state; | 47 return state; |
| 48 } | 48 } |
| 49 | 49 |
| 50 void V8PopStateEvent::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<
v8::Value>& info) | 50 void V8PopStateEvent::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<
v8::Value>& info) |
| 51 { | 51 { |
| 52 v8::Handle<v8::Value> result = V8HiddenValue::getHiddenValue(info.GetIsolate
(), info.Holder(), V8HiddenValue::state(info.GetIsolate())); | 52 v8::Local<v8::Value> result = V8HiddenValue::getHiddenValue(info.GetIsolate(
), info.Holder(), V8HiddenValue::state(info.GetIsolate())); |
| 53 | 53 |
| 54 if (!result.IsEmpty()) { | 54 if (!result.IsEmpty()) { |
| 55 v8SetReturnValue(info, result); | 55 v8SetReturnValue(info, result); |
| 56 return; | 56 return; |
| 57 } | 57 } |
| 58 | 58 |
| 59 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); | 59 PopStateEvent* event = V8PopStateEvent::toImpl(info.Holder()); |
| 60 History* history = event->history(); | 60 History* history = event->history(); |
| 61 if (!history || !event->serializedState()) { | 61 if (!history || !event->serializedState()) { |
| 62 if (!event->serializedState()) { | 62 if (!event->serializedState()) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 76 | 76 |
| 77 // 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 |
| 78 // event, but there is a history object, so first we need to see if the stat
e object has been | 78 // event, but there is a history object, so first we need to see if the stat
e object has been |
| 79 // deserialized through the history object already. | 79 // deserialized through the history object already. |
| 80 // The current history state object might've changed in the meantime, so we
need to take care | 80 // The current history state object might've changed in the meantime, so we
need to take care |
| 81 // of using the correct one, and always share the same deserialization with
history.state. | 81 // of using the correct one, and always share the same deserialization with
history.state. |
| 82 | 82 |
| 83 bool isSameState = history->isSameAsCurrentState(event->serializedState()); | 83 bool isSameState = history->isSameAsCurrentState(event->serializedState()); |
| 84 | 84 |
| 85 if (isSameState) { | 85 if (isSameState) { |
| 86 v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.Get
Isolate()).As<v8::Object>(); | 86 v8::Local<v8::Object> v8History = toV8(history, info.Holder(), info.GetI
solate()).As<v8::Object>(); |
| 87 if (!history->stateChanged()) { | 87 if (!history->stateChanged()) { |
| 88 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), v8History,
V8HiddenValue::state(info.GetIsolate())); | 88 result = V8HiddenValue::getHiddenValue(info.GetIsolate(), v8History,
V8HiddenValue::state(info.GetIsolate())); |
| 89 if (!result.IsEmpty()) { | 89 if (!result.IsEmpty()) { |
| 90 v8SetReturnValue(info, cacheState(info.Holder(), result, info.Ge
tIsolate())); | 90 v8SetReturnValue(info, cacheState(info.Holder(), result, info.Ge
tIsolate())); |
| 91 return; | 91 return; |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 result = event->serializedState()->deserialize(info.GetIsolate()); | 94 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 95 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); | 95 V8HiddenValue::setHiddenValue(info.GetIsolate(), v8History, V8HiddenValu
e::state(info.GetIsolate()), result); |
| 96 } else { | 96 } else { |
| 97 result = event->serializedState()->deserialize(info.GetIsolate()); | 97 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 98 } | 98 } |
| 99 | 99 |
| 100 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; | 100 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate()))
; |
| 101 } | 101 } |
| 102 | 102 |
| 103 } // namespace blink | 103 } // namespace blink |
| OLD | NEW |