[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:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7f55f263e5dd19cc0d806ee6b3ca2888d29a9f03
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 21 02:36:38 2009 +0000
Another go at the Windows Build Fix - this is a couple steps of it,
so a little more involved than most build fixes.
Reviewed by Dave Hyatt.
* Interfaces/IWebSerializedJSValue.idl:
* Interfaces/JavaScriptCoreAPITypes.idl:
* WebKit.vcproj/Interfaces.vcproj:
* WebSerializedJSValue.cpp:
(WebSerializedJSValue::deserialize):
* WebSerializedJSValue.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 65df035..869215f 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -2,6 +2,20 @@
Reviewed by Dave Hyatt.
+ Another go at the Windows Build Fix - this is a couple steps of it,
+ so a little more involved than most build fixes.
+
+ * Interfaces/IWebSerializedJSValue.idl:
+ * Interfaces/JavaScriptCoreAPITypes.idl:
+ * WebKit.vcproj/Interfaces.vcproj:
+ * WebSerializedJSValue.cpp:
+ (WebSerializedJSValue::deserialize):
+ * WebSerializedJSValue.h:
+
+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.
diff --git a/WebKit/win/Interfaces/IWebSerializedJSValue.idl b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
index a944816..16bc924 100644
--- a/WebKit/win/Interfaces/IWebSerializedJSValue.idl
+++ b/WebKit/win/Interfaces/IWebSerializedJSValue.idl
@@ -35,5 +35,5 @@ import "JavaScriptCoreAPITypes.idl";
pointer_default(unique)
]
interface IWebSerializedJSValue : IUnknown {
- HRESULT deserialize([in] JSContextRef context, [out, retval] JSValueRef* value);
+ [local] HRESULT deserialize([in] JSContextRef context, [out, retval] JSValueRef* value);
}
diff --git a/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl b/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl
index e4de9a1..f2ef1f1 100755
--- a/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl
+++ b/WebKit/win/Interfaces/JavaScriptCoreAPITypes.idl
@@ -1,25 +1,25 @@
-/*
- * 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.
+/*
+ * 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
@@ -27,11 +27,14 @@ 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("// 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;
+typedef void* JSValueRef;
+cpp_quote("#else")
+cpp_quote("typedef const struct OpaqueJSValue* JSValueRef;")
+cpp_quote("typedef struct OpaqueJSValue* JSObjectRef;")
+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 058b6fc..7b308db 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -285,4 +285,3 @@ library WebKit
[default] interface IWebSerializedJSValue;
}
}
-
diff --git a/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index 44cb73b..ca9b2a4 100644
--- a/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -1644,10 +1644,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\Interfaces\JavaScriptCoreAPITypes.idl"
- >
- </File>
- <File
RelativePath="..\Interfaces\WebKit.idl"
>
<FileConfiguration
@@ -1687,6 +1683,26 @@
/>
</FileConfiguration>
</File>
+ <File
+ RelativePath="..\Interfaces\JavaScriptCoreAPITypes.idl"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCMIDLTool"
+ />
+ </FileConfiguration>
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/WebKit/win/WebSerializedJSValue.cpp b/WebKit/win/WebSerializedJSValue.cpp
index e845cc1..e1ecdec 100644
--- a/WebKit/win/WebSerializedJSValue.cpp
+++ b/WebKit/win/WebSerializedJSValue.cpp
@@ -26,7 +26,7 @@
#include "WebKitDLL.h"
#include "WebSerializedJSValue.h"
-#include <WebCore/SeralizedScriptValue.h>
+#include <WebCore/SerializedScriptValue.h>
using namespace WebCore;
@@ -91,10 +91,10 @@ HRESULT WebSerializedJSValue::deserialize(JSContextRef destinationContext, JSVal
if (!outValue)
return E_POINTER;
- if (!_private->m_value)
+ if (m_value)
*outValue = 0;
else
- *outValue = _private->value->deserialize(destinationContext, 0);
+ *outValue = m_value->deserialize(destinationContext, 0);
return S_OK;
}
diff --git a/WebKit/win/WebSerializedJSValue.h b/WebKit/win/WebSerializedJSValue.h
index ba7bc89..2a21d57 100644
--- a/WebKit/win/WebSerializedJSValue.h
+++ b/WebKit/win/WebSerializedJSValue.h
@@ -44,7 +44,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE deserialize(JSContextRef, JSValueRef* result);
private:
- WebSerializedJSValue(JSContextRef, JSValueRef);
+ WebSerializedJSValue(JSContextRef, JSValueRef, JSValueRef*);
~WebSerializedJSValue();
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void** ppvObject);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list