[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
bweinstein at apple.com
bweinstein at apple.com
Wed Apr 7 23:53:03 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a6161b785a5660b6552fa1c1e2a77c21874c41a9
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 21 01:54:59 2009 +0000
Build fix for Windows - only declare JSContextRef once, instead
of in two different idl files. Create a new file to hold the
definition of JSContextRef.
Reviewed by Dave Hyatt.
* Interfaces/IWebFrameLoadDelegate.idl:
* Interfaces/IWebSerializedJSValue.idl:
* Interfaces/JavaScriptCoreAPITypes.idl: Added.
* Interfaces/WebKit.idl:
* WebKit.vcproj/Interfaces.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51271 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ae73252..65df035 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-20 Brian Weinstein <bweinstein at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ Build fix for Windows - only declare JSContextRef once, instead
+ of in two different idl files. Create a new file to hold the
+ definition of JSContextRef.
+
+ * Interfaces/IWebFrameLoadDelegate.idl:
+ * Interfaces/IWebSerializedJSValue.idl:
+ * Interfaces/JavaScriptCoreAPITypes.idl: Added.
+ * Interfaces/WebKit.idl:
+ * WebKit.vcproj/Interfaces.vcproj:
+
2009-11-20 Dave Hyatt <hyatt at apple.com>
Reviewed by Oliver Hunt and Jon Honeycutt.
diff --git a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
index 66ac241..9847151 100644
--- a/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
+++ b/WebKit/win/Interfaces/IWebFrameLoadDelegate.idl
@@ -29,18 +29,9 @@ import "ocidl.idl";
import "IWebScriptObject.idl";
import "IWebView.idl";
import "IWebFrame.idl";
+import "JavaScriptCoreAPITypes.idl";
#endif
-cpp_quote("// this is done to get midl to treat the JavaScriptCore API types as pointer types")
-cpp_quote("#if 0")
-typedef void* JSContextRef;
-typedef void* JSObjectRef;
-cpp_quote("#else")
-cpp_quote("typedef struct OpaqueJSValue* JSObjectRef;")
-cpp_quote("typedef const struct OpaqueJSContext* JSContextRef;")
-cpp_quote("#endif")
-
-
interface IWebError;
interface IWebFrame;
interface IWebScriptObject;
diff --git a/WebKit/win/Interfaces/IWebSerializedJSValue.idl b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
index 4b395de..a944816 100644
--- a/WebKit/win/Interfaces/IWebSerializedJSValue.idl
+++ b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
@@ -25,17 +25,9 @@
#ifndef DO_NO_IMPORTS
import "oaidl.idl";
import "ocidl.idl";
+import "JavaScriptCoreAPITypes.idl";
#endif
-cpp_quote("// this is done to get midl to treat the JavaScriptCore API types as pointer types")
-cpp_quote("#if 0")
-typedef void* JSContextRef;
-typedef void* JSValueRef;
-cpp_quote("#else")
-cpp_quote("typedef struct OpaqueJSValue* JSValueRef;")
-cpp_quote("typedef const struct OpaqueJSContext* JSContextRef;")
-cpp_quote("#endif")
-
[
object,
oleautomation,
diff --git a/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl b/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl
new file mode 100755
index 0000000..e4de9a1
--- /dev/null
+++ b/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009 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. 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 INC. 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
+
+cpp_quote("// this is done to get midl to treat the JavaScriptCore API types as pointer types")
+cpp_quote("#if 0")
+typedef void* JSContextRef;
+typedef void* JSValueRef;
+cpp_quote("#else")
+cpp_quote("typedef struct OpaqueJSValue* JSValueRef;")
+cpp_quote("typedef const struct OpaqueJSContext* JSContextRef;")
+cpp_quote("#endif")
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 4800153..058b6fc 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -56,6 +56,7 @@ import "oaidl.idl";
import "ocidl.idl";
#include "WebScrollbarTypes.idl"
+#include "JavaScriptCoreAPITypes.idl"
#include "IWebScriptObject.idl"
#include "DOMCSS.idl"
#include "DOMCore.idl"
diff --git a/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index ad82d94..44cb73b 100644
--- a/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -1644,6 +1644,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\Interfaces\JavaScriptCoreAPITypes.idl"
+ >
+ </File>
+ <File
RelativePath="..\Interfaces\WebKit.idl"
>
<FileConfiguration
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list