[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 14:29:39 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ba67f6e6e5d214aaeed8d986b618d7085995b5c6
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 21:08:30 2010 +0000
Add Private API for creating a WebKit2 WebSerializedScriptValue from the internal
representation of a WebKit1 WebSerializedJSValue.
https://bugs.webkit.org/show_bug.cgi?id=47439
Reviewed by Darin Adler.
WebKit/mac:
* WebView/WebSerializedJSValue.mm:
(-[WebSerializedJSValue internalRepresentation]):
* WebView/WebSerializedJSValuePrivate.h:
WebKit/win:
* Interfaces/IWebSerializedJSValuePrivate.idl:
Because it is taking a void** parameter, getInternalRepresentation must be declared [local].
* WebSerializedJSValue.cpp:
(WebSerializedJSValue::getInternalRepresentation):
* WebSerializedJSValue.h:
WebKit2:
* Shared/API/c/WKSerializedScriptValue.cpp:
(WKSerializedScriptValueCreateWithInternalRepresentation):
Use the existing WebSerializedScriptValue constructor that takes a pointer to the internal
representation (a WebCore::SerializedScriptValue).
* Shared/API/c/WKSerializedScriptValuePrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69524 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index db9850b..dc107e6 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-11 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add Private API for creating a WebKit2 WebSerializedScriptValue from the internal
+ representation of a WebKit1 WebSerializedJSValue.
+ https://bugs.webkit.org/show_bug.cgi?id=47439
+
+ * WebView/WebSerializedJSValue.mm:
+ (-[WebSerializedJSValue internalRepresentation]):
+ * WebView/WebSerializedJSValuePrivate.h:
+
2010-10-07 Jessie Berlin <jberlin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/mac/WebView/WebSerializedJSValue.mm b/WebKit/mac/WebView/WebSerializedJSValue.mm
index 11c795e..d993790 100644
--- a/WebKit/mac/WebView/WebSerializedJSValue.mm
+++ b/WebKit/mac/WebView/WebSerializedJSValue.mm
@@ -103,5 +103,12 @@ using namespace WebCore;
[super dealloc];
}
+- (void*)internalRepresentation
+{
+ if (!_private)
+ return 0;
+ return _private->value.get();
+}
+
@end
diff --git a/WebKit/mac/WebView/WebSerializedJSValuePrivate.h b/WebKit/mac/WebView/WebSerializedJSValuePrivate.h
index 8f0a189..217fe44 100644
--- a/WebKit/mac/WebView/WebSerializedJSValuePrivate.h
+++ b/WebKit/mac/WebView/WebSerializedJSValuePrivate.h
@@ -30,4 +30,5 @@
@interface WebSerializedJSValue(WebPrivate)
- (id)initWithInternalRepresentation:(void*)internalRepresenatation;
+- (void*)internalRepresentation;
@end
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 15a1217..3017340 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-11 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add Private API for creating a WebKit2 WebSerializedScriptValue from the internal
+ representation of a WebKit1 WebSerializedJSValue.
+ https://bugs.webkit.org/show_bug.cgi?id=47439
+
+ * Interfaces/IWebSerializedJSValuePrivate.idl:
+ Because it is taking a void** parameter, getInternalRepresentation must be declared [local].
+
+ * WebSerializedJSValue.cpp:
+ (WebSerializedJSValue::getInternalRepresentation):
+ * WebSerializedJSValue.h:
+
2010-10-07 Jessie Berlin <jberlin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl b/WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl
index 74771d9..847dd76 100644
--- a/WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl
+++ b/WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl
@@ -41,4 +41,5 @@ import "ocidl.idl";
interface IWebSerializedJSValuePrivate : IUnknown
{
[local] HRESULT setInternalRepresentation([in] void* internalRepresentation);
+ [local] HRESULT getInternalRepresentation([out, retval] void** internalRepresentation);
}
diff --git a/WebKit/win/WebSerializedJSValue.cpp b/WebKit/win/WebSerializedJSValue.cpp
index de822d5..7f6e3b0 100644
--- a/WebKit/win/WebSerializedJSValue.cpp
+++ b/WebKit/win/WebSerializedJSValue.cpp
@@ -117,3 +117,13 @@ HRESULT WebSerializedJSValue::setInternalRepresentation(void* internalRepresenta
return S_OK;
}
+
+HRESULT WebSerializedJSValue::getInternalRepresentation(void** internalRepresentation)
+{
+ if (!m_value)
+ return E_POINTER;
+
+ *internalRepresentation = m_value.get();
+ return S_OK;
+}
+
diff --git a/WebKit/win/WebSerializedJSValue.h b/WebKit/win/WebSerializedJSValue.h
index 826fd22..a2d6d56 100644
--- a/WebKit/win/WebSerializedJSValue.h
+++ b/WebKit/win/WebSerializedJSValue.h
@@ -44,6 +44,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE serialize(JSContextRef, JSValueRef value, JSValueRef* exception);
virtual HRESULT STDMETHODCALLTYPE deserialize(JSContextRef, JSValueRef* result);
virtual HRESULT STDMETHODCALLTYPE setInternalRepresentation(void* internalRepresentation);
+ virtual HRESULT STDMETHODCALLTYPE getInternalRepresentation(void** internalRepresentation);
private:
WebSerializedJSValue();
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 90e737d..4dbe808 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-11 Jessie Berlin <jberlin at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Add Private API for creating a WebKit2 WebSerializedScriptValue from the internal
+ representation of a WebKit1 WebSerializedJSValue.
+ https://bugs.webkit.org/show_bug.cgi?id=47439
+
+ * Shared/API/c/WKSerializedScriptValue.cpp:
+ (WKSerializedScriptValueCreateWithInternalRepresentation):
+ Use the existing WebSerializedScriptValue constructor that takes a pointer to the internal
+ representation (a WebCore::SerializedScriptValue).
+ * Shared/API/c/WKSerializedScriptValuePrivate.h:
+
2010-10-11 Mike Thole <mthole at apple.com>
Reviewed by Darin Adler.
diff --git a/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp b/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp
index 276f236..4c642f0 100644
--- a/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp
+++ b/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp
@@ -42,6 +42,12 @@ WKSerializedScriptValueRef WKSerializedScriptValueCreate(JSContextRef context, J
return toAPI(serializedValue.release().leakRef());
}
+WKSerializedScriptValueRef WKSerializedScriptValueCreateWithInternalRepresentation(void* internalRepresentation)
+{
+ RefPtr<WebSerializedScriptValue> serializedValue = WebSerializedScriptValue::create(static_cast<WebCore::SerializedScriptValue*>(internalRepresentation));
+ return toAPI(serializedValue.release().leakRef());
+}
+
JSValueRef WKSerializedScriptValueDeserialize(WKSerializedScriptValueRef scriptValueRef, JSContextRef contextRef, JSValueRef* exception)
{
return toImpl(scriptValueRef)->deserialize(contextRef, exception);
diff --git a/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h b/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h
index 6f0a472..27e1849 100644
--- a/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h
+++ b/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h
@@ -33,6 +33,7 @@ extern "C" {
#endif
WK_EXPORT void* WKSerializedScriptValueGetInternalRepresentation(WKSerializedScriptValueRef scriptValueRef);
+WK_EXPORT WKSerializedScriptValueRef WKSerializedScriptValueCreateWithInternalRepresentation(void*);
#ifdef __cplusplus
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list