Drop in and sanitize optional declarations.

tools/dom/idl/dart/dart.idl

Index: tools/dom/idl/dart/dart.idl
diff --git a/tools/dom/idl/dart/dart.idl b/tools/dom/idl/dart/dart.idl
index 063501589f16c1e5cfa743bf09609b29d9246758..39034c35e406feced4f43242f2dee062ac1b807c 100644
--- a/tools/dom/idl/dart/dart.idl
+++ b/tools/dom/idl/dart/dart.idl
@@ -5,7 +5,7 @@
 interface AudioContext {
   // TODO(ager): Auto-generate this custom method when the info about retaining
   // typed arrays is in the IDL.
-  [Custom] void decodeAudioData(in ArrayBuffer audioData, in AudioBufferCallback successCallback, in AudioBufferCallback errorCallback);
+  [Custom] void decodeAudioData(ArrayBuffer audioData, AudioBufferCallback successCallback, AudioBufferCallback errorCallback);
 };
 
 [Supplemental]
@@ -19,13 +19,13 @@ interface WaveShaperNode {
 interface AudioParam {
   // TODO(ager): Auto-generate this custom method when the info about retaining
   // typed arrays is in the IDL.
-  [Custom] void setValueCurveAtTime(in Float32Array values, in float time, in float duration);
+  [Custom] void setValueCurveAtTime(Float32Array values, float time, float duration);
 };
 
 [Supplemental]
 interface Document {
-  [Suppressed] DOMObject getCSSCanvasContext(in DOMString contextId, in DOMString name, in long width, in long height);
-  CanvasRenderingContext getCSSCanvasContext(in DOMString contextId, in DOMString name, in long width, in long height);
+  [Suppressed] DOMObject getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
+  CanvasRenderingContext getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
 };
 
 [Supplemental]
@@ -51,21 +51,21 @@ interface TimeoutHandler {
 
 [Supplemental]
 interface CanvasRenderingContext2D {
-  [DartName=createImageDataFromImageData] ImageData createImageData(in ImageData imagedata);
+  [DartName=createImageDataFromImageData] ImageData createImageData(ImageData imagedata);
 };
 
 [Supplemental]
 interface Console {
-  [Suppressed] void assert(in boolean condition);
+  [Suppressed] void assert(boolean condition);
   [CallWith=ScriptArguments|ScriptState] void assertCondition(boolean condition);
 };
 
 interface HTMLCanvasElement {
-  [Suppressed] DOMString toDataURL([TreatNullAs=NullString, TreatUndefinedAs=NullString,Default=Undefined] in DOMString type);
-  [Custom] DOMString toDataURL([TreatNullAs=NullString, TreatUndefinedAs=NullString,Default=Undefined] in DOMString type, optional float quality);
+  [Suppressed] DOMString toDataURL([TreatNullAs=NullString, TreatUndefinedAs=NullString,Default=Undefined] DOMString type);
+  [Custom] DOMString toDataURL([TreatNullAs=NullString, TreatUndefinedAs=NullString,Default=Undefined] DOMString type, optional float quality);
 
-  [Suppressed] any getContext(in DOMString contextId);
-  [Custom] CanvasRenderingContext getContext(in DOMString contextId, optional Dictionary attrs);
+  [Suppressed] any getContext(DOMString contextId);
+  [Custom] CanvasRenderingContext getContext(DOMString contextId, optional Dictionary attrs);
 };
 
 [Supplemental]
@@ -75,7 +75,7 @@ interface HTMLOptionsCollection {
 
 [Supplemental]
 interface HTMLSelectElement {
-  [Suppressed] void add([Default=Undefined] in HTMLElement element, [Default=Undefined] in HTMLElement before);
+  [Suppressed] void add([Default=Undefined] HTMLElement element, [Default=Undefined] HTMLElement before);
   [Suppressed, Custom] void remove();
 };
 
@@ -121,25 +121,25 @@ interface WebGLContextEvent {
 [Supplemental]
 interface WebGLRenderingContext {
 
-  //void         compressedTexImage2D(in unsigned long target, in long level, in unsigned long internalformat, in unsigned long width, in unsigned long height, in long border, in unsigned long imageSize, const void* data);
-  //void         compressedTexSubImage2D(in unsigned long target, in long level, in long xoffset, in long yoffset, in unsigned long width, in unsigned long height, in unsigned long format, in unsigned long imageSize, const void* data);
+  //void         compressedTexImage2D(unsigned long target, long level, unsigned long internalformat, unsigned long width, unsigned long height, long border, unsigned long imageSize, const void* data);
+  //void         compressedTexSubImage2D(unsigned long target, long level, long xoffset, long yoffset, unsigned long width, unsigned long height, unsigned long format, unsigned long imageSize, const void* data);
 
-  [Custom] any getBufferParameter(in unsigned long target, in unsigned long pname);
+  [Custom] any getBufferParameter(unsigned long target, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getBufferParameter();
 
-  [Custom] any getFramebufferAttachmentParameter(in unsigned long target, in unsigned long attachment, in unsigned long pname);
+  [Custom] any getFramebufferAttachmentParameter(unsigned long target, unsigned long attachment, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getFramebufferAttachmentParameter();
 
-  [Custom] any getParameter(in unsigned long pname);
+  [Custom] any getParameter(unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getParameter();
 
-  [Custom] any getProgramParameter(in WebGLProgram program, in unsigned long pname);
+  [Custom] any getProgramParameter(WebGLProgram program, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getProgramParameter();
 
-  [Custom] any getRenderbufferParameter(in unsigned long target, in unsigned long pname);
+  [Custom] any getRenderbufferParameter(unsigned long target, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getRenderbufferParameter();
 
-  [Custom] any getShaderParameter(in WebGLShader shader, in unsigned long pname);
+  [Custom] any getShaderParameter(WebGLShader shader, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getShaderParameter();
 
   // TBD
@@ -150,19 +150,19 @@ interface WebGLRenderingContext {
   [Custom] DOMString[] getSupportedExtensions();
   [Suppressed, StrictTypeChecking, Custom] void getSupportedExtensions();
 
-  [Custom] any getTexParameter(in unsigned long target, in unsigned long pname);
+  [Custom] any getTexParameter(unsigned long target, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getTexParameter();
 
-  [Custom] any getUniform(in WebGLProgram program, in WebGLUniformLocation location);
+  [Custom] any getUniform(WebGLProgram program, WebGLUniformLocation location);
   [Suppressed, StrictTypeChecking, Custom] void getUniform();
 
-  [Custom] any getVertexAttrib(in unsigned long index, in unsigned long pname);
+  [Custom] any getVertexAttrib(unsigned long index, unsigned long pname);
   [Suppressed, StrictTypeChecking, Custom] void getVertexAttrib();
 };
 [Supplemental]
 interface CSSStyleDeclaration {
-  void setProperty(in DOMString propertyName, in DOMString value, [ForceOptional] optional DOMString priority);
-  [DartName=_getPropertyValue] DOMString getPropertyValue(in DOMString propertyName);
+  void setProperty(DOMString propertyName, DOMString value, [ForceOptional] optional DOMString priority);
+  [DartName=_getPropertyValue] DOMString getPropertyValue(DOMString propertyName);
 };
 
 // TODO(vsm): Define new names for these (see b/4436830).
@@ -185,17 +185,17 @@ interface IDBIndex {
 interface IDBDatabase {
   // These variants are slated for removal from WebKit.  Suppress to bring our
   // API in line with the most recent spec.
-  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList storeNames, in unsigned short mode);
-  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[] storeNames, in unsigned short mode);
-  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString storeName, in unsigned short mode);
+  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(DOMStringList storeNames, unsigned short mode);
+  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(DOMString[] storeNames, unsigned short mode);
+  [Suppressed, CallWith=ScriptExecutionContext] IDBTransaction transaction(DOMString storeName, unsigned short mode);
 };
 
 [Supplemental]
 interface IDBKeyRange {
-  [DartName=only_] static IDBKeyRange only(in any value);
-  [DartName=lowerBound_] static IDBKeyRange lowerBound(in any bound, [ForceOptional] optional boolean open);
-  [DartName=upperBound_] static IDBKeyRange upperBound(in any bound, [ForceOptional] optional boolean open);
-  [DartName=bound_] static IDBKeyRange bound(in any lower, in any upper, [ForceOptional] optional boolean lowerOpen, [ForceOptional] optional boolean upperOpen);
+  [DartName=only_] static IDBKeyRange only(any value);
+  [DartName=lowerBound_] static IDBKeyRange lowerBound(any bound, [ForceOptional] optional boolean open);
+  [DartName=upperBound_] static IDBKeyRange upperBound(any bound, [ForceOptional] optional boolean open);
+  [DartName=bound_] static IDBKeyRange bound(any lower, any upper, [ForceOptional] optional boolean lowerOpen, [ForceOptional] optional boolean upperOpen);
 };
 [Supplemental]
 interface IDBObjectStore {
@@ -216,7 +216,7 @@ interface EntrySync {
 
 [Supplemental,
   CustomConstructor,
-  Constructor(in Array blobParts, optional DOMString type, optional DOMString endings)
+  Constructor(Array blobParts, optional DOMString type, optional DOMString endings)
   ]
 interface Blob {
 };
@@ -239,7 +239,7 @@ interface SVGNumber {
 [
   Callback
 ] interface MutationCallback {
-  [Custom] boolean handleEvent(in MutationRecordArray mutations, in MutationObserver observer);
+  [Custom] boolean handleEvent(MutationRecordArray mutations, MutationObserver observer);
 };
 
 [Supplemental,
@@ -249,7 +249,7 @@ interface SVGNumber {
 interface MutationObserver {
   // Rename 'observe' so we can define a new 'observe' API that calls the
   // original.
-  [DartName=_observe] void observe(in Node target, in Dictionary options);
+  [DartName=_observe] void observe(Node target, Dictionary options);
 };
 
   [Supplemental,
@@ -257,27 +257,27 @@ interface MutationObserver {
     // Provide missing constructor signature.
     Constructor(optional HTMLFormElement form)]
   interface DOMFormData {
-    [Suppressed] void append(in DOMString name, in DOMString value, in DOMString filename);
-    [Custom] void append(in DOMString name, in DOMString value);
-    [Custom] void append(in DOMString name, in Blob value, optional DOMString filename);
+    [Suppressed] void append(DOMString name, DOMString value, DOMString filename);
+    [Custom] void append(DOMString name, DOMString value);
+    [Custom] void append(DOMString name, Blob value, optional DOMString filename);
   };
 
 [Supplemental]
 interface SQLResultSetRowList {
   // Change the return type to Dictionary so that rows are exposed in the Dart
   // API as a Maps, with the appropriate conversion in JavaScript.
-  [Suppressed] any item(in unsigned long index);
-  [Custom] Dictionary item(in unsigned long index);
+  [Suppressed] any item(unsigned long index);
+  [Custom] Dictionary item(unsigned long index);
 };
 
 [Supplemental]
 interface WebSocket {
   // Suppress the default since it has non-standard return type and add
   // overrides.
-  [Suppressed] boolean send(in ArrayBuffer data);
-  [Suppressed] boolean send(in ArrayBufferView data);
-  [Suppressed] boolean send(in Blob data);
-  [Suppressed] boolean send(in DOMString data);
+  [Suppressed] boolean send(ArrayBuffer data);
+  [Suppressed] boolean send(ArrayBufferView data);
+  [Suppressed] boolean send(Blob data);
+  [Suppressed] boolean send(DOMString data);
 
   [Custom] void send(DOMString data);
   [Custom] void send(Blob data);
@@ -288,12 +288,12 @@ interface WebSocket {
 [Supplemental]
 interface XMLHttpRequest {
    [Custom] void send();
-   [Custom] void send(in ArrayBuffer data); // FIXME: this should be eventually deprecated.
-   [Custom] void send(in ArrayBufferView data);
-   [Custom] void send(in Blob data);
-   [Custom] void send(in Document data);
-   [Custom] void send([StrictTypeChecking] in DOMString data);
-   [Custom] void send(in DOMFormData data);
+   [Custom] void send(ArrayBuffer data); // FIXME: this should be eventually deprecated.
+   [Custom] void send(ArrayBufferView data);
+   [Custom] void send(Blob data);
+   [Custom] void send(Document data);
+   [Custom] void send([StrictTypeChecking] DOMString data);
+   [Custom] void send(DOMFormData data);
 };