Source/bindings/v8/custom/V8HistoryCustom.cpp - Issue 68563003: Create DOM exceptions in the correct context.

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

Issue 68563003: Create DOM exceptions in the correct context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 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

« Source/bindings/v8/V8ThrowException.h ('K') | « Source/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp ('k') | Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 51 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 bool didThrow = false;

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, didThrow, info.GetIsolate());

66 if (didThrow)	66 if (didThrow)

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 es(info.GetIsolate());	72 ExceptionState es(info.Holder(), info.GetIsolate());

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

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

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

76 es.throwIfNeeded();	76 es.throwIfNeeded();

77 }	77 }

78	78

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

80 {	80 {

81 bool didThrow = false;	81 bool didThrow = false;

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

83 if (didThrow)	83 if (didThrow)

84 return;	84 return;

85	85

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

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

88	88

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

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

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

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

93 es.throwIfNeeded();	93 es.throwIfNeeded();

94 }	94 }

95	95

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

OLD	NEW