Source/bindings/v8/custom/V8HistoryCustom.cpp - Issue 234403004: Rename V8TRYCATCH_* macros in v8/V8BindingMacros.h

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

Issue 234403004: Rename V8TRYCATCH_* macros in v8/V8BindingMacros.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 8 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

« Source/bindings/v8/V8BindingMacros.h ('K') | « Source/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp ('k') | Source/bindings/v8/custom/V8InspectorFrontendHostCustom.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 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 ExceptionState exceptionState(ExceptionState::ExecutionContext, "pushState", "History", info.Holder(), info.GetIsolate());	64 ExceptionState exceptionState(ExceptionState::ExecutionContext, "pushState", "History", info.Holder(), info.GetIsolate());

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

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

67 return;	67 return;

68	68

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

70 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));	70 V8STRINGRESOURCE_PREPARE_VOID(V8StringResource<WithUndefinedOrNullCheck>, ur l, argumentOrNull(info, 2));

71	71

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

73 history->stateObjectAdded(historyState.release(), title, url, UpdateBackForw ardList, exceptionState);	73 history->stateObjectAdded(historyState.release(), title, url, UpdateBackForw ardList, exceptionState);

74 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));	74 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));

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

76 }	76 }

77	77

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

79 {	79 {

80 ExceptionState exceptionState(ExceptionState::ExecutionContext, "replaceStat e", "History", info.Holder(), info.GetIsolate());	80 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());	81 RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(i nfo[0], 0, 0, exceptionState, info.GetIsolate());

82 if (exceptionState.throwIfNeeded())	82 if (exceptionState.throwIfNeeded())

83 return;	83 return;

84	84

85 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, title, info[1]);	85 V8STRINGRESOURCE_PREPARE_VOID(V8StringResource<WithUndefinedOrNullCheck>, ti tle, info[1]);

86 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullChe ck>, url, argumentOrNull(info, 2));	86 V8STRINGRESOURCE_PREPARE_VOID(V8StringResource<WithUndefinedOrNullCheck>, ur l, argumentOrNull(info, 2));

87	87

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

89 history->stateObjectAdded(historyState.release(), title, url, DoNotUpdateBac kForwardList, exceptionState);	89 history->stateObjectAdded(historyState.release(), title, url, DoNotUpdateBac kForwardList, exceptionState);

90 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));	90 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV alue::state(info.GetIsolate()));

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

92 }	92 }

93	93

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

OLD	NEW