Source/bindings/v8/custom/V8HistoryCustom.cpp - Issue 114363002: Structured cloning: improve DataCloneError reporting.

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

Issue 114363002: Structured cloning: improve DataCloneError reporting. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebased + reset V8TestInterfaceConstructor.cpp result Created 7 years 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

OLD	NEW
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 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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(info.GetIsolate()) , 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>& info)	62 void V8History::pushStateMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)

63 {	63 {

64 bool didThrow = false;	64 ExceptionState exceptionState(ExceptionState::ExecutionContext, "pushState", "History", info.Holder(), info.GetIsolate());

65 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, didThrow, info.GetIsolate());	65 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, exceptionState, info.GetIsolate());

66 if (didThrow)	66 if (exceptionState.throwIfNeeded())

67 return;	67 return;

68	68

69 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, info[1]);	69 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, info[1]);

70 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));	70 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));

71	71

72 ExceptionState exceptionState(info.Holder(), info.GetIsolate());

73 History* history = V8History::toNative(info.Holder());	72 History* history = V8History::toNative(info.Holder());

74 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationPushState, exceptionState);	73 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationPushState, exceptionState);

75 info.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(info.GetIsolate ()));	74 info.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(info.GetIsolate ()));

76 exceptionState.throwIfNeeded();	75 exceptionState.throwIfNeeded();

77 }	76 }

78	77

79 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& info)	78 void V8History::replaceStateMethodCustom(const v8::FunctionCallbackInfo<v8::Valu e>& info)

80 {	79 {

81 bool didThrow = false;	80 ExceptionState exceptionState(ExceptionState::ExecutionContext, "replaceStat e", "History", info.Holder(), info.GetIsolate());

82 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, didThrow, info.GetIsolate());	81 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, exceptionState, info.GetIsolate());

83 if (didThrow)	82 if (exceptionState.throwIfNeeded())

84 return;	83 return;

85	84

86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, info[1]);	85 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, info[1]);

87 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));	86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));

88	87

89 ExceptionState exceptionState(info.Holder(), info.GetIsolate());

90 History* history = V8History::toNative(info.Holder());	88 History* history = V8History::toNative(info.Holder());

91 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationReplaceState, exceptionState);	89 history->stateObjectAdded(historyState.release(), title, url, SameDocumentNa vigationReplaceState, exceptionState);

92 info.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(info.GetIsolate ()));	90 info.Holder()->DeleteHiddenValue(V8HiddenPropertyName::state(info.GetIsolate ()));

93 exceptionState.throwIfNeeded();	91 exceptionState.throwIfNeeded();

94 }	92 }

95	93

96 } // namespace WebCore	94 } // namespace WebCore

OLD	NEW