Changeset 160047 in webkit

Timestamp:

Dec 3, 2013 3:19:40 PM (10 years ago)

Author:

andersca@apple.com

Message:

PageBannerClientImpl should be an API::Client
​https://bugs.webkit.org/show_bug.cgi?id=125190

Reviewed by Tim Horton.

• WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:

(PageBannerClientImpl::PageBannerClientImpl):
(PageBannerClientImpl::~PageBannerClientImpl):
(WKBundlePageBannerCreateBannerWithCALayer):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-03  Anders Carlsson  <andersca@apple.com>
+
+        PageBannerClientImpl should be an API::Client
+        https://bugs.webkit.org/show_bug.cgi?id=125190
+
+        Reviewed by Tim Horton.
+
+        * WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm:
+        (PageBannerClientImpl::PageBannerClientImpl):
+        (PageBannerClientImpl::~PageBannerClientImpl):
+        (WKBundlePageBannerCreateBannerWithCALayer):
+
 2013-12-03  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm

@@ -27 +27 @@
 #include "WKBundlePageBannerMac.h"
 
+#include "APIClient.h"
 #include "PageBanner.h"
 #include "WKAPICast.h"
@@ -35 +36 @@
 using namespace WebKit;
 
-class PageBannerClientImpl : public PageBanner::Client {
+namespace API {
+template<> struct ClientTraits<WKBundlePageBannerClientBase> {
+    typedef std::tuple<WKBundlePageBannerClientV0> Versions;
+};
+}
+
+class PageBannerClientImpl : API::Client<WKBundlePageBannerClientBase>, public PageBanner::Client {
 public:
-    explicit PageBannerClientImpl(WKBundlePageBannerClient* client)
-        : m_client()
+    explicit PageBannerClientImpl(WKBundlePageBannerClientBase* client)
     {
-        if (client)
-            m_client = *client;
+    }
+
+    virtual ~PageBannerClientImpl()
+    {
     }
 
 private:
     // PageBanner::Client.
-    virtual void pageBannerDestroyed(PageBanner*)
+    virtual void pageBannerDestroyed(PageBanner*) OVERRIDE
     {
         delete this;
     }
     
-    virtual bool mouseEvent(PageBanner* pageBanner, WebEvent::Type type, WebMouseEvent::Button button, const WebCore::IntPoint& position)
+    virtual bool mouseEvent(PageBanner* pageBanner, WebEvent::Type type, WebMouseEvent::Button button, const IntPoint& position) OVERRIDE
     {
         switch (type) {
@@ -58 +66 @@
                 return false;
 
-            return m_client.mouseDown(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.clientInfo);
+            return m_client.mouseDown(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.base.clientInfo);
         }
         case WebEvent::MouseUp: {
@@ -64 +72 @@
                 return false;
 
-            return m_client.mouseUp(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.clientInfo);
+            return m_client.mouseUp(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.base.clientInfo);
         }
         case WebEvent::MouseMove: {
@@ -71 +79 @@
                     return false;
 
-                return m_client.mouseMoved(toAPI(pageBanner), toAPI(position), m_client.clientInfo);
+                return m_client.mouseMoved(toAPI(pageBanner), toAPI(position), m_client.base.clientInfo);
             }
 
@@ -78 +86 @@
                 return false;
 
-            return m_client.mouseDragged(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.clientInfo);
+            return m_client.mouseDragged(toAPI(pageBanner), toAPI(position), toAPI(button), m_client.base.clientInfo);
         }
 
@@ -85 +93 @@
         }
     }
-    
-    WKBundlePageBannerClient m_client;
 };
 
-WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient * wkClient)
+WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer, int height, WKBundlePageBannerClient* wkClient)
 {
     if (wkClient && wkClient->version)
         return 0;
 
-    auto clientImpl = std::make_unique<PageBannerClientImpl>(wkClient);
+    auto clientImpl = std::make_unique<PageBannerClientImpl>(reinterpret_cast<WKBundlePageBannerClientBase*>(wkClient));
     return toAPI(PageBanner::create(layer, height, clientImpl.release()).leakRef());
 }