Changeset 69524 in webkit

Timestamp:

Oct 11, 2010 2:08:30 PM (14 years ago)

Author:

jberlin@webkit.org

Message:

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:

Location:

trunk

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebSerializedJSValue.mm (modified) (1 diff)
• WebKit/mac/WebView/WebSerializedJSValuePrivate.h (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl (modified) (1 diff)
• WebKit/win/WebSerializedJSValue.cpp (modified) (1 diff)
• WebKit/win/WebSerializedJSValue.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/API/c/WKSerializedScriptValue.cpp (modified) (1 diff)
• WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-10-11  Jessie Berlin  <jberlin@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@apple.com>
 

trunk/WebKit/mac/WebView/WebSerializedJSValue.mm

@@ -104 +104 @@
 }
 
+- (void*)internalRepresentation
+{
+    if (!_private)
+        return 0;
+    return _private->value.get();
+}
+
 @end
 

trunk/WebKit/mac/WebView/WebSerializedJSValuePrivate.h

@@ -31 +31 @@
 @interface WebSerializedJSValue(WebPrivate)
 - (id)initWithInternalRepresentation:(void*)internalRepresenatation;
+- (void*)internalRepresentation;
 @end

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-10-11  Jessie Berlin  <jberlin@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@apple.com>
 

trunk/WebKit/win/Interfaces/IWebSerializedJSValuePrivate.idl

@@ -42 +42 @@
 {
     [local] HRESULT setInternalRepresentation([in] void* internalRepresentation);
+    [local] HRESULT getInternalRepresentation([out, retval] void** internalRepresentation);
 }

trunk/WebKit/win/WebSerializedJSValue.cpp

@@ -118 +118 @@
     return S_OK;
 }
+
+HRESULT WebSerializedJSValue::getInternalRepresentation(void** internalRepresentation)
+{
+    if (!m_value)
+        return E_POINTER;
+
+    *internalRepresentation = m_value.get();
+    return S_OK;
+}
+

trunk/WebKit/win/WebSerializedJSValue.h

@@ -45 +45 @@
     virtual HRESULT STDMETHODCALLTYPE deserialize(JSContextRef, JSValueRef* result);
     virtual HRESULT STDMETHODCALLTYPE setInternalRepresentation(void* internalRepresentation);
+    virtual HRESULT STDMETHODCALLTYPE getInternalRepresentation(void** internalRepresentation);
 
 private:

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-11  Jessie Berlin  <jberlin@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@apple.com>
 

trunk/WebKit2/Shared/API/c/WKSerializedScriptValue.cpp

@@ -43 +43 @@
 }
 
+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)
 {

trunk/WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h

@@ -34 +34 @@
 
 WK_EXPORT void* WKSerializedScriptValueGetInternalRepresentation(WKSerializedScriptValueRef scriptValueRef);
+WK_EXPORT WKSerializedScriptValueRef WKSerializedScriptValueCreateWithInternalRepresentation(void*);
 
 #ifdef __cplusplus