Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Side by Side Diff: Source/bindings/v8/custom/V8PopStateEventCustom.cpp

Issue 23637014: Have V8HiddenPropertyName static functions take an isolate in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 22 matching lines...) Expand all
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/dom/PopStateEvent.h" 37 #include "core/dom/PopStateEvent.h"
38 #include "core/page/History.h" 38 #include "core/page/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) 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(), state); 45 popStateEvent->SetHiddenValue(V8HiddenPropertyName::state(isolate), state);
46 return state; 46 return state;
47 } 47 }
48 48
49 void V8PopStateEvent::stateAttributeGetterCustom(v8::Local<v8::String> name, con st v8::PropertyCallbackInfo<v8::Value>& info) 49 void V8PopStateEvent::stateAttributeGetterCustom(v8::Local<v8::String> name, con st v8::PropertyCallbackInfo<v8::Value>& info)
50 { 50 {
51 v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropert yName::state()); 51 v8::Handle<v8::Value> result = info.Holder()->GetHiddenValue(V8HiddenPropert yName::state(info.GetIsolate()));
52 52
53 if (!result.IsEmpty()) { 53 if (!result.IsEmpty()) {
54 v8SetReturnValue(info, result); 54 v8SetReturnValue(info, result);
55 return; 55 return;
56 } 56 }
57 57
58 PopStateEvent* event = V8PopStateEvent::toNative(info.Holder()); 58 PopStateEvent* event = V8PopStateEvent::toNative(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 = getHiddenValueFromMainWorldWra pper(info.GetIsolate(), event, V8HiddenPropertyName::state()); 64 v8::Local<v8::Value> mainWorldState = getHiddenValueFromMainWorldWra pper(info.GetIsolate(), event, V8HiddenPropertyName::state(info.GetIsolate()));
65 if (!mainWorldState.IsEmpty()) 65 if (!mainWorldState.IsEmpty())
66 event->setSerializedState(SerializedScriptValue::createAndSwallo wExceptions(mainWorldState, info.GetIsolate())); 66 event->setSerializedState(SerializedScriptValue::createAndSwallo wExceptions(mainWorldState, info.GetIsolate()));
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)); 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
77 // event, but there is a history object, so first we need to see if the stat e object has been 77 // event, but there is a history object, so first we need to see if the stat e object has been
78 // deserialized through the history object already. 78 // deserialized through the history object already.
79 // The current history state object might've changed in the meantime, so we need to take care 79 // The current history state object might've changed in the meantime, so we need to take care
80 // of using the correct one, and always share the same deserialization with history.state. 80 // of using the correct one, and always share the same deserialization with history.state.
81 81
82 bool isSameState = history->isSameAsCurrentState(event->serializedState()); 82 bool isSameState = history->isSameAsCurrentState(event->serializedState());
83 83
84 if (isSameState) { 84 if (isSameState) {
85 v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.Get Isolate()).As<v8::Object>(); 85 v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.Get Isolate()).As<v8::Object>();
86 if (!history->stateChanged()) { 86 if (!history->stateChanged()) {
87 result = v8History->GetHiddenValue(V8HiddenPropertyName::state()); 87 result = v8History->GetHiddenValue(V8HiddenPropertyName::state(info. GetIsolate()));
88 if (!result.IsEmpty()) { 88 if (!result.IsEmpty()) {
89 v8SetReturnValue(info, cacheState(info.Holder(), result)); 89 v8SetReturnValue(info, cacheState(info.Holder(), result, info.Ge tIsolate()));
90 return; 90 return;
91 } 91 }
92 } 92 }
93 result = event->serializedState()->deserialize(info.GetIsolate()); 93 result = event->serializedState()->deserialize(info.GetIsolate());
94 v8History->SetHiddenValue(V8HiddenPropertyName::state(), 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)); 99 v8SetReturnValue(info, cacheState(info.Holder(), result, info.GetIsolate())) ;
100 } 100 }
101 101
102 } // namespace WebCore 102 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8MessageEventCustom.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698