| Index: Source/core/inspector/InspectorDOMStorageAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorDOMStorageAgent.cpp b/Source/core/inspector/InspectorDOMStorageAgent.cpp
|
| index 20a11ac9b8f1f132b09af1af6f07bb1943ddfea1..e0b092e3ebab8e882bf05eb080112083ac9642bc 100644
|
| --- a/Source/core/inspector/InspectorDOMStorageAgent.cpp
|
| +++ b/Source/core/inspector/InspectorDOMStorageAgent.cpp
|
| @@ -54,12 +54,12 @@ namespace DOMStorageAgentState {
|
| static const char domStorageAgentEnabled[] = "domStorageAgentEnabled";
|
| };
|
|
|
| -static bool hadException(ExceptionState& es, ErrorString* errorString)
|
| +static bool hadException(ExceptionState& exceptionState, ErrorString* errorString)
|
| {
|
| - if (!es.hadException())
|
| + if (!exceptionState.hadException())
|
| return false;
|
|
|
| - switch (es.code()) {
|
| + switch (exceptionState.code()) {
|
| case SecurityError:
|
| *errorString = "Security error";
|
| return true;
|
| @@ -117,13 +117,13 @@ void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, cons
|
|
|
| RefPtr<TypeBuilder::Array<TypeBuilder::Array<String> > > storageItems = TypeBuilder::Array<TypeBuilder::Array<String> >::create();
|
|
|
| - TrackExceptionState es;
|
| - for (unsigned i = 0; i < storageArea->length(es, frame); ++i) {
|
| - String name(storageArea->key(i, es, frame));
|
| - if (hadException(es, errorString))
|
| + TrackExceptionState exceptionState;
|
| + for (unsigned i = 0; i < storageArea->length(exceptionState, frame); ++i) {
|
| + String name(storageArea->key(i, exceptionState, frame));
|
| + if (hadException(exceptionState, errorString))
|
| return;
|
| - String value(storageArea->getItem(name, es, frame));
|
| - if (hadException(es, errorString))
|
| + String value(storageArea->getItem(name, exceptionState, frame));
|
| + if (hadException(exceptionState, errorString))
|
| return;
|
| RefPtr<TypeBuilder::Array<String> > entry = TypeBuilder::Array<String>::create();
|
| entry->addItem(name);
|
| @@ -133,10 +133,10 @@ void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, cons
|
| items = storageItems.release();
|
| }
|
|
|
| -static String toErrorString(ExceptionState& es)
|
| +static String toErrorString(ExceptionState& exceptionState)
|
| {
|
| - if (es.hadException())
|
| - return DOMException::getErrorName(es.code());
|
| + if (exceptionState.hadException())
|
| + return DOMException::getErrorName(exceptionState.code());
|
| return "";
|
| }
|
|
|
| @@ -149,9 +149,9 @@ void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString* errorString, const
|
| return;
|
| }
|
|
|
| - TrackExceptionState es;
|
| - storageArea->setItem(key, value, es, frame);
|
| - *errorString = toErrorString(es);
|
| + TrackExceptionState exceptionState;
|
| + storageArea->setItem(key, value, exceptionState, frame);
|
| + *errorString = toErrorString(exceptionState);
|
| }
|
|
|
| void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString* errorString, const RefPtr<JSONObject>& storageId, const String& key)
|
| @@ -163,9 +163,9 @@ void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString* errorString, co
|
| return;
|
| }
|
|
|
| - TrackExceptionState es;
|
| - storageArea->removeItem(key, es, frame);
|
| - *errorString = toErrorString(es);
|
| + TrackExceptionState exceptionState;
|
| + storageArea->removeItem(key, exceptionState, frame);
|
| + *errorString = toErrorString(exceptionState);
|
| }
|
|
|
| String InspectorDOMStorageAgent::storageId(Storage* storage)
|
|
|