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

Side by Side Diff: Source/bindings/v8/custom/V8HistoryCustom.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 27 matching lines...) Expand all
38 #include "bindings/v8/V8HiddenPropertyName.h" 38 #include "bindings/v8/V8HiddenPropertyName.h"
39 #include "core/dom/ExceptionCode.h" 39 #include "core/dom/ExceptionCode.h"
40 #include "core/page/History.h" 40 #include "core/page/History.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 void V8History::stateAttributeGetterCustom(v8::Local<v8::String> name, const v8: :PropertyCallbackInfo<v8::Value>& info) 44 void V8History::stateAttributeGetterCustom(v8::Local<v8::String> name, const v8: :PropertyCallbackInfo<v8::Value>& info)
45 { 45 {
46 History* history = V8History::toNative(info.Holder()); 46 History* history = V8History::toNative(info.Holder());
47 47
48 v8::Handle<v8::Value> value = info.Holder()->GetHiddenValue(V8HiddenProperty Name::state()); 48 v8::Handle<v8::Value> value = info.Holder()->GetHiddenValue(V8HiddenProperty Name::state(info.GetIsolate()));
49 49
50 if (!value.IsEmpty() && !history->stateChanged()) { 50 if (!value.IsEmpty() && !history->stateChanged()) {
51 v8SetReturnValue(info, value); 51 v8SetReturnValue(info, value);
52 return; 52 return;
53 } 53 }
54 54
55 RefPtr<SerializedScriptValue> serialized = history->state(); 55 RefPtr<SerializedScriptValue> serialized = history->state();
56 value = serialized ? serialized->deserialize(info.GetIsolate()) : v8::Handle <v8::Value>(v8::Null(info.GetIsolate())); 56 value = serialized ? serialized->deserialize(info.GetIsolate()) : v8::Handle <v8::Value>(v8::Null(info.GetIsolate()));
57 info.Holder()->SetHiddenValue(V8HiddenPropertyName::state(), value); 57 info.Holder()->SetHiddenValue(V8HiddenPropertyName::state(info.GetIsolate()) , value);
58 58
59 v8SetReturnValue(info, value); 59 v8SetReturnValue(info, value);
60 } 60 }
61 61
62 void V8History::pushStateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args) 62 void V8History::pushStateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
63 { 63 {
64 bool didThrow = false; 64 bool didThrow = false;
65 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(a rgs[0], 0, 0, didThrow, args.GetIsolate()); 65 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(a rgs[0], 0, 0, didThrow, args.GetIsolate());
66 if (didThrow) 66 if (didThrow)
67 return; 67 return;
68 68
69 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, args[1]); 69 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, args[1]);
70 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(args, 2)); 70 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(args, 2));
71 71
72 ExceptionState es(args.GetIsolate()); 72 ExceptionState es(args.GetIsolate());
73 History* history = V8History::toNative(args.Holder()); 73 History* history = V8History::toNative(args.Holder());
74 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationPushState, es); 74 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationPushState, es);
75 args.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state()); 75 args.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(args.GetIsolate ()));
76 es.throwIfNeeded(); 76 es.throwIfNeeded();
77 } 77 }
78 78
79 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& args) 79 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& args)
80 { 80 {
81 bool didThrow = false; 81 bool didThrow = false;
82 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(a rgs[0], 0, 0, didThrow, args.GetIsolate()); 82 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(a rgs[0], 0, 0, didThrow, args.GetIsolate());
83 if (didThrow) 83 if (didThrow)
84 return; 84 return;
85 85
86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, args[1]); 86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, args[1]);
87 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(args, 2)); 87 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(args, 2));
88 88
89 ExceptionState es(args.GetIsolate()); 89 ExceptionState es(args.GetIsolate());
90 History* history = V8History::toNative(args.Holder()); 90 History* history = V8History::toNative(args.Holder());
91 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationReplaceState, es); 91 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationReplaceState, es);
92 args.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state()); 92 args.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(args.GetIsolate ()));
93 es.throwIfNeeded(); 93 es.throwIfNeeded();
94 } 94 }
95 95
96 } // namespace WebCore 96 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8ErrorEventCustom.cpp ('k') | Source/bindings/v8/custom/V8MessageEventCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698