From 06ea8e899e48f1f2f396b70e63fae369f2f23232 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Mon, 28 Jun 2010 16:42:48 +0100
Subject: Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
---
 WebCore/html/canvas/Int16Array.idl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'WebCore/html/canvas/Int16Array.idl')

diff --git a/WebCore/html/canvas/Int16Array.idl b/WebCore/html/canvas/Int16Array.idl
index 95c8204..095611b 100644
--- a/WebCore/html/canvas/Int16Array.idl
+++ b/WebCore/html/canvas/Int16Array.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2010 Apple Computer, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,10 +26,12 @@
 module html {
     interface [
         Conditional=3D_CANVAS,
+        CanBeConstructed,
+        CustomConstructFunction,
+        V8CustomConstructor,
         HasNumericIndexGetter,
         HasCustomIndexSetter,
         GenerateNativeConverter,
-        CustomConstructor,
         CustomToJS
     ] Int16Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 2;
-- 
cgit v1.1