mcHammer merge DOMWindow.idl ENABLE_DATABASE

webkit/port/page/DOMWindow.idl

Index: webkit/port/page/DOMWindow.idl
===================================================================
--- webkit/port/page/DOMWindow.idl	(revision 4816)
+++ webkit/port/page/DOMWindow.idl	(working copy)
@@ -143,7 +143,8 @@
 #if ENABLE_OFFLINE_WEB_APPLICATIONS
         readonly attribute DOMApplicationCache applicationCache;
 #endif    
-#if ENABLE_DATABASE
+#if 0 && ENABLE_DATABASE
+        // Temporarily disabled until database binding support for v8 is up to snuff
         Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize)
             raises(DOMException);
 #endif
Property changes on: webkit/port/page/DOMWindow.idl
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/port/page/DOMWindow.idl:r3734-4217
   Merged /trunk/src/webkit/port/page/DOMWindow.idl:r4618