webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 46 insertions, 45 deletions

diff --git a/Source/WebCore/css/WebKitCSSMatrix.idl b/Source/WebCore/css/WebKitCSSMatrix.idl
index 9b602a84f..b8d5f326a 100644
--- a/Source/WebCore/css/WebKitCSSMatrix.idl
+++ b/Source/WebCore/css/WebKitCSSMatrix.idl
@@ -23,81 +23,82 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-// Introduced in DOM Level ?:
 [
-    Constructor([Default=NullString] optional DOMString cssValue),
-    ConstructorRaisesException,
+    Constructor(optional DOMString cssValue),
+    ConstructorMayThrowException,
+    ImplementationLacksVTable,
 ] interface WebKitCSSMatrix {
 
     // These attributes are simple aliases for certain elements of the 4x4 matrix
-    attribute double a; // alias for m11
-    attribute double b; // alias for m12
-    attribute double c; // alias for m21
-    attribute double d; // alias for m22
-    attribute double e; // alias for m41
-    attribute double f; // alias for m42
+    attribute unrestricted double a; // alias for m11
+    attribute unrestricted double b; // alias for m12
+    attribute unrestricted double c; // alias for m21
+    attribute unrestricted double d; // alias for m22
+    attribute unrestricted double e; // alias for m41
+    attribute unrestricted double f; // alias for m42
 
-    attribute double m11;
-    attribute double m12;
-    attribute double m13;
-    attribute double m14;
-    attribute double m21;
-    attribute double m22;
-    attribute double m23;
-    attribute double m24;
-    attribute double m31;
-    attribute double m32;
-    attribute double m33;
-    attribute double m34;
-    attribute double m41;
-    attribute double m42;
-    attribute double m43;
-    attribute double m44;
+    attribute unrestricted double m11;
+    attribute unrestricted double m12;
+    attribute unrestricted double m13;
 
-    [RaisesException] void setMatrixValue([Default=Undefined] optional DOMString string);
+    attribute unrestricted double m14;
+    attribute unrestricted double m21;
+    attribute unrestricted double m22;
+    attribute unrestricted double m23;
+    attribute unrestricted double m24;
+    attribute unrestricted double m31;
+    attribute unrestricted double m32;
+    attribute unrestricted double m33;
+    attribute unrestricted double m34;
+    attribute unrestricted double m41;
+    attribute unrestricted double m42;
+    attribute unrestricted double m43;
+    attribute unrestricted double m44;
+
+    // FIXME: Using "undefined" as default parameter value is wrong.
+    [MayThrowException] void setMatrixValue(optional DOMString string = "undefined");
     
     // Multiply this matrix by secondMatrix, on the right (result = this * secondMatrix)
-    [Immutable] WebKitCSSMatrix multiply([Default=Undefined] optional WebKitCSSMatrix secondMatrix);
+    [Immutable] WebKitCSSMatrix multiply(optional WebKitCSSMatrix? secondMatrix = null);
     
     // Return the inverse of this matrix. Throw an exception if the matrix is not invertible
-    [Immutable, RaisesException] WebKitCSSMatrix inverse();
+    [Immutable, MayThrowException] WebKitCSSMatrix inverse();
     
     // Return this matrix translated by the passed values.
-    // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D operations    
-    [Immutable] WebKitCSSMatrix translate([Default=Undefined] optional double x, 
-                                          [Default=Undefined] optional double y, 
-                                          [Default=Undefined] optional double z);
+    // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D operations
+    [Immutable] WebKitCSSMatrix translate(optional unrestricted double x = NaN,
+                                          optional unrestricted double y = NaN,
+                                          optional unrestricted double z = NaN);
     
     // Returns this matrix scaled by the passed values.
     // Passing scaleX or scaleZ as NaN uses a value of 1, but passing scaleY of NaN 
     // makes it the same as scaleX. This allows the 3D form to used for 2D operations
-    [Immutable] WebKitCSSMatrix scale([Default=Undefined] optional double scaleX, 
-                                      [Default=Undefined] optional double scaleY, 
-                                      [Default=Undefined] optional double scaleZ);
+    [Immutable] WebKitCSSMatrix scale(optional unrestricted double scaleX = NaN,
+                                      optional unrestricted double scaleY = NaN,
+                                      optional unrestricted double scaleZ = NaN);
     
     // Returns this matrix rotated by the passed values.
     // If rotY and rotZ are NaN, rotate about Z (rotX=0, rotateY=0, rotateZ=rotX).
     // Otherwise use a rotation value of 0 for any passed NaN.    
-    [Immutable] WebKitCSSMatrix rotate([Default=Undefined] optional double rotX, 
-                                       [Default=Undefined] optional double rotY, 
-                                       [Default=Undefined] optional double rotZ);
+    [Immutable] WebKitCSSMatrix rotate(optional unrestricted double rotX = NaN,
+                                       optional unrestricted double rotY = NaN,
+                                       optional unrestricted double rotZ = NaN);
     
     // Returns this matrix rotated about the passed axis by the passed angle.
     // Passing a NaN will use a value of 0. If the axis is (0,0,0) use a value
     // of (0,0,1).
-    [Immutable] WebKitCSSMatrix rotateAxisAngle([Default=Undefined] optional double x, 
-                                                [Default=Undefined] optional double y, 
-                                                [Default=Undefined] optional double z, 
-                                                [Default=Undefined] optional double angle);
+    [Immutable] WebKitCSSMatrix rotateAxisAngle(optional unrestricted double x = NaN,
+                                                optional unrestricted double y = NaN,
+                                                optional unrestricted double z = NaN,
+                                                optional unrestricted double angle = NaN);
 
     // Returns this matrix skewed along the X axis by the passed values.
     // Passing a NaN will use a value of 0.
-    [Immutable] WebKitCSSMatrix skewX([Default=Undefined] optional double angle);
+    [Immutable] WebKitCSSMatrix skewX(optional unrestricted double angle = NaN);
 
     // Returns this matrix skewed along the Y axis by the passed values.
     // Passing a NaN will use a value of 0.
-    [Immutable] WebKitCSSMatrix skewY([Default=Undefined] optional double angle);
+    [Immutable] WebKitCSSMatrix skewY(optional unrestricted double angle = NaN);
 
     [NotEnumerable] DOMString toString();
 };
-