Converted IDBVersionChangeEvent.dataLoss to an enumeration: IDBDataLossAmount

Source/modules/indexeddb/IDBVersionChangeEvent.cpp

 /*
  * Copyright (C) 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:
  *
  * 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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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/indexeddb/IDBVersionChangeEvent.h"
 
-#include "bindings/modules/v8/IDBBindingUtilities.h"
-
 namespace WebCore {
 
 
 IDBVersionChangeEventInit::IDBVersionChangeEventInit()
     : oldVersion(0)
 {
 }
 
 IDBVersionChangeEvent::IDBVersionChangeEvent()
     : m_dataLoss(blink::WebIDBDataLossNone)
@@ skipping 10 matching lines @@
 {
     ScriptWrappable::init(this);
 }
 
 IDBVersionChangeEvent::IDBVersionChangeEvent(const AtomicString& eventType, const IDBVersionChangeEventInit& initializer)
     : Event(eventType, false /*canBubble*/, false /*cancelable*/)
     , m_oldVersion(initializer.oldVersion)
     , m_newVersion(initializer.newVersion)
     , m_dataLoss(blink::WebIDBDataLossNone)
 {
+    if (initializer.dataLoss.isEmpty() || initializer.dataLoss == "none")
+        m_dataLoss = blink::WebIDBDataLossNone;
+    else if (initializer.dataLoss == "total")
+        m_dataLoss = blink::WebIDBDataLossTotal;
+    else
+        ASSERT_NOT_REACHED(); // Should have been validated by the bindings

[jsbell, 2014/07/16 22:48:36]

Is this actually enforced by the bindings now? (I didn't think we quite had
Dictionary/enum support together - if so, awesome!)

Can you add in a test case that passes an invalid value and ensure the event
constructor throws?

[bashi, 2014/07/17 01:47:57]

IIUC, the bindings checks whether the value is valid.
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

[cmumford, 2014/07/17 17:14:24]

Not checked - That's my follow-up change (crbug.com/358067). I've removed the
assertion, and will re-add it later.

     ScriptWrappable::init(this);
 }
 
 unsigned long long IDBVersionChangeEvent::newVersion(bool& isNull) const
 {
     isNull = m_newVersion.isNull();
     return isNull ? 0 : m_newVersion.get();
 }
 
 const AtomicString& IDBVersionChangeEvent::dataLoss() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, total, ("total", AtomicString::ConstructFromLiteral));
     if (m_dataLoss == blink::WebIDBDataLossTotal)
         return total;
     DEFINE_STATIC_LOCAL(AtomicString, none, ("none", AtomicString::ConstructFromLiteral));
     return none;
 }
 
 const AtomicString& IDBVersionChangeEvent::interfaceName() const
 {
     return EventNames::IDBVersionChangeEvent;
 }
 
 void IDBVersionChangeEvent::trace(Visitor* visitor)
 {
     Event::trace(visitor);
 }
 
 } // namespace WebCore