Changeset 160378 in webkit

Timestamp:

Dec 10, 2013 11:43:10 AM (10 years ago)

Author:

andersca@apple.com

Message:

More UserData work
​https://bugs.webkit.org/show_bug.cgi?id=125524

Reviewed by Dan Bernstein.

• Shared/APIObject.h:
• Shared/UserData.cpp:

(WebKit::UserData::transform):
New helper function that takes an API::Object and returns a new API::Object with all "sub-objects" (arrays etc)
transformed by calling the transformer.

• Shared/UserData.h:

(WebKit::UserData::object):
New getter.

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::apiObjectByConvertingToHandles):
Helper function that creates a new API::Object graph by converting WebFrameProxy objects to FrameHandles.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::apiObjectByConvertingFromHandles):
Helper function that creates a new API::Object graph by converting FrameHandles to WebFrame objects.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/APIObject.h (modified) (1 diff)
• Shared/UserData.cpp (modified) (1 diff)
• Shared/UserData.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (3 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-10  Anders Carlsson  <andersca@apple.com>
+
+        More UserData work
+        https://bugs.webkit.org/show_bug.cgi?id=125524
+
+        Reviewed by Dan Bernstein.
+
+        * Shared/APIObject.h:
+        * Shared/UserData.cpp:
+        (WebKit::UserData::transform):
+        New helper function that takes an API::Object and returns a new API::Object with all "sub-objects" (arrays etc)
+        transformed by calling the transformer.
+
+        * Shared/UserData.h:
+        (WebKit::UserData::object):
+        New getter.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::apiObjectByConvertingToHandles):
+        Helper function that creates a new API::Object graph by converting WebFrameProxy objects to FrameHandles.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::apiObjectByConvertingFromHandles):
+        Helper function that creates a new API::Object graph by converting FrameHandles to WebFrame objects.
+
 2013-12-10  Alberto Garcia  <berto@igalia.com>
 

trunk/Source/WebKit2/Shared/APIObject.h

@@ -27 +27 @@
 #define APIObject_h
 
+#include <functional>
 #include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 
 #if PLATFORM(MAC)

trunk/Source/WebKit2/Shared/UserData.cpp

@@ -45 +45 @@
 }
 
+RefPtr<API::Object> UserData::transform(API::Object* object, const std::function<RefPtr<API::Object> (const API::Object&)> transformer)
+{
+    if (!object)
+        return nullptr;
+
+    if (object->type() == API::Object::Type::Array) {
+        auto& array = static_cast<API::Array&>(*object);
+
+        Vector<RefPtr<API::Object>> elements;
+        elements.reserveInitialCapacity(array.elements().size());
+        for (const auto& element : array.elements())
+            elements.uncheckedAppend(transform(element.get(), transformer));
+
+        return API::Array::create(std::move(elements));
+    }
+
+    if (auto transformedObject = transformer(*object))
+        return transformedObject;
+
+    return object;
+}
+
 void UserData::encode(CoreIPC::ArgumentEncoder& encoder) const
 {

trunk/Source/WebKit2/Shared/UserData.h

@@ -46 +46 @@
     ~UserData();
 
+    static RefPtr<API::Object> transform(API::Object*, const std::function<RefPtr<API::Object> (const API::Object&)> transformer);
+
+    API::Object* object() const { return m_object.get(); }
+
     void encode(CoreIPC::ArgumentEncoder&) const;
     static bool decode(CoreIPC::ArgumentDecoder&, UserData&);

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -27 +27 @@
 #include "WebProcessProxy.h"
 
+#include "APIFrameHandle.h"
 #include "CustomProtocolManagerProxyMessages.h"
 #include "DataReference.h"
@@ -34 +35 @@
 #include "TextChecker.h"
 #include "TextCheckerState.h"
+#include "UserData.h"
 #include "WebBackForwardListItem.h"
 #include "WebContext.h"
@@ -686 +688 @@
 }
 
+RefPtr<API::Object> WebProcessProxy::apiObjectByConvertingToHandles(API::Object* object)
+{
+    return UserData::transform(object, [](const API::Object& object) -> RefPtr<API::Object> {
+        switch (object.type()) {
+        case API::Object::Type::Frame: {
+            auto& frame = static_cast<const WebFrameProxy&>(object);
+            return API::FrameHandle::create(frame.frameID());
+        }
+
+        default:
+            return nullptr;
+        }
+    });
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -127 +127 @@
     void requestTermination();
 
+    RefPtr<API::Object> apiObjectByConvertingToHandles(API::Object*);
+
 private:
     explicit WebProcessProxy(WebContext&);

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -27 +27 @@
 #include "WebProcess.h"
 
+#include "APIFrameHandle.h"
 #include "AuthenticationManager.h"
 #include "EventDispatcher.h"
@@ -34 +35 @@
 #include "PluginProcessConnectionManager.h"
 #include "StatisticsData.h"
+#include "UserData.h"
 #include "WebApplicationCacheManager.h"
 #include "WebConnectionToUIProcess.h"
@@ -1185 +1187 @@
 }
 
+RefPtr<API::Object> WebProcess::apiObjectByConvertingFromHandles(API::Object* object)
+{
+    return UserData::transform(object, [this](const API::Object& object) -> RefPtr<API::Object> {
+        switch (object.type()) {
+        case API::Object::Type::FrameHandle: {
+            auto& frameHandle = static_cast<const API::FrameHandle&>(object);
+
+            return webFrame(frameHandle.frameID());
+        }
+
+        default:
+            return nullptr;
+        }
+    });
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -48 +48 @@
 #endif
 
+namespace API {
+class Object;
+}
+
 namespace WebCore {
 class PageGroup;
@@ -182 +186 @@
 #endif // PLATFORM(IOS)
 
+    RefPtr<API::Object> apiObjectByConvertingFromHandles(API::Object*);
+
 private:
     WebProcess();