Code drop from //branches/cupcake/...@124589

71 files changed, 913 insertions, 1946 deletions

diff --git a/WebKit/win/Interfaces/DOMCSS.idl b/WebKit/win/Interfaces/DOMCSS.idl
index 914f9ff..3727018 100644
--- a/WebKit/win/Interfaces/DOMCSS.idl
+++ b/WebKit/win/Interfaces/DOMCSS.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
 import "IWebScriptObject.idl";
+#endif
 
 interface IDOMObject;
 interface IDOMCSSValue;
diff --git a/WebKit/win/Interfaces/DOMCore.idl b/WebKit/win/Interfaces/DOMCore.idl
index a00acd2..09f61fb 100644
--- a/WebKit/win/Interfaces/DOMCore.idl
+++ b/WebKit/win/Interfaces/DOMCore.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebScriptObject.idl";
+#endif
 
 interface IWebScriptObject;
 interface IDOMNodeList;
diff --git a/WebKit/win/Interfaces/DOMEvents.idl b/WebKit/win/Interfaces/DOMEvents.idl
index 87bd0cd..3ff7fce 100644
--- a/WebKit/win/Interfaces/DOMEvents.idl
+++ b/WebKit/win/Interfaces/DOMEvents.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
 import "DOMWindow.idl";
+#endif
 
 interface IDOMEvent;
 interface IDOMEventException;
@@ -59,9 +36,11 @@ interface IDOMEventTarget;
 interface IDOMKeyboardEvent;
 interface IDOMMouseEvent;
 interface IDOMMutationEvent;
+interface IDOMNode;
 interface IDOMOverflowEvent;
 interface IDOMUIEvent;
 interface IDOMWheelEvent;
+interface IDOMWindow;
 
 typedef long long DOMTimeStamp;
 
diff --git a/WebKit/win/Interfaces/DOMExtensions.idl b/WebKit/win/Interfaces/DOMExtensions.idl
index b0f510a..83c26d7 100644
--- a/WebKit/win/Interfaces/DOMExtensions.idl
+++ b/WebKit/win/Interfaces/DOMExtensions.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/DOMHTML.idl b/WebKit/win/Interfaces/DOMHTML.idl
index 57fc947..6c276aa 100644
--- a/WebKit/win/Interfaces/DOMHTML.idl
+++ b/WebKit/win/Interfaces/DOMHTML.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
+#endif
 
 interface IDOMHTMLElement;
 interface IDOMHTMLFormElement;
@@ -58,6 +35,8 @@ interface IDOMHTMLTableCaptionElement;
 interface IDOMHTMLTableSectionElement;
 interface IDOMDocument;
 interface IDOMElement;
+interface IDOMNode;
+interface IDOMNodeList;
 
 /*
     @interface DOMHTMLCollection : DOMObject
diff --git a/WebKit/win/Interfaces/DOMPrivate.idl b/WebKit/win/Interfaces/DOMPrivate.idl
index f7da64b..dcacac2 100644
--- a/WebKit/win/Interfaces/DOMPrivate.idl
+++ b/WebKit/win/Interfaces/DOMPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
+#endif
+
+interface IDOMElement;
 
 typedef struct WebFontDescription WebFontDescription;
 
diff --git a/WebKit/win/Interfaces/DOMRange.idl b/WebKit/win/Interfaces/DOMRange.idl
index 6ae6f53..58dd54d 100644
--- a/WebKit/win/Interfaces/DOMRange.idl
+++ b/WebKit/win/Interfaces/DOMRange.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
+#endif
+
+interface IDOMNode;
+interface IDOMDocumentFragment;
 
 typedef enum _WebSelectionAffinity {
    WebSelectionAffinityUpstream = 0,
diff --git a/WebKit/win/Interfaces/DOMWindow.idl b/WebKit/win/Interfaces/DOMWindow.idl
index 1484d90..6c24811 100755
--- a/WebKit/win/Interfaces/DOMWindow.idl
+++ b/WebKit/win/Interfaces/DOMWindow.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,37 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMCore.idl";
 import "DOMCSS.idl";
+#endif
 
 interface IDOMCSSRuleList;
+interface IDOMDocument;
+interface IDOMElement;
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IGEN_DOMObject.idl b/WebKit/win/Interfaces/IGEN_DOMObject.idl
index f403458..a1efbf4 100644
--- a/WebKit/win/Interfaces/IGEN_DOMObject.idl
+++ b/WebKit/win/Interfaces/IGEN_DOMObject.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebArchive.idl b/WebKit/win/Interfaces/IWebArchive.idl
index 7c47c4e..3168467 100644
--- a/WebKit/win/Interfaces/IWebArchive.idl
+++ b/WebKit/win/Interfaces/IWebArchive.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+import "DOMCore.idl";
 import "IWebResource.idl";
+#endif
 
 interface IWebResource;
 
@@ -88,6 +66,15 @@ interface IWebArchive : IUnknown
         - (id)initWithData:(NSData *)data;
     */
     HRESULT initWithData([in] IStream* data);
+    
+    /*!
+        @method initWithData:
+        @abstract The initializer for creating a WebArchive from data.
+        @param data The data representing the archive. This can be obtained using WebArchive's data method.
+        @result An initialized WebArchive.
+        - (id)initWithData:(NSData *)data;
+    */
+    HRESULT initWithNode([in] IDOMNode* node);
 
     /*!
         @method mainResource
diff --git a/WebKit/win/Interfaces/IWebBackForwardList.idl b/WebKit/win/Interfaces/IWebBackForwardList.idl
index e5da2f6..83d4cfb 100644
--- a/WebKit/win/Interfaces/IWebBackForwardList.idl
+++ b/WebKit/win/Interfaces/IWebBackForwardList.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebHistoryItem.idl";
+#endif
 
 interface IWebHistoryItem;
 
diff --git a/WebKit/win/Interfaces/IWebBackForwardListPrivate.idl b/WebKit/win/Interfaces/IWebBackForwardListPrivate.idl
index a765c4b..a9c14f3 100755
--- a/WebKit/win/Interfaces/IWebBackForwardListPrivate.idl
+++ b/WebKit/win/Interfaces/IWebBackForwardListPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple, Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebHistoryItem.idl";
+#endif
 
 interface IWebHistoryItem;
 
diff --git a/WebKit/win/Interfaces/IWebCache.idl b/WebKit/win/Interfaces/IWebCache.idl
index 4532711..3d2bf14 100644
--- a/WebKit/win/Interfaces/IWebCache.idl
+++ b/WebKit/win/Interfaces/IWebCache.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebCookieManager.idl b/WebKit/win/Interfaces/IWebCookieManager.idl
new file mode 100644
index 0000000..1c87ec0
--- /dev/null
+++ b/WebKit/win/Interfaces/IWebCookieManager.idl
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2008 Apple 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
+
+cpp_quote("// this is done to get midl to treat the CFHTTPCookieStorageRef as pointer types")
+cpp_quote("#if 0")
+typedef void* CFHTTPCookieStorageRef;
+cpp_quote("#else")
+cpp_quote("typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;")
+cpp_quote("#endif")
+
+interface IWebCookieStorageObserver;
+
+[
+    object,
+    oleautomation,
+    hidden,
+    uuid(7053FE94-3623-444f-A298-209A90879A8C),
+    pointer_default(unique)
+]
+interface IWebCookieManager : IUnknown
+{
+    [local] HRESULT cookieStorage([out, retval] CFHTTPCookieStorageRef* storage);
+
+    [local] HRESULT setCookieStorage([in] CFHTTPCookieStorageRef storage);
+}
diff --git a/WebKit/win/Interfaces/IWebCoreStatistics.idl b/WebKit/win/Interfaces/IWebCoreStatistics.idl
new file mode 100644
index 0000000..0001a10
--- /dev/null
+++ b/WebKit/win/Interfaces/IWebCoreStatistics.idl
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2008 Apple 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
+
+[
+    object,
+    oleautomation,
+    hidden,
+    uuid(9607001D-6EEF-4c2c-AD22-94E9DA587973),
+    pointer_default(unique)
+]
+interface IWebCoreStatistics : IUnknown
+{
+    HRESULT javaScriptObjectsCount([out, retval] UINT* count);
+    HRESULT javaScriptGlobalObjectsCount([out, retval] UINT* count);
+    HRESULT javaScriptProtectedObjectsCount([out, retval] UINT* count);
+    HRESULT javaScriptProtectedGlobalObjectsCount([out, retval] UINT* count);
+
+    HRESULT iconPageURLMappingCount([out, retval] UINT* count);
+    HRESULT iconRetainedPageURLCount([out, retval] UINT* count);
+    HRESULT iconRecordCount([out, retval] UINT* count);
+    HRESULT iconsWithDataCount([out, retval] UINT* count);
+
+    HRESULT cachedFontDataCount([out, retval] UINT* count);
+    HRESULT cachedFontDataInactiveCount([out, retval] UINT* count);
+    HRESULT purgeInactiveFontData();
+    HRESULT glyphPageCount([out, retval] UINT* count);
+
+    HRESULT javaScriptProtectedObjectTypeCounts([out, retval] IPropertyBag2** typeNamesAndCounts);
+}
diff --git a/WebKit/win/Interfaces/IWebDataSource.idl b/WebKit/win/Interfaces/IWebDataSource.idl
index 0e27153..15bea1a 100644
--- a/WebKit/win/Interfaces/IWebDataSource.idl
+++ b/WebKit/win/Interfaces/IWebDataSource.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebMutableURLRequest.idl";
@@ -56,7 +32,7 @@ import "IWebResource.idl";
 import "IWebArchive.idl";
 import "IWebDocument.idl";
 import "IWebFrame.idl";
-
+#endif
 
 interface IWebMutableURLRequest;
 interface IWebURLConnection;
@@ -64,6 +40,7 @@ interface IWebURLRequest;
 interface IWebURLResponse;
 interface IWebArchive;
 interface IWebDataSourcePrivate;
+interface IWebError;
 interface IWebFrame;
 interface IWebResource;
 
diff --git a/WebKit/win/Interfaces/IWebDatabaseManager.idl b/WebKit/win/Interfaces/IWebDatabaseManager.idl
index e1ebc82..c877c03 100644
--- a/WebKit/win/Interfaces/IWebDatabaseManager.idl
+++ b/WebKit/win/Interfaces/IWebDatabaseManager.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
+
+interface IWebSecurityOrigin;
 
 cpp_quote("#define WebDatabaseDisplayNameKey TEXT(\"WebDatabaseDisplayNameKey\")")
 cpp_quote("#define WebDatabaseExpectedSizeKey TEXT(\"WebDatabaseExpectedSizeKey\")")
@@ -59,7 +38,9 @@ cpp_quote("#define WebDatabaseDidModifyOriginNotification TEXT(\"WebDatabaseDidM
 cpp_quote("#define WebDatabaseDidModifyDatabaseNotification TEXT(\"WebDatabaseDidModifyDatabaseNotification\")")
 cpp_quote("#define WebDatabaseNameKey TEXT(\"WebDatabaseNameKey\")")
 
+#ifndef DO_NO_IMPORTS
 import "IWebSecurityOrigin.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebDocument.idl b/WebKit/win/Interfaces/IWebDocument.idl
index c9dd0fb..24097ce 100644
--- a/WebKit/win/Interfaces/IWebDocument.idl
+++ b/WebKit/win/Interfaces/IWebDocument.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,36 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebError.idl";
 import "IWebDataSource.idl";
-import "IWebError.idl";
+#endif
 
 interface IWebError;
 interface IWebDataSource;
diff --git a/WebKit/win/Interfaces/IWebDownload.idl b/WebKit/win/Interfaces/IWebDownload.idl
index bdbcc66..eb644ef 100644
--- a/WebKit/win/Interfaces/IWebDownload.idl
+++ b/WebKit/win/Interfaces/IWebDownload.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *               2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,32 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *               2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebError.idl";
@@ -57,8 +32,15 @@ import "IWebMutableURLRequest.idl";
 import "IWebURLAuthenticationChallenge.idl";
 import "IWebURLResponse.idl";
 import "IWebURLRequest.idl";
+#endif
 
 interface IWebDownloadDelegate;
+interface IWebError;
+interface IWebMutableURLRequest;
+interface IWebURLAuthenticationChallenge;
+interface IWebURLRequest;
+interface IWebURLResponse;
+
 /*!
     @class WebDownload
     @discussion A WebDownload works just like an NSURLDownload, with
diff --git a/WebKit/win/Interfaces/IWebEditingDelegate.idl b/WebKit/win/Interfaces/IWebEditingDelegate.idl
index 6350178..b92aad2 100644
--- a/WebKit/win/Interfaces/IWebEditingDelegate.idl
+++ b/WebKit/win/Interfaces/IWebEditingDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebNotification.idl";
@@ -56,11 +32,14 @@ import "DOMCSS.idl";
 import "DOMRange.idl";
 import "IWebUndoManager.idl";
 import "IWebView.idl";
+#endif
 
 interface IDOMCSSStyleDeclaration;
+interface IDOMNode;
 interface IDOMRange;
 interface IWebView;
 interface IWebNotification;
+interface IWebUndoManager;
 
 typedef enum _WebViewInsertAction {
     WebViewInsertActionTyped,
diff --git a/WebKit/win/Interfaces/IWebEmbeddedView.idl b/WebKit/win/Interfaces/IWebEmbeddedView.idl
new file mode 100644
index 0000000..0a65ff7
--- /dev/null
+++ b/WebKit/win/Interfaces/IWebEmbeddedView.idl
@@ -0,0 +1,41 @@
+/*

+ * Copyright (C) 2008 Apple 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

+ *    documentation and/or other materials provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

+ */

