Revert "Transition modules/** to use ExceptionState"

Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  * Copyright (C) 2012, Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
 
 #include "config.h"
 #include "modules/navigatorcontentutils/NavigatorContentUtils.h"
 
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
 
-#include "bindings/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/page/Frame.h"
 #include "core/page/Navigator.h"
 #include "core/page/Page.h"
 #include "wtf/HashSet.h"
 
 namespace WebCore {
 
 static HashSet<String>* protocolWhitelist;
@@ skipping 16 matching lines @@
         "ssh",
         "tel",
         "urn",
         "webcal",
         "xmpp",
     };
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(protocols); ++i)
         protocolWhitelist->add(protocols[i]);
 }
 
-static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionState& es)
+static bool verifyCustomHandlerURL(const String& baseURL, const String& url, ExceptionCode& ec)
 {
     // The specification requires that it is a SyntaxError if the "%s" token is
     // not present.
     static const char token[] = "%s";
     int index = url.find(token);
     if (-1 == index) {
-        es.throwDOMException(SyntaxError);
+        ec = SyntaxError;
         return false;
     }
 
     // It is also a SyntaxError if the custom handler URL, as created by removing
     // the "%s" token and prepending the base url, does not resolve.
     String newURL = url;
     newURL.remove(index, WTF_ARRAY_LENGTH(token) - 1);
 
     KURL base(ParsedURLString, baseURL);
     KURL kurl(base, newURL);
 
     if (kurl.isEmpty() || !kurl.isValid()) {
-        es.throwDOMException(SyntaxError);
+        ec = SyntaxError;
         return false;
     }
 
     return true;
 }
 
 static bool isProtocolWhitelisted(const String& scheme)
 {
     if (!protocolWhitelist)
         initProtocolHandlerWhitelist();
     return protocolWhitelist->contains(scheme);
 }
 
-static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionState& es)
+static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionCode& ec)
 {
     if (scheme.startsWith("web+")) {
         if (isValidProtocol(scheme))
             return true;
-        es.throwDOMException(SecurityError);
+        ec = SecurityError;
         return false;
     }
 
     if (isProtocolWhitelisted(scheme))
         return true;
-    es.throwDOMException(SecurityError);
+    ec = SecurityError;
     return false;
 }
 
 NavigatorContentUtils* NavigatorContentUtils::from(Page* page)
 {
     return static_cast<NavigatorContentUtils*>(RefCountedSupplement<Page, NavigatorContentUtils>::from(page, NavigatorContentUtils::supplementName()));
 }
 
 NavigatorContentUtils::~NavigatorContentUtils()
 {
 }
 
 PassRefPtr<NavigatorContentUtils> NavigatorContentUtils::create(NavigatorContentUtilsClient* client)
 {
     return adoptRef(new NavigatorContentUtils(client));
 }
 
-void NavigatorContentUtils::registerProtocolHandler(Navigator* navigator, const String& scheme, const String& url, const String& title, ExceptionState& es)
+void NavigatorContentUtils::registerProtocolHandler(Navigator* navigator, const String& scheme, const String& url, const String& title, ExceptionCode& ec)
 {
     if (!navigator->frame())
         return;
 
     Document* document = navigator->frame()->document();
     if (!document)
         return;
 
     String baseURL = document->baseURL().baseAsString();
 
-    if (!verifyCustomHandlerURL(baseURL, url, es))
+    if (!verifyCustomHandlerURL(baseURL, url, ec))
         return;
 
-    if (!verifyProtocolHandlerScheme(scheme, es))
+    if (!verifyProtocolHandlerScheme(scheme, ec))
         return;
 
     NavigatorContentUtils::from(navigator->frame()->page())->client()->registerProtocolHandler(scheme, baseURL, url, navigator->frame()->displayStringModifiedByEncoding(title));
 }
 
 #if ENABLE(CUSTOM_SCHEME_HANDLER)
 static String customHandlersStateString(const NavigatorContentUtilsClient::CustomHandlersState state)
 {
     DEFINE_STATIC_LOCAL(const String, newHandler, (ASCIILiteral("new")));
     DEFINE_STATIC_LOCAL(const String, registeredHandler, (ASCIILiteral("registered")));
     DEFINE_STATIC_LOCAL(const String, declinedHandler, (ASCIILiteral("declined")));
 
     switch (state) {
     case NavigatorContentUtilsClient::CustomHandlersNew:
         return newHandler;
     case NavigatorContentUtilsClient::CustomHandlersRegistered:
         return registeredHandler;
     case NavigatorContentUtilsClient::CustomHandlersDeclined:
         return declinedHandler;
     }
 
     ASSERT_NOT_REACHED();
     return String();
 }
 
-String NavigatorContentUtils::isProtocolHandlerRegistered(Navigator* navigator, const String& scheme, const String& url, ExceptionState& es)
+String NavigatorContentUtils::isProtocolHandlerRegistered(Navigator* navigator, const String& scheme, const String& url, ExceptionCode& ec)
 {
     DEFINE_STATIC_LOCAL(const String, declined, ("declined"));
 
     if (!navigator->frame())
         return declined;
 
     Document* document = navigator->frame()->document();
     String baseURL = document->baseURL().baseAsString();
 
-    if (!verifyCustomHandlerURL(baseURL, url, es))
+    if (!verifyCustomHandlerURL(baseURL, url, ec))
         return declined;
 
-    if (!verifyProtocolHandlerScheme(scheme, es))
+    if (!verifyProtocolHandlerScheme(scheme, ec))
         return declined;
 
     return customHandlersStateString(NavigatorContentUtils::from(navigator->frame()->page())->client()->isProtocolHandlerRegistered(scheme, baseURL, url));
 }
 
-void NavigatorContentUtils::unregisterProtocolHandler(Navigator* navigator, const String& scheme, const String& url, ExceptionState& es)
+void NavigatorContentUtils::unregisterProtocolHandler(Navigator* navigator, const String& scheme, const String& url, ExceptionCode& ec)
 {
     if (!navigator->frame())
         return;
 
     Document* document = navigator->frame()->document();
     String baseURL = document->baseURL().baseAsString();
 
-    if (!verifyCustomHandlerURL(baseURL, url, es))
+    if (!verifyCustomHandlerURL(baseURL, url, ec))
         return;
 
-    if (!verifyProtocolHandlerScheme(scheme, es))
+    if (!verifyProtocolHandlerScheme(scheme, ec))
         return;
 
     NavigatorContentUtils::from(navigator->frame()->page())->client()->unregisterProtocolHandler(scheme, baseURL, url);
 }
 #endif
 
 const char* NavigatorContentUtils::supplementName()
 {
     return "NavigatorContentUtils";
 }
 
 void provideNavigatorContentUtilsTo(Page* page, NavigatorContentUtilsClient* client)
 {
     RefCountedSupplement<Page, NavigatorContentUtils>::provideTo(page, NavigatorContentUtils::supplementName(), NavigatorContentUtils::create(client));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(NAVIGATOR_CONTENT_UTILS)