Define default values for options dictionaries for WebAudio

third_party/WebKit/Source/modules/webaudio/OscillatorNode.cpp

 /*
  * Copyright (C) 2012, 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
@@ skipping 384 matching lines @@
 OscillatorNode* OscillatorNode::Create(BaseAudioContext* context,
                                        const OscillatorOptions& options,
                                        ExceptionState& exception_state) {
   OscillatorNode* node = Create(*context, exception_state);
 
   if (!node)
     return nullptr;
 
   node->HandleChannelOptions(options, exception_state);
 
-  if (options.hasType()) {
-    if (options.type() == "custom" && !options.hasPeriodicWave()) {
-      exception_state.ThrowDOMException(kInvalidStateError,
-                                        "'type' cannot be set to 'custom' "
-                                        "without also specifying "
-                                        "'periodicWave'");
-      return nullptr;
-    }
-    if (options.type() != "custom" && options.hasPeriodicWave()) {
-      exception_state.ThrowDOMException(
-          kInvalidStateError, "'type' MUST be 'custom' instead of '" +
-                                  options.type() +
-                                  "' if 'periodicWave' is also given");
-      return nullptr;
-    }
+  if (options.hasPeriodicWave()) {
+    // Set up the custom wave; this also sets the type to "custom",
+    // overriding any |type| option the user may have set.  Per spec.
+    node->setPeriodicWave(options.periodicWave());
+  } else {
+    node->setType(options.type(), exception_state);
+  }
 
-    // At this both type and periodicWave are consistently defined.  In that
-    // case, don't set the type if periodicWave is specified because that
-    // will cause an (incorrect) error to be signaled.
-    if (options.type() != "custom")
-      node->setType(options.type(), exception_state);
-  }
-  if (options.hasDetune())
-    node->detune()->setValue(options.detune());
-  if (options.hasFrequency())
-    node->frequency()->setValue(options.frequency());
-
-  if (options.hasPeriodicWave())
-    node->setPeriodicWave(options.periodicWave());
+  node->detune()->setValue(options.detune());
+  node->frequency()->setValue(options.frequency());
 
   return node;
 }
 
 DEFINE_TRACE(OscillatorNode) {
   visitor->Trace(frequency_);
   visitor->Trace(detune_);
   AudioScheduledSourceNode::Trace(visitor);
 }
 
@@ skipping 16 matching lines @@
 
 AudioParam* OscillatorNode::detune() {
   return detune_;
 }
 
 void OscillatorNode::setPeriodicWave(PeriodicWave* wave) {
   GetOscillatorHandler().SetPeriodicWave(wave);
 }
 
 }  // namespace blink