+

+

+#ifndef DO_NO_IMPORTS

+import "oaidl.idl";

+import "ocidl.idl";

+#endif

+

+[

+    object,

+    oleautomation,

+    uuid(F2771780-84C2-4684-8D52-D4F923E67F71),

+    pointer_default(unique)

+]

+interface IWebEmbeddedView : IUnknown

+{

+    HRESULT createViewWindow([in] OLE_HANDLE parentWindow, [in] LPSIZE pluginSize, [out, retval] OLE_HANDLE* window);

+}

diff --git a/WebKit/win/Interfaces/IWebError.idl b/WebKit/win/Interfaces/IWebError.idl
index f8dfe93..4353ac6 100644
--- a/WebKit/win/Interfaces/IWebError.idl
+++ b/WebKit/win/Interfaces/IWebError.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("#define WebURLErrorDomain TEXT(\"CFURLErrorDomain\")")
 /*!
     @enum NSURL-related Error Codes
@@ -82,6 +57,7 @@ enum
     WebURLErrorServerCertificateHasUnknownRoot = -1203,
     WebURLErrorServerCertificateNotYetValid =    -1204,
     WebURLErrorClientCertificateRejected =       -1205,
+    WebURLErrorClientCertificateRequired =       -1206,
     WebURLErrorCannotLoadFromNetwork =           -2000,
 
     // Download and file I/O errors
@@ -130,8 +106,10 @@ cpp_quote("#define WebKitErrorPlugInPageURLStringKey TEXT(\"WebKitErrorPlugInPag
 cpp_quote("#define WebPOSIXErrorDomain TEXT(\"NSPOSIXErrorDomain\")")
 cpp_quote("#define WebPOSIXErrorECONNRESET 54")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebErrorPrivate.idl b/WebKit/win/Interfaces/IWebErrorPrivate.idl
index e314804..d450c88 100644
--- a/WebKit/win/Interfaces/IWebErrorPrivate.idl
+++ b/WebKit/win/Interfaces/IWebErrorPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,39 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("#define WebKitErrorPlugInCancelledConnection 203")
 cpp_quote("// FIXME: WebKitErrorPlugInWillHandleLoad is used for the cancel we do to prevent loading plugin content twice.  See <rdar://problem/4258008>")
 cpp_quote("#define WebKitErrorPlugInWillHandleLoad 204")
 
 cpp_quote("#define WebErrorFailingURLKey TEXT(\"WebErrorFailingURLKey\")")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebFormDelegate.idl b/WebKit/win/Interfaces/IWebFormDelegate.idl
index 8ac79ca..bf103c4 100644
--- a/WebKit/win/Interfaces/IWebFormDelegate.idl
+++ b/WebKit/win/Interfaces/IWebFormDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMHTML.idl";
 import "IWebFrame.idl";
+#endif
+
+interface IDOMElement;
+interface IDOMHTMLInputElement;
+interface IDOMHTMLTextAreaElement;
+interface IWebFrame;
 
 /*!
     @protocol  WebFormSubmissionListener
diff --git a/WebKit/win/Interfaces/IWebFrame.idl b/WebKit/win/Interfaces/IWebFrame.idl
index cc8e1bb..30af7b9 100644
--- a/WebKit/win/Interfaces/IWebFrame.idl
+++ b/WebKit/win/Interfaces/IWebFrame.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "DOMHTML.idl";
@@ -56,6 +32,7 @@ import "IWebFrameView.idl";
 import "IWebView.idl";
 import "IWebURLRequest.idl";
 import "DOMCore.idl";
+#endif
 
 cpp_quote("// this is done to get midl to treat the JavaScriptCore API types as pointer types")
 cpp_quote("#if 0")
@@ -65,6 +42,7 @@ cpp_quote("typedef struct OpaqueJSContext* JSGlobalContextRef;")
 cpp_quote("#endif")
 
 interface IDOMDocument;
+interface IDOMElement;
 interface IDOMHTMLElement;
 interface IWebURLRequest;
 interface IWebArchive;
@@ -262,4 +240,18 @@ interface IWebFrame : IUnknown
         bridge between the WebKit and JavaScriptCore APIs.
     */
    [local] JSGlobalContextRef globalContext();
+
+   /*!
+        @method setIsDisconnected
+        @abstract Set whether a frame is disconnected
+        @param flag YES to mark the frame as disconnected, NO keeps it a regular frame
+   */
+   HRESULT setIsDisconnected([in] BOOL flag);
+
+      /*!
+        @method setExcludeFromTextSearch
+        @abstract Set whether a frame should be excluded from text search
+        @param flag YES to mark the frame as not searchable
+   */
+   HRESULT setExcludeFromTextSearch([in] BOOL flag);
 }
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
index e191ca0..b46ca6d 100644
--- a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
+++ b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,36 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebScriptObject.idl";
 import "IWebView.idl";
 import "IWebFrame.idl";
+#endif
 
 cpp_quote("// this is done to get midl to treat the JavaScriptCore API types as pointer types")
 cpp_quote("#if 0")
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
index 6b14eba..79707a3 100644
--- a/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFrameLoadDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,36 +23,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
-
 import "IWebFrame.idl";
 import "IWebView.idl";
