Rename es => exceptionState in bindings/

Source/bindings/v8/custom/V8WindowCustom.cpp

 /*
  * Copyright (C) 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
 #include "core/storage/Storage.h"
 #include "platform/PlatformScreen.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/OwnPtr.h"
 
 namespace WebCore {
 
 // FIXME: There is a lot of duplication with SetTimeoutOrInterval() in V8WorkerGlobalScopeCustom.cpp.
 // We should refactor this.
-void WindowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info, bool singleShot, ExceptionState& es)
+void WindowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& info, bool singleShot, ExceptionState& exceptionState)
 {
     int argumentCount = info.Length();
 
     if (argumentCount < 1)
         return;
 
     DOMWindow* imp = V8Window::toNative(info.Holder());
     ExecutionContext* scriptContext = static_cast<ExecutionContext*>(imp->document());
 
     if (!scriptContext) {
-        es.throwUninformativeAndGenericDOMException(InvalidAccessError);
+        exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return;
     }
 
     v8::Handle<v8::Value> function = info[0];
     String functionString;
     if (!function->IsFunction()) {
         if (function->IsString()) {
             functionString = toWebCoreString(function.As<v8::String>());
         } else {
             v8::Handle<v8::Value> v8String = function->ToString();
 
             // Bail out if string conversion failed.
             if (v8String.IsEmpty())
                 return;
 
             functionString = toWebCoreString(v8String);
         }
 
         // Don't allow setting timeouts to run empty functions!
         // (Bug 1009597)
         if (!functionString.length())
             return;
     }
 
-    if (!BindingSecurity::shouldAllowAccessToFrame(imp->frame(), es))
+    if (!BindingSecurity::shouldAllowAccessToFrame(imp->frame(), exceptionState))
         return;
 
     OwnPtr<ScheduledAction> action;
     if (function->IsFunction()) {
         int paramCount = argumentCount >= 2 ? argumentCount - 2 : 0;
         OwnPtr<v8::Local<v8::Value>[]> params;
         if (paramCount > 0) {
             params = adoptArrayPtr(new v8::Local<v8::Value>[paramCount]);
             for (int i = 0; i < paramCount; i++) {
                 // parameters must be globalized
@@ skipping 30 matching lines @@
     v8SetReturnValue(info, timerId);
 }
 
 void V8Window::eventAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8Window::GetTemplate(info.GetIsolate(), worldTypeInMainThread(info.GetIsolate())));
     if (holder.IsEmpty())
         return;
 
     Frame* frame = V8Window::toNative(holder)->frame();
-    ExceptionState es(info.GetIsolate());
-    if (!BindingSecurity::shouldAllowAccessToFrame(frame, es)) {
-        es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    if (!BindingSecurity::shouldAllowAccessToFrame(frame, exceptionState)) {
+        exceptionState.throwIfNeeded();
         return;
     }
 
     ASSERT(frame);
     v8::Local<v8::Context> context = frame->script().currentWorldContext();
     if (context.IsEmpty())
         return;
 
     v8::Handle<v8::String> eventSymbol = V8HiddenPropertyName::event(info.GetIsolate());
     v8::Handle<v8::Value> jsEvent = context->Global()->GetHiddenValue(eventSymbol);
     if (jsEvent.IsEmpty())
         return;
     v8SetReturnValue(info, jsEvent);
 }
 
 void V8Window::eventAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
 {
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(V8Window::GetTemplate(info.GetIsolate(), worldTypeInMainThread(info.GetIsolate())));
     if (holder.IsEmpty())
         return;
 
     Frame* frame = V8Window::toNative(holder)->frame();
-    ExceptionState es(info.GetIsolate());
-    if (!BindingSecurity::shouldAllowAccessToFrame(frame, es)) {
-        es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    if (!BindingSecurity::shouldAllowAccessToFrame(frame, exceptionState)) {
+        exceptionState.throwIfNeeded();
         return;
     }
 
     ASSERT(frame);
     v8::Local<v8::Context> context = frame->script().currentWorldContext();
     if (context.IsEmpty())
         return;
 
     v8::Handle<v8::String> eventSymbol = V8HiddenPropertyName::event(info.GetIsolate());
     context->Global()->SetHiddenValue(eventSymbol, value);
 }
 
 void V8Window::openerAttributeSetterCustom(v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<void>& info)
 {
     DOMWindow* imp = V8Window::toNative(info.Holder());
-    ExceptionState es(info.GetIsolate());
-    if (!BindingSecurity::shouldAllowAccessToFrame(imp->frame(), es)) {
-        es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    if (!BindingSecurity::shouldAllowAccessToFrame(imp->frame(), exceptionState)) {
+        exceptionState.throwIfNeeded();
         return;
     }
 
     // Opener can be shadowed if it is in the same domain.
     // Have a special handling of null value to behave
     // like Firefox. See bug http://b/1224887 & http://b/791706.
     if (value->IsNull()) {
         // imp->frame() cannot be null,
         // otherwise, SameOrigin check would have failed.
         ASSERT(imp->frame());
@@ skipping 51 matching lines @@
         }
     }
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, targetOrigin, info[targetOriginArgIndex]);
 
     bool didThrow = false;
     RefPtr<SerializedScriptValue> message =
         SerializedScriptValue::create(info[0], &portArray, &arrayBufferArray, didThrow, info.GetIsolate());
     if (didThrow)
         return;
 
-    ExceptionState es(info.GetIsolate());
-    window->postMessage(message.release(), &portArray, targetOrigin, source, es);
-    es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    window->postMessage(message.release(), &portArray, targetOrigin, source, exceptionState);
+    exceptionState.throwIfNeeded();
 }
 
 // FIXME(fqian): returning string is cheating, and we should
 // fix this by calling toString function on the receiver.
 // However, V8 implements toString in JavaScript, which requires
 // switching context of receiver. I consider it is dangerous.
 void V8Window::toStringMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     v8::Handle<v8::Object> domWrapper = info.This()->FindInstanceInPrototypeChain(V8Window::GetTemplate(info.GetIsolate(), worldTypeInMainThread(info.GetIsolate())));
     if (domWrapper.IsEmpty()) {
@@ skipping 41 matching lines @@
 }
 
 static void setUpDialog(DOMWindow* dialog, void* handler)
 {
     static_cast<DialogHandler*>(handler)->dialogCreated(dialog);
 }
 
 void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     DOMWindow* impl = V8Window::toNative(info.Holder());
-    ExceptionState es(info.GetIsolate());
-    if (!BindingSecurity::shouldAllowAccessToFrame(impl->frame(), es)) {
-        es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    if (!BindingSecurity::shouldAllowAccessToFrame(impl->frame(), exceptionState)) {
+        exceptionState.throwIfNeeded();
         return;
     }
 
     // FIXME: Handle exceptions properly.
     String urlString = toWebCoreStringWithUndefinedOrNullCheck(info[0]);
     DialogHandler handler(info[1]);
     String dialogFeaturesString = toWebCoreStringWithUndefinedOrNullCheck(info[2]);
 
     impl->showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(), firstDOMWindow(), setUpDialog, &handler);
 
     v8SetReturnValue(info, handler.returnValue(info.GetIsolate()));
 }
 
 void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     DOMWindow* impl = V8Window::toNative(info.Holder());
-    ExceptionState es(info.GetIsolate());
-    if (!BindingSecurity::shouldAllowAccessToFrame(impl->frame(), es)) {
-        es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    if (!BindingSecurity::shouldAllowAccessToFrame(impl->frame(), exceptionState)) {
+        exceptionState.throwIfNeeded();
         return;
     }
 
     // FIXME: Handle exceptions properly.
     String urlString = toWebCoreStringWithUndefinedOrNullCheck(info[0]);
     AtomicString frameName = (info[1]->IsUndefined() || info[1]->IsNull()) ? "_blank" : toWebCoreAtomicString(info[1]);
     String windowFeaturesString = toWebCoreStringWithUndefinedOrNullCheck(info[2]);
 
     RefPtr<DOMWindow> openedWindow = impl->open(urlString, frameName, windowFeaturesString, activeDOMWindow(), firstDOMWindow());
     if (!openedWindow)
@@ skipping 40 matching lines @@
                 v8SetReturnValueFast(info, items.release(), window);
                 return;
             }
         }
     }
 }
 
 
 void V8Window::setTimeoutMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
-    ExceptionState es(info.GetIsolate());
-    WindowSetTimeoutImpl(info, true, es);
-    es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    WindowSetTimeoutImpl(info, true, exceptionState);
+    exceptionState.throwIfNeeded();
 }
 
 
 void V8Window::setIntervalMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
-    ExceptionState es(info.GetIsolate());
-    WindowSetTimeoutImpl(info, false, es);
-    es.throwIfNeeded();
+    ExceptionState exceptionState(info.GetIsolate());
+    WindowSetTimeoutImpl(info, false, exceptionState);
+    exceptionState.throwIfNeeded();
 }
 
 bool V8Window::namedSecurityCheckCustom(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType type, v8::Local<v8::Value>)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::Handle<v8::Object> window = host->FindInstanceInPrototypeChain(V8Window::GetTemplate(isolate, worldTypeInMainThread(isolate)));
     if (window.IsEmpty())
         return false; // the frame is gone.
 
     DOMWindow* targetWindow = V8Window::toNative(window);
@@ skipping 95 matching lines @@
     v8::Handle<v8::Context> context = frame->script().currentWorldContext();
     if (context.IsEmpty())
         return v8Undefined();
 
     v8::Handle<v8::Object> global = context->Global();
     ASSERT(!global.IsEmpty());
     return global;
 }
 
 } // namespace WebCore