| 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 17 matching lines...) Expand all Loading... |
| 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 "V8PopStateEvent.h" | 32 #include "V8PopStateEvent.h" |
| 33 | 33 |
| 34 #include "V8History.h" | 34 #include "V8History.h" |
| 35 #include "bindings/v8/SerializedScriptValue.h" | 35 #include "bindings/v8/SerializedScriptValue.h" |
| 36 #include "bindings/v8/V8HiddenPropertyName.h" | 36 #include "bindings/v8/V8HiddenPropertyName.h" |
| 37 #include "core/events/PopStateEvent.h" | 37 #include "core/events/PopStateEvent.h" |
| 38 #include "core/page/History.h" | 38 #include "core/frame/History.h" |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 // Save the state value to a hidden attribute in the V8PopStateEvent, and return
it, for convenience. | 42 // 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) | 43 static v8::Handle<v8::Value> cacheState(v8::Handle<v8::Object> popStateEvent, v8
::Handle<v8::Value> state, v8::Isolate* isolate) |
| 44 { | 44 { |
| 45 popStateEvent->SetHiddenValue(V8HiddenPropertyName::state(isolate), state); | 45 popStateEvent->SetHiddenValue(V8HiddenPropertyName::state(isolate), state); |
| 46 return state; | 46 return state; |
| 47 } | 47 } |
| 48 | 48 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 result = event->serializedState()->deserialize(info.GetIsolate()); | 93 result = event->serializedState()->deserialize(info.GetIsolate()); |
| 94 v8History->SetHiddenValue(V8HiddenPropertyName::state(info.GetIsolate())
, result); | 94 v8History->SetHiddenValue(V8HiddenPropertyName::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 WebCore | 102 } // namespace WebCore |
| OLD | NEW |