+#endif
+
+interface IWebFrame;
+interface IWebView;
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index c986665..bd7c0b6 100755
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebFrame.idl";
+#endif
+
+interface IWebFrame;
+interface IWebIconFetcher;
+interface IWebIconFetcherDelegate;
 
 typedef enum {
     WebFrameLoadTypeStandard,
@@ -94,4 +75,12 @@ interface IWebFramePrivate : IUnknown
     HRESULT frameBounds([out, retval] RECT* result);
 
     HRESULT isDescendantOfFrame([in] IWebFrame* ancestor, [out, retval] BOOL* result);
+
+    HRESULT pendingFrameUnloadEventCount([out, retval] UINT* result);
+
+    HRESULT fetchApplicationIcon([in] IWebIconFetcherDelegate* delegate, [out, retval] IWebIconFetcher** result);
+
+    HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE deviceContext);
+
+    HRESULT elementDoesAutoComplete([in] IDOMElement* element, [out, retval] BOOL* result);
 }
diff --git a/WebKit/win/Interfaces/IWebFrameView.idl b/WebKit/win/Interfaces/IWebFrameView.idl
index 4aa2591..d5c82a1 100644
--- a/WebKit/win/Interfaces/IWebFrameView.idl
+++ b/WebKit/win/Interfaces/IWebFrameView.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebDocument.idl";
+#endif
 
 /*!
     @class WebFrameView
diff --git a/WebKit/win/Interfaces/IWebHTMLRepresentation.idl b/WebKit/win/Interfaces/IWebHTMLRepresentation.idl
index 2caae04..7fbd451 100644
--- a/WebKit/win/Interfaces/IWebHTMLRepresentation.idl
+++ b/WebKit/win/Interfaces/IWebHTMLRepresentation.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
-
 import "DOMCore.idl";
+#endif
+
+interface IDOMElement;
+interface IDOMNode;
 
 /*!
     @class WebHTMLRepresentation
diff --git a/WebKit/win/Interfaces/IWebHTTPURLResponse.idl b/WebKit/win/Interfaces/IWebHTTPURLResponse.idl
index ee717a6..dd4219e 100644
--- a/WebKit/win/Interfaces/IWebHTTPURLResponse.idl
+++ b/WebKit/win/Interfaces/IWebHTTPURLResponse.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebURLResponse.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebHistory.idl b/WebKit/win/Interfaces/IWebHistory.idl
index 7dc8cee..a8b55d6 100644
--- a/WebKit/win/Interfaces/IWebHistory.idl
+++ b/WebKit/win/Interfaces/IWebHistory.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 /*
     @discussion Notifications sent when history is modified. 
     @constant WebHistoryItemsAddedNotification Posted from addItems:.  This 
@@ -66,10 +41,15 @@ cpp_quote("#define WebHistoryLoadedNotification TEXT(\"WebHistoryLoadedNotificat
 cpp_quote("#define WebHistoryItemsDiscardedWhileLoadingNotification TEXT(\"WebHistoryItemsDiscardedWhileLoadingNotification\")")
 cpp_quote("#define WebHistorySavedNotification TEXT(\"WebHistorySavedNotification\")")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebError.idl";
 import "IWebHistoryItem.idl";
+#endif
+
+interface IWebError;
+interface IWebHistoryItem;
 
 /*!
     @class WebHistory
diff --git a/WebKit/win/Interfaces/IWebHistoryItem.idl b/WebKit/win/Interfaces/IWebHistoryItem.idl
index 55410a5..21703d5 100644
--- a/WebKit/win/Interfaces/IWebHistoryItem.idl
+++ b/WebKit/win/Interfaces/IWebHistoryItem.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 /*!
     @class WebHistoryItem
diff --git a/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl b/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
index 46419b4..aa8c162 100644
--- a/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
+++ b/WebKit/win/Interfaces/IWebHistoryItemPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebHistoryItem.idl";
+#endif
+
+interface IWebHistoryItem;
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebIconDatabase.idl b/WebKit/win/Interfaces/IWebIconDatabase.idl
index d944abe..0dfbf1a 100644
--- a/WebKit/win/Interfaces/IWebIconDatabase.idl
+++ b/WebKit/win/Interfaces/IWebIconDatabase.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,37 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("#define WebIconDatabaseDidAddIconNotification TEXT(\"WebIconDatabaseDidAddIconNotification\")")
 cpp_quote("#define WebIconNotificationUserInfoURLKey TEXT(\"WebIconNotificationUserInfoURLKey\")")
 cpp_quote("#define WebIconDatabaseDidRemoveAllIconsNotification TEXT(\"WebIconDatabaseDidRemoveAllIconsNotification\")")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 /*!
     @class WebIconDatabase
diff --git a/WebKit/win/Interfaces/IWebIconFetcher.idl b/WebKit/win/Interfaces/IWebIconFetcher.idl
new file mode 100644
index 0000000..1486687
--- /dev/null
+++ b/WebKit/win/Interfaces/IWebIconFetcher.idl
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007, 2008 Apple 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
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
+
+interface IWebIconFetcher;
+
+[
+    object,
+    oleautomation,
+    uuid(9d27e503-1e0e-458e-bc66-ffa9fa64600e),
+    pointer_default(unique)
+]
+interface IWebIconFetcherDelegate : IUnknown
+{
+    HRESULT finishedLoadingIcon([in] IWebIconFetcher* fetcher, [in] IStream* data);
+}
+
+[
+    object,
+    oleautomation,
+    uuid(54f50460-8ffa-442c-b5Ab-5422e1fcc973),
+    pointer_default(unique)
+]
+interface IWebIconFetcher : IUnknown
+{
+    HRESULT cancel();
+}
diff --git a/WebKit/win/Interfaces/IWebInspector.idl b/WebKit/win/Interfaces/IWebInspector.idl
index 6c1fc50..e31376c 100644
--- a/WebKit/win/Interfaces/IWebInspector.idl
+++ b/WebKit/win/Interfaces/IWebInspector.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
@@ -67,8 +41,17 @@ interface IWebInspector : IUnknown
 {
     HRESULT show();
     HRESULT showConsole();
-    HRESULT showTimeline();
+    HRESULT unused1();
     HRESULT close();
     HRESULT attach();
     HRESULT detach();
+
+    HRESULT isDebuggingJavaScript(BOOL* isDebugging);
+    HRESULT toggleDebuggingJavaScript();
+
+    HRESULT isProfilingJavaScript(BOOL* isProfiling);
+    HRESULT toggleProfilingJavaScript();
+
+    HRESULT isJavaScriptProfilingEnabled(BOOL* isProfilingEnabled);
+    HRESULT setJavaScriptProfilingEnabled(BOOL enabled);
 }
diff --git a/WebKit/win/Interfaces/IWebJavaScriptCollector.idl b/WebKit/win/Interfaces/IWebJavaScriptCollector.idl
index 19d5e0e..824cb0b 100644
--- a/WebKit/win/Interfaces/IWebJavaScriptCollector.idl
+++ b/WebKit/win/Interfaces/IWebJavaScriptCollector.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebKitStatistics.idl b/WebKit/win/Interfaces/IWebKitStatistics.idl
index 53c27ed..627267f 100644
--- a/WebKit/win/Interfaces/IWebKitStatistics.idl
+++ b/WebKit/win/Interfaces/IWebKitStatistics.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
@@ -66,4 +43,5 @@ interface IWebKitStatistics : IUnknown
     HRESULT viewCount([out, retval] int* count);
     HRESULT HTMLRepresentationCount([out, retval] int* count);
     HRESULT comClassCount([out, retval] int* classCount);
+    HRESULT comClassNameCounts([out, retval] BSTR *output);
 }
diff --git a/WebKit/win/Interfaces/IWebMutableURLRequest.idl b/WebKit/win/Interfaces/IWebMutableURLRequest.idl
index c7724eb..c1b31be 100644
--- a/WebKit/win/Interfaces/IWebMutableURLRequest.idl
+++ b/WebKit/win/Interfaces/IWebMutableURLRequest.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebURLRequest.idl";
+#endif
 
 interface IWebURLRequest;
 
diff --git a/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl b/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl
index 1215d05..2e5e0e2 100644
--- a/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl
+++ b/WebKit/win/Interfaces/IWebMutableURLRequestPrivate.idl
@@ -26,36 +26,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2008 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
+
+cpp_quote("// this is done to get midl to treat the CFURLRequestRef as pointer types")
+cpp_quote("#if 0")
+typedef void* CFURLRequestRef;
+cpp_quote("#else")
+cpp_quote("typedef const struct _CFURLRequest* CFURLRequestRef;")
+cpp_quote("#endif")
 
 [
     object,
@@ -67,4 +48,6 @@ import "ocidl.idl";
 interface IWebMutableURLRequestPrivate : IUnknown
 {
     HRESULT setClientCertificate([in] OLE_HANDLE cert);
+
+    [local] CFURLRequestRef cfRequest();
 }
diff --git a/WebKit/win/Interfaces/IWebNotification.idl b/WebKit/win/Interfaces/IWebNotification.idl
index fcf17d2..0df4ff9 100644
--- a/WebKit/win/Interfaces/IWebNotification.idl
+++ b/WebKit/win/Interfaces/IWebNotification.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebNotificationCenter.idl b/WebKit/win/Interfaces/IWebNotificationCenter.idl
index ca3eae8..2f8b2aa 100644
--- a/WebKit/win/Interfaces/IWebNotificationCenter.idl
+++ b/WebKit/win/Interfaces/IWebNotificationCenter.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
+
+interface IWebNotification;
+interface IWebNotificationObserver;
 
 [
     object,
@@ -60,8 +40,10 @@ import "ocidl.idl";
 ]
 interface IWebNotificationCenter : IUnknown
 {
+#ifndef DO_NO_IMPORTS
     import "IWebNotification.idl";
     import "IWebNotificationObserver.idl";
+#endif
 
     //+ (NSNotificationCenter *)defaultCenter
     HRESULT defaultCenter([out, retval] IWebNotificationCenter** center);
diff --git a/WebKit/win/Interfaces/IWebNotificationObserver.idl b/WebKit/win/Interfaces/IWebNotificationObserver.idl
index aeb5660..ff41b1e 100644
--- a/WebKit/win/Interfaces/IWebNotificationObserver.idl
+++ b/WebKit/win/Interfaces/IWebNotificationObserver.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
+
+interface IWebNotification;
 
 [
     object,
@@ -59,7 +38,9 @@ import "ocidl.idl";
 ]
 interface IWebNotificationObserver : IUnknown
 {
+#ifndef DO_NO_IMPORTS
     import "IWebNotification.idl";
+#endif
 
     HRESULT onNotify([in] IWebNotification* notification);
 }
diff --git a/WebKit/win/Interfaces/IWebPolicyDelegate.idl b/WebKit/win/Interfaces/IWebPolicyDelegate.idl
index 036aa34..204b985 100644
--- a/WebKit/win/Interfaces/IWebPolicyDelegate.idl
+++ b/WebKit/win/Interfaces/IWebPolicyDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebView.idl";
 import "IWebURLRequest.idl";
+#endif
 
 interface IWebError;
 interface IWebURLResponse;
@@ -80,20 +57,13 @@ typedef enum WebNavigationType {
     WebNavigationTypeOther
 } WebNavigationType;
 
-cpp_quote("#define WebActionNavigationTypeKey TEXT(\"WebActionNavigationTypeKey\")")
-cpp_quote("#define WebActionElementKey TEXT(\"WebActionElementKey\")")
 cpp_quote("#define WebActionButtonKey TEXT(\"WebActionButtonKey\")")
+cpp_quote("#define WebActionElementKey TEXT(\"WebActionElementKey\")")
+cpp_quote("#define WebActionFormKey TEXT(\"WebActionFormKey\")")
 cpp_quote("#define WebActionModifierFlagsKey TEXT(\"WebActionModifierFlagsKey\")")
+cpp_quote("#define WebActionNavigationTypeKey TEXT(\"WebActionNavigationTypeKey\")")
 cpp_quote("#define WebActionOriginalURLKey TEXT(\"WebActionOriginalURLKey\")")
 
-/*
-extern NSString *WebActionNavigationTypeKey; // NSNumber (WebNavigationType)
-extern NSString *WebActionElementKey; // NSDictionary of element info
-extern NSString *WebActionButtonKey;  // NSEventType
-extern NSString *WebActionModifierFlagsKey; // NSNumber (unsigned)
-extern NSString *WebActionOriginalURLKey; // NSURL
-*/
-
 /*!
     @protocol WebPolicyDecisionListener
     @discussion This protocol is used to call back with the results of a
diff --git a/WebKit/win/Interfaces/IWebPreferences.idl b/WebKit/win/Interfaces/IWebPreferences.idl
index a93f3b8..16f0d9c 100644
--- a/WebKit/win/Interfaces/IWebPreferences.idl
+++ b/WebKit/win/Interfaces/IWebPreferences.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,36 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("#define WebPreferencesChangedNotification TEXT(\"WebPreferencesChangedNotification\")")
 cpp_quote("#define WebPreferencesRemovedNotification TEXT(\"WebPreferencesRemovedNotification\")")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 typedef enum FontSmoothingType {
     FontSmoothingTypeStandard=0,
@@ -203,4 +180,7 @@ interface IWebPreferences : IUnknown
 
     HRESULT cacheModel([out, retval] WebCacheModel* cacheModel);
     HRESULT setCacheModel([in] WebCacheModel cacheModel);
+
+    HRESULT setShouldPaintCustomScrollbars(BOOL shouldPaint);
+    HRESULT shouldPaintCustomScrollbars(BOOL *shouldPaint);
 }
diff --git a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
index 5e986c7..4a71dbd 100644
--- a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
+++ b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer. ")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution. ")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission. ")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
@@ -74,4 +48,16 @@ interface IWebPreferencesPrivate : IUnknown
 
     HRESULT setAuthorAndUserStylesEnabled([in] BOOL enabled);
     HRESULT authorAndUserStylesEnabled([out, retval] BOOL* enabled);
+
+    HRESULT inApplicationChromeMode([out, retval] BOOL *allowed);
+    HRESULT setApplicationChromeMode([in] BOOL allowed);
+
+    HRESULT setOfflineWebApplicationCacheEnabled([in] BOOL enabled);
+    HRESULT offlineWebApplicationCacheEnabled([out, retval] BOOL *enabled);
+
+    HRESULT localStorageDatabasePath([out, retval] BSTR* location);
+    HRESULT setLocalStorageDatabasePath([in] BSTR location);
+
+    HRESULT setShouldPaintNativeControls([in] BOOL shouldPaint);
+    HRESULT shouldPaintNativeControls([out, retval] BOOL* enabled);
 }
diff --git a/WebKit/win/Interfaces/IWebResource.idl b/WebKit/win/Interfaces/IWebResource.idl
index 068bf74..e85f0dc 100644
--- a/WebKit/win/Interfaces/IWebResource.idl
+++ b/WebKit/win/Interfaces/IWebResource.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 /*!
     @class WebResource
diff --git a/WebKit/win/Interfaces/IWebResourceLoadDelegate.idl b/WebKit/win/Interfaces/IWebResourceLoadDelegate.idl
index 8f1021b..87e6f91 100644
--- a/WebKit/win/Interfaces/IWebResourceLoadDelegate.idl
+++ b/WebKit/win/Interfaces/IWebResourceLoadDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,37 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebURLAuthenticationChallenge.idl";
 import "IWebDataSource.idl";
 import "IWebURLResponse.idl";
 import "IWebError.idl";
+#endif
 
 interface IWebView;
 interface IWebDataSource;
diff --git a/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl b/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
index ea9d97c..de2bdc0 100644
--- a/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebResourceLoadDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebDataSource.idl";
 import "IWebURLResponse.idl";
+#endif
 
 interface IWebView;
 interface IWebDataSource;
diff --git a/WebKit/win/Interfaces/IWebScriptCallFrame.idl b/WebKit/win/Interfaces/IWebScriptCallFrame.idl
index 6ec4512..d3a7f85 100644
--- a/WebKit/win/Interfaces/IWebScriptCallFrame.idl
+++ b/WebKit/win/Interfaces/IWebScriptCallFrame.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 cpp_quote("// this is done to get midl to treat the WebScriptCallFrame type as a pointer type")
 cpp_quote("#if 0")
diff --git a/WebKit/win/Interfaces/IWebScriptDebugListener.idl b/WebKit/win/Interfaces/IWebScriptDebugListener.idl
index a37f4ca..ab6244d 100644
--- a/WebKit/win/Interfaces/IWebScriptDebugListener.idl
+++ b/WebKit/win/Interfaces/IWebScriptDebugListener.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,39 +26,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
-
 import "IWebScriptCallFrame.idl";
 import "IWebView.idl";
+#endif
+
+interface IWebDataSource;
+interface IWebFrame;
+interface IWebScriptCallFrame;
+interface IWebView;
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebScriptDebugServer.idl b/WebKit/win/Interfaces/IWebScriptDebugServer.idl
index d7768d4..975ff68 100644
--- a/WebKit/win/Interfaces/IWebScriptDebugServer.idl
+++ b/WebKit/win/Interfaces/IWebScriptDebugServer.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,38 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
-
 import "IWebScriptDebugListener.idl";
+#endif
 
 interface IWebScriptDebugListener;
 
diff --git a/WebKit/win/Interfaces/IWebScriptObject.idl b/WebKit/win/Interfaces/IWebScriptObject.idl
index 8abb006..83b502e 100644
--- a/WebKit/win/Interfaces/IWebScriptObject.idl
+++ b/WebKit/win/Interfaces/IWebScriptObject.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 /*!
     @class WebScriptObject
diff --git a/WebKit/win/Interfaces/IWebScriptScope.idl b/WebKit/win/Interfaces/IWebScriptScope.idl
deleted file mode 100644
index 1664af4..0000000
--- a/WebKit/win/Interfaces/IWebScriptScope.idl
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2007 Apple 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
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
-import "oaidl.idl";
-import "ocidl.idl";
-
-import "IWebScriptCallFrame.idl";
-
-interface IWebScriptCallFrame;
-
-[
-    object,
-    oleautomation,
-    uuid(FF347C48-1966-460c-8EEE-09FCA5F3C708),
-    pointer_default(unique)
-]
-interface IWebScriptScope : IUnknown
-{
-    HRESULT variableNames([in] IWebScriptCallFrame*, [out, retval] IEnumVARIANT**);
-    HRESULT valueForVariable([in] IWebScriptCallFrame*, [in] BSTR key, [out, retval] BSTR* value);
-}
diff --git a/WebKit/win/Interfaces/IWebScrollBarDelegatePrivate.idl b/WebKit/win/Interfaces/IWebScrollBarDelegatePrivate.idl
index efadbf4..e054e05 100644
--- a/WebKit/win/Interfaces/IWebScrollBarDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebScrollBarDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebScrollBarPrivate.idl";
+#endif
 
 interface IWebScrollBarPrivate;
 
diff --git a/WebKit/win/Interfaces/IWebScrollBarPrivate.idl b/WebKit/win/Interfaces/IWebScrollBarPrivate.idl
index 39cfc86..2c820eb 100644
--- a/WebKit/win/Interfaces/IWebScrollBarPrivate.idl
+++ b/WebKit/win/Interfaces/IWebScrollBarPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,64 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
-
 import "IWebScrollBarDelegatePrivate.idl";
+#endif
 
 interface IWebScrollBarDelegatePrivate;
 
-// NOTE: these enums must be kept in sync with the WebCore versions
-typedef enum WebScrollBarOrientation {
-    WebHorizontalScrollbar = 0, 
-    WebVerticalScrollbar
-} WebScrollBarOrientation;
-
-typedef enum WebScrollBarControlSize { 
-    WebRegularScrollbar = 0, 
-    WebSmallScrollbar, 
-    WebMiniScrollbar 
-} WebScrollBarControlSize;
-
-typedef enum WebScrollDirection {
-    WebScrollUp = 0,
-    WebScrollDown,
-    WebScrollLeft,
-    WebScrollRight
-} WebScrollDirection;
-
-typedef enum WebScrollGranularity {
-    WebScrollByLine = 0,
-    WebScrollByPage,
-    WebScrollByDocument,
-    WebScrollByWheel
-} WebScrollGranularity;
-
 [
     object,
     oleautomation,
@@ -106,7 +56,7 @@ interface IWebScrollBarPrivate : IUnknown
 
     HRESULT paint([in] HDC dc, [in] RECT damageRect);
 
-    HRESULT frameGeometry([out, retval] RECT* bounds);
+    HRESULT frameRect([out, retval] RECT* bounds);
 
     HRESULT width([out, retval] int* w);
 
diff --git a/WebKit/win/Interfaces/IWebSecurityOrigin.idl b/WebKit/win/Interfaces/IWebSecurityOrigin.idl
index ad05ea7..796d59c 100644
--- a/WebKit/win/Interfaces/IWebSecurityOrigin.idl
+++ b/WebKit/win/Interfaces/IWebSecurityOrigin.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
@@ -66,7 +40,7 @@ import "ocidl.idl";
 interface IWebSecurityOrigin : IUnknown
 {
     HRESULT protocol([out, retval] BSTR* result);
-    HRESULT domain([out, retval] BSTR* result);
+    HRESULT host([out, retval] BSTR* result);
     HRESULT port([out, retval] unsigned short* result);
 
     HRESULT usage([out, retval] unsigned long long* result);
diff --git a/WebKit/win/Interfaces/IWebTextRenderer.idl b/WebKit/win/Interfaces/IWebTextRenderer.idl
index 5c88d98..bdfc54a 100644
--- a/WebKit/win/Interfaces/IWebTextRenderer.idl
+++ b/WebKit/win/Interfaces/IWebTextRenderer.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution.")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebUIDelegate.idl b/WebKit/win/Interfaces/IWebUIDelegate.idl
index c1400b3..44869b7 100644
--- a/WebKit/win/Interfaces/IWebUIDelegate.idl
+++ b/WebKit/win/Interfaces/IWebUIDelegate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,40 +23,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebUndoTarget.idl";
 import "IWebURLRequest.idl";
 import "IWebFrame.idl";
+#endif
 
 interface IWebFrame;
 interface IWebView;
 interface IWebURLRequest;
+interface IWebUndoTarget;
 
 /*!
     @enum WebMenuItemTag
@@ -801,3 +779,20 @@ interface IWebUIDelegate3 : IWebUIDelegate2
     HRESULT setMenuBarVisible([in] IWebView* webView, [in] BOOL visible);
     HRESULT runDatabaseSizeLimitPrompt([in] IWebView* webView, [in] BSTR displayName, [in] IWebFrame* initiatedByFrame, [out, retval] BOOL* allowed);
 }
+
+/*!
+    @category WebUIDelegate4
+    @discussion A class that supplements the IWebUIDelegate interface
+*/
+[
+    object,
+    oleautomation,
+    uuid(042B7EE3-A5A4-4a8f-8C33-775CD9E89C7C),
+    pointer_default(unique)
+]
+interface IWebUIDelegate4 : IWebUIDelegate3
+{
+    HRESULT paintCustomScrollbar([in] IWebView* webView, [in] HDC hDC, [in] RECT rect, [in] WebScrollBarControlSize size, [in] WebScrollbarControlState state, 
+                                 [in] WebScrollbarControlPart pressedPart, [in] BOOL vertical, [in] float value, [in] float proportion, [in] WebScrollbarControlPartMask parts);
+    HRESULT paintCustomScrollCorner([in] IWebView* webView, [in] HDC hDC, [in] RECT rect);
+}
diff --git a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
index fbfcc92..85a72e7 100755
--- a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
@@ -23,36 +23,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebSecurityOrigin.idl";
 import "IWebView.idl";
