Title: [177700] trunk/Source/WebKit2
- Revision
- 177700
- Author
- [email protected]
- Date
- 2014-12-23 15:35:33 -0800 (Tue, 23 Dec 2014)
Log Message
Add handle transform functions to WebConnection
https://bugs.webkit.org/show_bug.cgi?id=139920
Reviewed by Sam Weinig.
This will be used by the web connection code to convert between objects and their respective handles.
* Shared/WebConnection.h:
* UIProcess/WebConnectionToWebProcess.cpp:
(WebKit::WebConnectionToWebProcess::transformHandlesToObjects):
(WebKit::WebConnectionToWebProcess::transformObjectsToHandles):
* UIProcess/WebConnectionToWebProcess.h:
* WebProcess/WebConnectionToUIProcess.cpp:
(WebKit::WebConnectionToUIProcess::transformHandlesToObjects):
(WebKit::WebConnectionToUIProcess::transformObjectsToHandles):
* WebProcess/WebConnectionToUIProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177699 => 177700)
--- trunk/Source/WebKit2/ChangeLog 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-23 23:35:33 UTC (rev 177700)
@@ -1,3 +1,22 @@
+2014-12-23 Anders Carlsson <[email protected]>
+
+ Add handle transform functions to WebConnection
+ https://bugs.webkit.org/show_bug.cgi?id=139920
+
+ Reviewed by Sam Weinig.
+
+ This will be used by the web connection code to convert between objects and their respective handles.
+
+ * Shared/WebConnection.h:
+ * UIProcess/WebConnectionToWebProcess.cpp:
+ (WebKit::WebConnectionToWebProcess::transformHandlesToObjects):
+ (WebKit::WebConnectionToWebProcess::transformObjectsToHandles):
+ * UIProcess/WebConnectionToWebProcess.h:
+ * WebProcess/WebConnectionToUIProcess.cpp:
+ (WebKit::WebConnectionToUIProcess::transformHandlesToObjects):
+ (WebKit::WebConnectionToUIProcess::transformObjectsToHandles):
+ * WebProcess/WebConnectionToUIProcess.h:
+
2014-12-23 Sam Weinig <[email protected]>
Rename ImmutableDictionary to API::Dictionary and merge MutableDictionary into it
Modified: trunk/Source/WebKit2/Shared/WebConnection.h (177699 => 177700)
--- trunk/Source/WebKit2/Shared/WebConnection.h 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/Shared/WebConnection.h 2014-12-23 23:35:33 UTC (rev 177700)
@@ -45,6 +45,8 @@
protected:
explicit WebConnection();
+ virtual RefPtr<API::Object> transformHandlesToObjects(API::Object*) = 0;
+ virtual RefPtr<API::Object> transformObjectsToHandles(API::Object*) = 0;
virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) = 0;
virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp (177699 => 177700)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2014-12-23 23:35:33 UTC (rev 177700)
@@ -50,6 +50,18 @@
// WebConnection
+RefPtr<API::Object> WebConnectionToWebProcess::transformHandlesToObjects(API::Object* object)
+{
+ // FIXME: Implement.
+ return nullptr;
+}
+
+RefPtr<API::Object> WebConnectionToWebProcess::transformObjectsToHandles(API::Object* object)
+{
+ // FIXME: Implement.
+ return nullptr;
+}
+
void WebConnectionToWebProcess::encodeMessageBody(IPC::ArgumentEncoder& encoder, API::Object* messageBody)
{
encoder << WebContextUserMessageEncoder(messageBody, *m_process);
Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h (177699 => 177700)
--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h 2014-12-23 23:35:33 UTC (rev 177700)
@@ -44,6 +44,8 @@
WebConnectionToWebProcess(WebProcessProxy*);
// WebConnection
+ virtual RefPtr<API::Object> transformHandlesToObjects(API::Object*) override;
+ virtual RefPtr<API::Object> transformObjectsToHandles(API::Object*) override;
virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) override;
virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) override;
virtual bool hasValidConnection() const override;
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp (177699 => 177700)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2014-12-23 23:35:33 UTC (rev 177700)
@@ -52,6 +52,16 @@
// WebConnection
+RefPtr<API::Object> WebConnectionToUIProcess::transformHandlesToObjects(API::Object* object)
+{
+ return m_process->transformHandlesToObjects(object);
+}
+
+RefPtr<API::Object> WebConnectionToUIProcess::transformObjectsToHandles(API::Object* object)
+{
+ return m_process->transformObjectsToHandles(object);
+}
+
void WebConnectionToUIProcess::encodeMessageBody(IPC::ArgumentEncoder& encoder, API::Object* messageBody)
{
encoder << InjectedBundleUserMessageEncoder(messageBody);
Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h (177699 => 177700)
--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2014-12-23 23:07:40 UTC (rev 177699)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h 2014-12-23 23:35:33 UTC (rev 177700)
@@ -42,6 +42,8 @@
WebConnectionToUIProcess(WebProcess*);
// WebConnection
+ virtual RefPtr<API::Object> transformHandlesToObjects(API::Object*) override;
+ virtual RefPtr<API::Object> transformObjectsToHandles(API::Object*) override;
virtual void encodeMessageBody(IPC::ArgumentEncoder&, API::Object*) override;
virtual bool decodeMessageBody(IPC::ArgumentDecoder&, RefPtr<API::Object>&) override;
virtual bool hasValidConnection() const override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
