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

Side by Side Diff: Source/bindings/core/v8/custom/V8HistoryCustom.cpp

Issue 718383003: bindings: fixed incorrect dependency of SerializedScriptValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 "bindings/core/v8/V8History.h" 32 #include "bindings/core/v8/V8History.h"
33 33
34 #include "bindings/core/v8/ExceptionState.h" 34 #include "bindings/core/v8/ExceptionState.h"
35 #include "bindings/core/v8/SerializedScriptValue.h" 35 #include "bindings/core/v8/SerializedScriptValue.h"
36 #include "bindings/core/v8/SerializedScriptValueFactory.h"
36 #include "bindings/core/v8/V8Binding.h" 37 #include "bindings/core/v8/V8Binding.h"
37 #include "bindings/core/v8/V8HiddenValue.h" 38 #include "bindings/core/v8/V8HiddenValue.h"
38 #include "bindings/core/v8/V8Window.h" 39 #include "bindings/core/v8/V8Window.h"
39 #include "core/dom/ExceptionCode.h" 40 #include "core/dom/ExceptionCode.h"
40 #include "core/frame/History.h" 41 #include "core/frame/History.h"
41 42
42 namespace blink { 43 namespace blink {
43 44
44 void V8History::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Va lue>& info) 45 void V8History::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Va lue>& info)
45 { 46 {
46 History* history = V8History::toImpl(info.Holder()); 47 History* history = V8History::toImpl(info.Holder());
47 48
48 v8::Handle<v8::Value> value = V8HiddenValue::getHiddenValue(info.GetIsolate( ), info.Holder(), V8HiddenValue::state(info.GetIsolate())); 49 v8::Handle<v8::Value> value = V8HiddenValue::getHiddenValue(info.GetIsolate( ), info.Holder(), V8HiddenValue::state(info.GetIsolate()));
49 50
50 if (!value.IsEmpty() && !history->stateChanged()) { 51 if (!value.IsEmpty() && !history->stateChanged()) {
51 v8SetReturnValue(info, value); 52 v8SetReturnValue(info, value);
52 return; 53 return;
53 } 54 }
54 55
55 RefPtr<SerializedScriptValue> serialized = history->state(); 56 RefPtr<SerializedScriptValue> serialized = history->state();
56 value = serialized ? serialized->deserialize(info.GetIsolate()) : v8::Handle <v8::Value>(v8::Null(info.GetIsolate())); 57 value = serialized ? serialized->deserialize(info.GetIsolate()) : v8::Handle <v8::Value>(v8::Null(info.GetIsolate()));
57 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValu e::state(info.GetIsolate()), value); 58 V8HiddenValue::setHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenValu e::state(info.GetIsolate()), value);
58 59
59 v8SetReturnValue(info, value); 60 v8SetReturnValue(info, value);
60 } 61 }
61 62
62 void V8History::pushStateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info) 63 void V8History::pushStateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
63 { 64 {
64 ExceptionState exceptionState(ExceptionState::ExecutionContext, "pushState", "History", info.Holder(), info.GetIsolate()); 65 ExceptionState exceptionState(ExceptionState::ExecutionContext, "pushState", "History", info.Holder(), info.GetIsolate());
65 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, exceptionState, info.GetIsolate()); 66 RefPtr<SerializedScriptValue> historyState = SerializedScriptValueFactory::f actory().create(info[0], 0, 0, exceptionState, info.GetIsolate());
66 if (exceptionState.throwIfNeeded()) 67 if (exceptionState.throwIfNeeded())
67 return; 68 return;
68 69
69 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in fo[1]); 70 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in fo[1]);
70 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info [2]); 71 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info [2]);
71 72
72 History* history = V8History::toImpl(info.Holder()); 73 History* history = V8History::toImpl(info.Holder());
73 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeS tandard, exceptionState); 74 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeS tandard, exceptionState);
74 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate())); 75 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));
75 exceptionState.throwIfNeeded(); 76 exceptionState.throwIfNeeded();
76 } 77 }
77 78
78 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& info) 79 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& info)
79 { 80 {
80 ExceptionState exceptionState(ExceptionState::ExecutionContext, "replaceStat e", "History", info.Holder(), info.GetIsolate()); 81 ExceptionState exceptionState(ExceptionState::ExecutionContext, "replaceStat e", "History", info.Holder(), info.GetIsolate());
81 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, exceptionState, info.GetIsolate()); 82 RefPtr<SerializedScriptValue> historyState = SerializedScriptValueFactory::f actory().create(info[0], 0, 0, exceptionState, info.GetIsolate());
82 if (exceptionState.throwIfNeeded()) 83 if (exceptionState.throwIfNeeded())
83 return; 84 return;
84 85
85 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in fo[1]); 86 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in fo[1]);
86 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info [2]); 87 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info [2]);
87 88
88 History* history = V8History::toImpl(info.Holder()); 89 History* history = V8History::toImpl(info.Holder());
89 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeR edirectWithLockedBackForwardList, exceptionState); 90 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeR edirectWithLockedBackForwardList, exceptionState);
90 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate())); 91 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));
91 exceptionState.throwIfNeeded(); 92 exceptionState.throwIfNeeded();
92 } 93 }
93 94
94 } // namespace blink 95 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698