+#endif
+
+cpp_quote("#define WebEmbeddedViewAttributesKey TEXT(\"WebEmbeddedViewAttributesKey\")")
 
+interface IWebEmbeddedView;
+interface IWebFrame;
 interface IWebSecurityOrigin;
 interface IWebView;
 
@@ -96,3 +77,15 @@ interface IWebUIDelegatePrivate3 : IWebUIDelegatePrivate2
 {
     HRESULT exceededDatabaseQuota([in] IWebView* sender, [in] IWebFrame* frame, [in] IWebSecurityOrigin* origin, [in] BSTR databaseIdentifier);
 }
+
+[
+    object,
+    oleautomation,
+    uuid(88566775-C003-4EDF-8900-2872AC7EA44F),
+    pointer_default(unique)
+]
+interface IWebUIDelegatePrivate4 : IWebUIDelegatePrivate3
+{
+    HRESULT embeddedViewWithArguments([in] IWebView* sender, [in] IWebFrame* frame, [in] IPropertyBag* arguments, [out, retval] IWebEmbeddedView** view);
+    HRESULT webViewSendResizeMessage([in] UINT uMsg, [in] WPARAM wParam, [in] LPARAM lParam);
+}
diff --git a/WebKit/win/Interfaces/IWebURLAuthenticationChallenge.idl b/WebKit/win/Interfaces/IWebURLAuthenticationChallenge.idl
index 4908c9e..68881ab 100644
--- a/WebKit/win/Interfaces/IWebURLAuthenticationChallenge.idl
+++ b/WebKit/win/Interfaces/IWebURLAuthenticationChallenge.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,39 +23,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebError.idl";
 import "IWebURLResponse.idl";
+#endif
 
+interface IWebError;
 interface IWebURLAuthenticationChallengeSender;
-interface IWebURLProtectionSpace;
 interface IWebURLCredential;
+interface IWebURLProtectionSpace;
+interface IWebURLResponse;
 
 typedef enum {
     WebURLCredentialPersistenceNone,
diff --git a/WebKit/win/Interfaces/IWebURLRequest.idl b/WebKit/win/Interfaces/IWebURLRequest.idl
index 3875d1f..0f72fa8 100644
--- a/WebKit/win/Interfaces/IWebURLRequest.idl
+++ b/WebKit/win/Interfaces/IWebURLRequest.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 typedef enum _WebURLRequestCachePolicy
 {
@@ -131,4 +108,6 @@ interface IWebURLRequest : IUnknown
     HRESULT valueForHTTPHeaderField([in] BSTR field, [out, retval] BSTR* result);
 
     HRESULT isEmpty([out, retval] BOOL* result);
+
+    HRESULT mutableCopy([out, retval] IWebMutableURLRequest** result);
 }
diff --git a/WebKit/win/Interfaces/IWebURLResponse.idl b/WebKit/win/Interfaces/IWebURLResponse.idl
index 49248fb..9407457 100644
--- a/WebKit/win/Interfaces/IWebURLResponse.idl
+++ b/WebKit/win/Interfaces/IWebURLResponse.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,35 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("#define WebURLResponseUnknownLength -1")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebURLResponsePrivate.idl b/WebKit/win/Interfaces/IWebURLResponsePrivate.idl
index d52cb1e..00133a7 100644
--- a/WebKit/win/Interfaces/IWebURLResponsePrivate.idl
+++ b/WebKit/win/Interfaces/IWebURLResponsePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,36 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" *")
-cpp_quote(" * 1.  Redistributions of source code must retain the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer. ")
-cpp_quote(" * 2.  Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *     notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *     documentation and/or other materials provided with the distribution. ")
-cpp_quote(" * 3.  Neither the name of Apple Computer, Inc. (\"Apple\") nor the names of")
-cpp_quote(" *     its contributors may be used to endorse or promote products derived")
-cpp_quote(" *     from this software without specific prior written permission. ")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS \"AS IS\" AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED")
-cpp_quote(" * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE")
-cpp_quote(" * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY")
-cpp_quote(" * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES")
-cpp_quote(" * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;")
-cpp_quote(" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND")
-cpp_quote(" * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF")
-cpp_quote(" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebUndoManager.idl b/WebKit/win/Interfaces/IWebUndoManager.idl
index 6f9983a..4cea91a 100644
--- a/WebKit/win/Interfaces/IWebUndoManager.idl
+++ b/WebKit/win/Interfaces/IWebUndoManager.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 interface IWebInvocation;
 interface IWebMethodSignature;
diff --git a/WebKit/win/Interfaces/IWebUndoTarget.idl b/WebKit/win/Interfaces/IWebUndoTarget.idl
index 1e15939..01e14d0 100755
--- a/WebKit/win/Interfaces/IWebUndoTarget.idl
+++ b/WebKit/win/Interfaces/IWebUndoTarget.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,33 +23,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
+#endif
 
 [
     object,
diff --git a/WebKit/win/Interfaces/IWebView.idl b/WebKit/win/Interfaces/IWebView.idl
index 66daed7..92fa2b5 100644
--- a/WebKit/win/Interfaces/IWebView.idl
+++ b/WebKit/win/Interfaces/IWebView.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,31 +23,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
 cpp_quote("/* identifiers for commands that can be called by the webview's frame */")
 cpp_quote("enum WebViewCmd { Cut = 100, Copy, Paste, ForwardDelete, SelectAll, Undo, Redo };")
 
@@ -55,6 +30,7 @@ cpp_quote("#define WebViewProgressStartedNotification TEXT(\"WebProgressStartedN
 cpp_quote("#define WebViewProgressEstimateChangedNotification TEXT(\"WebProgressEstimateChangedNotification\")")
 cpp_quote("#define WebViewProgressFinishedNotification TEXT(\"WebProgressFinishedNotification\")")
 
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebUIDelegate.idl";
@@ -70,6 +46,7 @@ import "DOMCSS.idl";
 import "IWebUndoManager.idl";
 import "IWebEditingDelegate.idl";
 import "DOMRange.idl";
+#endif
 
 interface IDOMCSSStyleDeclaration;
 interface IDOMDocument;
@@ -838,6 +815,51 @@ interface IWebIBActions : IUnknown
         - (void)toggleGrammarChecking:(id)sender
     */
     HRESULT toggleGrammarChecking([in] IUnknown* sender);
+
+       /*!
+        @method setPageSizeMultiplier:
+        @abstract Set a zoom factor for all views managed by this webView.
+        @param multiplier A fractional percentage value, 1.0 is 100%.
+        - (void)setPageSizeMultiplier:(float)multiplier;
+    */
+    HRESULT setPageSizeMultiplier([in] float multiplier);
+
+    /*!
+        @method pageSizeMultiplier
+        @result The page size multipler.
+        - (float)pageSizeMultiplier;
+    */    
+    HRESULT pageSizeMultiplier([out, retval] float* multiplier);
+
+    /*
+        - (BOOL)canZoomPageIn;
+    */
+    HRESULT canZoomPageIn([in] IUnknown* sender, [out, retval] BOOL* result);
+
+    /*
+        - (IBAction)zoomPageIn:(id)sender;
+    */
+    HRESULT zoomPageIn([in] IUnknown* sender);
+
+    /*
+        - (BOOL)canZoomPageOut;
+    */
+    HRESULT canZoomPageOut([in] IUnknown* sender, [out, retval] BOOL* result);
+
+    /*
+        - (IBAction)zoomPageOut:(id)sender;
+    */
+    HRESULT zoomPageOut([in] IUnknown* sender);
+
+    /*
+        - (BOOL)canResetPageZoom;
+    */
+    HRESULT canResetPageZoom([in] IUnknown* sender, [out, retval] BOOL* result);
+
+    /*
+        - (IBAction)resetPageZoom:(id)sender;
+    */
+    HRESULT resetPageZoom([in] IUnknown* sender);
 }
 
 /*
diff --git a/WebKit/win/Interfaces/IWebViewPrivate.idl b/WebKit/win/Interfaces/IWebViewPrivate.idl
index 8328608..b49addf 100644
--- a/WebKit/win/Interfaces/IWebViewPrivate.idl
+++ b/WebKit/win/Interfaces/IWebViewPrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,36 +23,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
-cpp_quote(" *")
-cpp_quote(" * Redistribution and use in source and binary forms, with or without")
-cpp_quote(" * modification, are permitted provided that the following conditions")
-cpp_quote(" * are met:")
-cpp_quote(" * 1. Redistributions of source code must retain the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer.")
-cpp_quote(" * 2. Redistributions in binary form must reproduce the above copyright")
-cpp_quote(" *    notice, this list of conditions and the following disclaimer in the")
-cpp_quote(" *    documentation and/or other materials provided with the distribution.")
-cpp_quote(" *")
-cpp_quote(" * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY")
-cpp_quote(" * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE")
-cpp_quote(" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR")
-cpp_quote(" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR")
-cpp_quote(" * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
-cpp_quote(" * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,")
-cpp_quote(" * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR")
-cpp_quote(" * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY")
-cpp_quote(" * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT")
-cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE")
-cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
-cpp_quote(" */")
-
+#ifndef DO_NO_IMPORTS
 import "oaidl.idl";
 import "ocidl.idl";
 import "IWebFormDelegate.idl";
 import "IWebFrameLoadDelegatePrivate.idl";
 import "IWebInspector.idl";
+#endif
+
+interface IEnumTextMatches;
+interface IWebFormDelegate;
+interface IWebFrameLoadDelegatePrivate;
+interface IWebInspector;
+interface IWebURLRequest;
+interface IWebView;
 
 [
     object,
@@ -110,7 +94,7 @@ interface IWebViewPrivate : IUnknown
     HRESULT tabKeyCyclesThroughElements([out, retval] BOOL* result);
 
     HRESULT setAllowSiteSpecificHacks([in] BOOL allows);
-    HRESULT addAdditionalPluginPath([in] BSTR path);
+    HRESULT addAdditionalPluginDirectory([in] BSTR directory);
 
     HRESULT loadBackForwardListFromOtherView([in] IWebView* otherView);
 
@@ -138,6 +122,28 @@ interface IWebViewPrivate : IUnknown
 
     // SPI for DumpRenderTree
     HRESULT executeCoreCommandByName([in] BSTR name, [in] BSTR value);
+    HRESULT clearMainFrameName();
 
     HRESULT windowAncestryDidChange();
+
+    HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE dc);
+
+    HRESULT setDefersCallbacks([in] BOOL defersCallbacks);
+    HRESULT defersCallbacks([out, retval] BOOL* defersCallbacks);
+
+    HRESULT standardUserAgentWithApplicationName([in] BSTR applicationName, [retval][out] BSTR* groupName);
+
+    HRESULT setCustomHTMLTokenizerTimeDelay([in] double timeDelay);
+    HRESULT setCustomHTMLTokenizerChunkSize([in] int chunkSize);
+
+    HRESULT backingStore([out, retval] OLE_HANDLE* hBitmap);
+
+    HRESULT setTransparent([in] BOOL transparent);
+    HRESULT transparent([out, retval] BOOL* transparent);
+
+    HRESULT setAlwaysUsesComplexTextCodePath([in] BOOL complex);
+    HRESULT alwaysUsesComplexTextCodePath([out, retval] BOOL* complex);
+
+    HRESULT setCookieEnabled([in] BOOL enable);
+    HRESULT cookieEnabled([out, retval] BOOL* enabled);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 5823013..fe08792 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,11 +20,11 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.")
+cpp_quote(" * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.")
 cpp_quote(" *")
 cpp_quote(" * Redistribution and use in source and binary forms, with or without")
 cpp_quote(" * modification, are permitted provided that the following conditions")
@@ -48,68 +48,197 @@ cpp_quote(" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 cpp_quote(" * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ")
 cpp_quote(" */")
 
+#include "autoversion.h"
+
+#define DO_NO_IMPORTS
+
 import "oaidl.idl";
 import "ocidl.idl";
 
-import "IWebTextRenderer.idl";
-import "IWebView.idl";
-import "IWebViewPrivate.idl";
-import "IWebUIDelegate.idl";
-import "IWebResourceLoadDelegate.idl";
-import "IWebDatabaseManager.idl";
-import "IWebDownload.idl";
-import "IWebFrameLoadDelegate.idl";
-import "IWebPolicyDelegate.idl";
-import "IWebFrame.idl";
-import "IWebBackForwardList.idl";
-import "IWebHistoryItem.idl";
-import "IWebScriptObject.idl";
-import "IWebPreferences.idl";
-import "IWebDocument.idl";
-import "IWebURLRequest.idl";
-import "IWebDataSource.idl";
-import "IWebURLResponse.idl";
-import "IWebURLAuthenticationChallenge.idl";
-import "IWebError.idl";
-import "IWebMutableURLRequest.idl";
-import "IWebArchive.idl";
-import "IWebResource.idl";
-import "IWebFrameView.idl";
-import "DOMHTML.idl";
-import "IWebIconDatabase.idl";
-import "IWebNotificationCenter.idl";
-import "IWebNotificationObserver.idl";
-import "IWebHistory.idl";
-import "IWebCache.idl";
-import "IWebJavaScriptCollector.idl";
-import "IWebKitStatistics.idl";
-import "IWebScrollBarPrivate.idl";
-import "IWebScriptDebugServer.idl";
+#include "WebScrollbarTypes.idl"
+#include "IWebScriptObject.idl"
+#include "DOMCSS.idl"
+#include "DOMCore.idl"
+#include "DOMEvents.idl"
+#include "DOMExtensions.idl"
+#include "DOMHTML.idl"
+#include "DOMPrivate.idl"
+#include "DOMRange.idl"
+#include "DOMWindow.idl"
+#include "IWebArchive.idl"
+#include "IWebBackForwardList.idl"
+#include "IWebBackForwardListPrivate.idl"
+#include "IWebCache.idl"
+#include "IWebCookieManager.idl"
+#include "IWebCoreStatistics.idl"
+#include "IWebDataSource.idl"
+#include "IWebDatabaseManager.idl"
+#include "IWebDocument.idl"
+#include "IWebDownload.idl"
+#include "IWebEditingDelegate.idl"
+#include "IWebEmbeddedView.idl"
+#include "IWebError.idl"
+#include "IWebErrorPrivate.idl"
+#include "IWebFormDelegate.idl"
+#include "IWebFrame.idl"
+#include "IWebFrameLoadDelegate.idl"
+#include "IWebFrameLoadDelegatePrivate.idl"
+#include "IWebFramePrivate.idl"
+#include "IWebFrameView.idl"
+#include "IWebHTMLRepresentation.idl"
+#include "IWebHTTPURLResponse.idl"
+#include "IWebHistory.idl"
+#include "IWebHistoryItem.idl"
+#include "IWebHistoryItemPrivate.idl"
+#include "IWebIconDatabase.idl"
+#include "IWebIconFetcher.idl"
+#include "IWebInspector.idl"
+#include "IWebJavaScriptCollector.idl"
+#include "IWebKitStatistics.idl"
+#include "IWebMutableURLRequestPrivate.idl"
+#include "IWebNotification.idl"
+#include "IWebNotificationCenter.idl"
+#include "IWebNotificationObserver.idl"
+#include "IWebPolicyDelegate.idl"
+#include "IWebPreferences.idl"
+#include "IWebPreferencesPrivate.idl"
+#include "IWebResource.idl"
+#include "IWebResourceLoadDelegate.idl"
+#include "IWebResourceLoadDelegatePrivate.idl"
+#include "IWebScriptCallFrame.idl"
+#include "IWebScriptDebugListener.idl"
+#include "IWebScriptDebugServer.idl"
+#include "IWebScrollBarDelegatePrivate.idl"
+#include "IWebScrollBarPrivate.idl"
+#include "IWebSecurityOrigin.idl"
+#include "IWebTextRenderer.idl"
+#include "IWebUIDelegate.idl"
+#include "IWebUIDelegatePrivate.idl"
+#include "IWebURLAuthenticationChallenge.idl"
+#include "IWebURLRequest.idl"
+#include "IWebMutableURLRequest.idl"
+#include "IWebURLResponse.idl"
+#include "IWebURLResponsePrivate.idl"
+#include "IWebUndoManager.idl"
+#include "IWebUndoTarget.idl"
+#include "IWebView.idl"
+#include "IWebViewPrivate.idl"
+
+#include "IGEN_DOMObject.idl"
+#include "IGEN_DOMCharacterData.idl"
+#include "IGEN_DOMText.idl"
+#include "IGEN_DOMAttr.idl"
+#include "IGEN_DOMCDATASection.idl"
+#include "IGEN_DOMCSSCharsetRule.idl"
+#include "IGEN_DOMCSSFontFaceRule.idl"
+#include "IGEN_DOMCSSImportRule.idl"
+#include "IGEN_DOMCSSMediaRule.idl"
+#include "IGEN_DOMCSSPageRule.idl"
+#include "IGEN_DOMCSSPrimitiveValue.idl"
+#include "IGEN_DOMCSSRule.idl"
+#include "IGEN_DOMCSSRuleList.idl"
+#include "IGEN_DOMCSSStyleDeclaration.idl"
+#include "IGEN_DOMCSSStyleRule.idl"
+#include "IGEN_DOMCSSStyleSheet.idl"
+#include "IGEN_DOMCSSUnknownRule.idl"
+#include "IGEN_DOMCSSValue.idl"
+#include "IGEN_DOMCSSValueList.idl"
+#include "IGEN_DOMComment.idl"
+#include "IGEN_DOMCounter.idl"
+#include "IGEN_DOMDOMImplementation.idl"
+#include "IGEN_DOMDocument.idl"
+#include "IGEN_DOMDocumentFragment.idl"
+#include "IGEN_DOMDocumentType.idl"
+#include "IGEN_DOMElement.idl"
+#include "IGEN_DOMEntity.idl"
+#include "IGEN_DOMEntityReference.idl"
+#include "IGEN_DOMEvent.idl"
+#include "IGEN_DOMEventListener.idl"
+#include "IGEN_DOMEventTarget.idl"
+#include "IGEN_DOMHTMLAnchorElement.idl"
+#include "IGEN_DOMHTMLAppletElement.idl"
+#include "IGEN_DOMHTMLAreaElement.idl"
+#include "IGEN_DOMHTMLBRElement.idl"
+#include "IGEN_DOMHTMLBaseElement.idl"
+#include "IGEN_DOMHTMLBaseFontElement.idl"
+#include "IGEN_DOMHTMLBlockquoteElement.idl"
+#include "IGEN_DOMHTMLBodyElement.idl"
+#include "IGEN_DOMHTMLButtonElement.idl"
+#include "IGEN_DOMHTMLCollection.idl"
+#include "IGEN_DOMHTMLDListElement.idl"
+#include "IGEN_DOMHTMLDirectoryElement.idl"
+#include "IGEN_DOMHTMLDivElement.idl"
+#include "IGEN_DOMHTMLDocument.idl"
+#include "IGEN_DOMHTMLElement.idl"
+#include "IGEN_DOMHTMLEmbedElement.idl"
+#include "IGEN_DOMHTMLFieldSetElement.idl"
+#include "IGEN_DOMHTMLFontElement.idl"
+#include "IGEN_DOMHTMLFormElement.idl"
+#include "IGEN_DOMHTMLFrameElement.idl"
+#include "IGEN_DOMHTMLFrameSetElement.idl"
+#include "IGEN_DOMHTMLHRElement.idl"
+#include "IGEN_DOMHTMLHeadElement.idl"
+#include "IGEN_DOMHTMLHeadingElement.idl"
+#include "IGEN_DOMHTMLHtmlElement.idl"
+#include "IGEN_DOMHTMLIFrameElement.idl"
+#include "IGEN_DOMHTMLImageElement.idl"
+#include "IGEN_DOMHTMLInputElement.idl"
+#include "IGEN_DOMHTMLIsIndexElement.idl"
+#include "IGEN_DOMHTMLLIElement.idl"
+#include "IGEN_DOMHTMLLabelElement.idl"
+#include "IGEN_DOMHTMLLegendElement.idl"
+#include "IGEN_DOMHTMLLinkElement.idl"
+#include "IGEN_DOMHTMLMapElement.idl"
+#include "IGEN_DOMHTMLMarqueeElement.idl"
+#include "IGEN_DOMHTMLMenuElement.idl"
+#include "IGEN_DOMHTMLMetaElement.idl"
+#include "IGEN_DOMHTMLModElement.idl"
+#include "IGEN_DOMHTMLOListElement.idl"
+#include "IGEN_DOMHTMLObjectElement.idl"
+#include "IGEN_DOMHTMLOptGroupElement.idl"
+#include "IGEN_DOMHTMLOptionElement.idl"
+#include "IGEN_DOMHTMLOptionsCollection.idl"
+#include "IGEN_DOMHTMLParagraphElement.idl"
+#include "IGEN_DOMHTMLParamElement.idl"
+#include "IGEN_DOMHTMLPreElement.idl"
+#include "IGEN_DOMHTMLQuoteElement.idl"
+#include "IGEN_DOMHTMLScriptElement.idl"
+#include "IGEN_DOMHTMLSelectElement.idl"
+#include "IGEN_DOMHTMLStyleElement.idl"
+#include "IGEN_DOMHTMLTableCaptionElement.idl"
+#include "IGEN_DOMHTMLTableCellElement.idl"
+#include "IGEN_DOMHTMLTableColElement.idl"
+#include "IGEN_DOMHTMLTableElement.idl"
+#include "IGEN_DOMHTMLTableRowElement.idl"
+#include "IGEN_DOMHTMLTableSectionElement.idl"
+#include "IGEN_DOMHTMLTextAreaElement.idl"
+#include "IGEN_DOMHTMLTitleElement.idl"
+#include "IGEN_DOMHTMLUListElement.idl"
+#include "IGEN_DOMMediaList.idl"
+#include "IGEN_DOMNamedNodeMap.idl"
+#include "IGEN_DOMNode.idl"
+#include "IGEN_DOMNodeList.idl"
+#include "IGEN_DOMNotation.idl"
+#include "IGEN_DOMProcessingInstruction.idl"
+#include "IGEN_DOMRect.idl"
+#include "IGEN_DOMStyleSheet.idl"
+#include "IGEN_DOMStyleSheetList.idl"
+
+#define __TYPELIB_VERSION__ __BUILD_NUMBER_MAJOR__##.##__BUILD_NUMBER_MINOR__
+
+cpp_quote("void shutDownWebKit();")
 
 [
-#if __PRODUCTION__
     uuid(2a748656-625d-4207-b29f-40c95bfeb3a9),
-    helpstring("WebKit 525.2 Type Library"),
-#else
-    uuid(76E5F7F0-18FD-48a2-B549-1159435B513B),
-    helpstring("OpenSourceWebKit 525.2 Type Library"),
-#endif
-    version(525.2)
+    helpstring("WebKit " __BUILD_NUMBER_SHORT__ " Type Library"),
+    version(__TYPELIB_VERSION__)
 ]
-#if __PRODUCTION__
 library WebKit
-#else
-library OpenSourceWebKit
-#endif
 {
     // TLib : OLE Automation : {00020430-0000-0000-C000-000000000046}
     importlib("STDOLE2.TLB");
 
-#if __PRODUCTION__
     [uuid(d6bca079-f61c-4e1e-b453-32a0477d02e3)]
-#else
-    [uuid(4FF47097-3FEA-4b47-AC0E-90725C546490)]
-#endif
     coclass WebView {
         [default] interface IWebView;
         interface IWebIBActions;
@@ -121,183 +250,119 @@ library OpenSourceWebKit
         interface IWebViewPrivate;
     }
 
-#if __PRODUCTION__
     [uuid(66827ec1-3aef-4241-bac5-f776b44f030f)]
-#else
-    [uuid(BE8EE509-9894-44ba-9E2F-E29780BCB25C)]
-#endif
     coclass WebIconDatabase {
         [default] interface IWebIconDatabase;
     }
 
-#if __PRODUCTION__
     [uuid(a062ecc3-bb1b-4694-a569-f59e0ad6be0c)]
-#else
-    [uuid(97F3EB52-9EAC-4062-82E1-E5C1E7789DEE)]
-#endif
     coclass WebMutableURLRequest {
         [default] interface IWebMutableURLRequest;
     }
 
-#if __PRODUCTION__
     [uuid(ba590766-0a6f-46c7-b96e-743490d94cb7)]
-#else
-    [uuid(99B9D99A-060D-4695-8C8F-3AB53156054C)]
-#endif
     coclass WebNotificationCenter {
         [default] interface IWebNotificationCenter;
     }
 
-#if __PRODUCTION__
     [uuid(a4b9b45d-949f-4c8c-9b92-6fbfcc1caaa2)]
-#else
-    [uuid(4D043991-E844-48b0-8EF7-85FE1AB8829E)]
-#endif
     coclass WebHistory {
         [default] interface IWebHistory;
     }
 
-#if __PRODUCTION__
     [uuid(dd653964-4d37-4fb2-9cb6-6a9a97719332)]
-#else
-    [uuid(97795891-293D-4855-800E-E21987568537)]
-#endif
     coclass CFDictionaryPropertyBag {
         [default] interface IPropertyBag;
     }
 
-#if __PRODUCTION__
     [uuid(6be190e9-1725-4e4a-88db-6a9fe242c9e5)]
-#else
-    [uuid(82F6400A-3CD0-40a3-8EA1-7A23B26D6153)]
-#endif
     coclass WebHistoryItem {
         [default] interface IWebHistoryItem;
     }
 
-#if __PRODUCTION__
     [uuid(f71071fd-a51b-4b69-9eb6-44374405e80c)]
-#else
-    [uuid(CB0111F6-168B-467e-8613-23AB37D0493E)]
-#endif
     coclass WebCache {
         [default] interface IWebCache;
     }
 
-#if __PRODUCTION__
     [uuid(1820D883-42FE-4b78-88C8-5456BB19D224)]
-#else
-    [uuid(5D911A44-4316-4a02-A2B5-BAE7036357B9)]
-#endif
     coclass WebJavaScriptCollector {
         [default] interface IWebJavaScriptCollector;
     }
 
-#if __PRODUCTION__
     [uuid(67B89F90-F778-438b-ABBF-34D1ACBF8651)]
-#else
-    [uuid(CC914F49-2385-4943-9B3F-E17501383F5B)]
-#endif
     coclass WebPreferences {
         [default] interface IWebPreferences;
     }
 
-#if __PRODUCTION__
     [uuid(E93AA8D7-F362-4a4a-A95D-325906BEB5F0)]
-#else
-    [uuid(87689DC6-5F8C-4194-90D5-CE6083837AB5)]
-#endif
     coclass WebKitStatistics {
         [default] interface IWebKitStatistics;
     }
 
-#if __PRODUCTION__
     [uuid(6C6AF3F9-36B4-4bf7-8BDE-74DCD4AD75A4)]
-#else
-    [uuid(319B38AC-2794-47fa-AE18-A14A7576A6D8)]
-#endif
     coclass WebError {
         [default] interface IWebError;
     }
 
-#if __PRODUCTION__
     [uuid(7433F53B-7FE9-484a-9432-72909457A646)]
-#else
-    [uuid(BCF988AF-9A2F-403f-A1D8-BD815C46401D)]
-#endif
     coclass WebURLCredential {
         [default] interface IWebURLCredential;
     }
 
-#if __PRODUCTION__
     [uuid(C0F98BD9-3B1C-413d-904A-E2D1453EAF1F)]
-#else
-    [uuid(3FE547FC-4EC1-4062-9DE2-9FC3DA0A08FF)]
-#endif
     coclass WebDownload {
         [default] interface IWebDownload;
     }
 
-#if __PRODUCTION__
     [uuid(2FB5499A-BB5D-4469-8517-789FEC8FD9BA)]
-#else
-    [uuid(20B9702D-B41F-449b-84FE-3E32DB5D775F)]
-#endif
     coclass WebURLRequest {
         [default] interface IWebURLRequest;
     }
 
-#if __PRODUCTION__
     [uuid(F366A6E8-E43C-4fd4-AAB0-8E6E79C73E6E)]
-#else
-    [uuid(41EFBA9A-63E4-4c49-A012-CCC48694D7A5)]
-#endif
     coclass WebURLProtectionSpace {
         [default] interface IWebURLProtectionSpace;
     }
 
-#if __PRODUCTION__
     [uuid(24A53AD5-AA9F-44e6-AA22-2C7C250B661A)]
-#else
-    [uuid(0F34FB95-301F-4ea1-943E-B5E6E6D94121)]
-#endif
     coclass WebScrollBar {
         [default] interface IWebScrollBarPrivate;
     }
 
-#if __PRODUCTION__
     [uuid(715636C4-59E7-4b85-BBC5-B555888787D7)]
-#else
-    [uuid(5BE39DBA-5887-4a69-9157-EBEE96BA3309)]
-#endif
     coclass WebScriptDebugServer {
         [default] interface IWebScriptDebugServer;
     }
 
-#if __PRODUCTION__
     [uuid(AB201196-8DD2-4d45-AEBD-029B6A37AA27)]
-#else
-    [uuid(EA2FCB14-072B-48b5-B9B5-1BBEFBABC7BC)]
-#endif
     coclass WebURLResponse {
         [default] interface IWebURLResponse;
     }
 
-#if __PRODUCTION__
     [uuid(24040cd6-aff4-4a51-9c8b-71539580ee76)]
-#else
-    [uuid(1fbff564-5ff4-484f-b3d9-217483f9f5fc)]
-#endif
     coclass WebTextRenderer {
         [default] interface IWebTextRenderer;
     }
 
-#if __PRODUCTION__
     [uuid(C2A1BFC2-1E7C-49fe-8592-D0C7FB440BC0)]
-#else
-    [uuid(1F7B8CEE-5D74-4974-8A47-C5733B422644)]
-#endif
     coclass WebDatabaseManager {
         [default] interface IWebDatabaseManager;
     }
+
+    [uuid(1B63D781-9BC4-4a04-899F-C4B05BBD3BE5)]
+    coclass WebArchive{
+        [default] interface IWebArchive;
+    }
+
+    [uuid(96B93356-9D61-4b3f-A6CF-A78283AC9649)]
+    coclass WebCoreStatistics{
+        [default] interface IWebCoreStatistics;
+    }
+
+    [uuid(3F35F332-BB2B-49b3-AEDD-27B317687E07)]
+    coclass WebCookieManager{
+        [default] interface IWebCookieManager;
+    }
 }
+
diff --git a/WebKit/win/Interfaces/WebScrollbarTypes.idl b/WebKit/win/Interfaces/WebScrollbarTypes.idl
new file mode 100644
index 0000000..75f31be
--- /dev/null
+++ b/WebKit/win/Interfaces/WebScrollbarTypes.idl
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2007, 2008 Apple 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
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
+
+// NOTE: these enums must be kept in sync with the WebCore versions in ScrollTypes.h
+typedef enum WebScrollBarOrientation {
+    WebHorizontalScrollbar = 0, 
+    WebVerticalScrollbar
+} WebScrollBarOrientation;
+
+typedef enum WebScrollBarControlSize { 
+    WebRegularScrollbar = 0, 
+    WebSmallScrollbar, 
+    WebMiniScrollbar 
+} WebScrollBarControlSize;
+
+typedef enum WebScrollDirection {
+    WebScrollUp = 0,
+    WebScrollDown,
+    WebScrollLeft,
+    WebScrollRight
+} WebScrollDirection;
+
+typedef enum WebScrollGranularity {
+    WebScrollByLine = 0,
+    WebScrollByPage,
+    WebScrollByDocument,
+    WebScrollByWheel
+} WebScrollGranularity;
+
+typedef unsigned WebScrollbarControlState;
+
+typedef enum WebScrollbarControlStateMask {
+    WebActiveScrollbarState = 1,
+    WebEnabledScrollbarState = 1 << 1,
+    WebPressedScrollbarState = 1 << 2,
+} WebScrollbarControlStateMask;
+
+typedef unsigned WebScrollbarControlPartMask;
+
+typedef enum WebScrollbarControlPart {
+    WebNoScrollPart = 0,
+    WebBackButtonPart = 1,
+    WebBackTrackPart = 1 << 1,
+    WebThumbPart = 1 << 2,
+    WebForwardTrackPart = 1 << 3,
+    WebForwardButtonPart = 1 << 4,
+    WebAllParts = 0xffffffff,
+} WebScrollbarControlPart;
+