Changeset 166915 in webkit

Timestamp:

Apr 8, 2014 12:14:20 AM (10 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Change NavigatorContentUtils client ownership from port side to NavigatorContentUtils
​https://bugs.webkit.org/show_bug.cgi?id=131299

Reviewed by Darin Adler.

EFL and GTK ports have managed own client of NavigatorContentUtils though it is only passed to
NavigatorContentUtils. The NavigatorContentUtils has used the client to call port functions. So,
there is no reason port implementation needs to manage the ownership. To manage the client is
unnecessary work in current implementation.

Source/WebCore:

No new tests, no behavior changes.

• Modules/navigatorcontentutils/NavigatorContentUtils.cpp:

(WebCore::NavigatorContentUtils::create):
(WebCore::provideNavigatorContentUtilsTo):

• Modules/navigatorcontentutils/NavigatorContentUtils.h:
• Modules/navigatorcontentutils/NavigatorContentUtilsClient.h:

Source/WebKit/efl:

• ewk/ewk_view.cpp:

(_ewk_view_priv_new):

Source/WebKit/gtk:

• webkit/webkitwebview.cpp:

(webkit_web_view_init):

• webkit/webkitwebviewprivate.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp (modified) (2 diffs)
• WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h (modified) (1 diff)
• WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/ewk/ewk_view.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebviewprivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Change NavigatorContentUtils client ownership from port side to NavigatorContentUtils
+        https://bugs.webkit.org/show_bug.cgi?id=131299
+
+        Reviewed by Darin Adler.
+
+        EFL and GTK ports have managed own client of NavigatorContentUtils though it is only passed to
+        NavigatorContentUtils. The NavigatorContentUtils has used the client to call port functions. So,
+        there is no reason port implementation needs to manage the ownership. To manage the client is
+        unnecessary work in current implementation.
+
+        No new tests, no behavior changes.
+
+        * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+        (WebCore::NavigatorContentUtils::create):
+        (WebCore::provideNavigatorContentUtilsTo):
+        * Modules/navigatorcontentutils/NavigatorContentUtils.h:
+        * Modules/navigatorcontentutils/NavigatorContentUtilsClient.h:
+
 2014-04-07  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp

@@ -127 +127 @@
 }
 
-PassRef<NavigatorContentUtils> NavigatorContentUtils::create(NavigatorContentUtilsClient* client)
-{
-    return adoptRef(*new NavigatorContentUtils(client));
+PassRef<NavigatorContentUtils> NavigatorContentUtils::create(std::unique_ptr<NavigatorContentUtilsClient> client)
+{
+    return adoptRef(*new NavigatorContentUtils(std::move(client)));
 }
 
@@ -220 +220 @@
 }
 
-void provideNavigatorContentUtilsTo(Page* page, NavigatorContentUtilsClient* client)
-{
-    RefCountedSupplement<Page, NavigatorContentUtils>::provideTo(page, NavigatorContentUtils::supplementName(), NavigatorContentUtils::create(client));
+void provideNavigatorContentUtilsTo(Page* page, std::unique_ptr<NavigatorContentUtilsClient> client)
+{
+    RefCountedSupplement<Page, NavigatorContentUtils>::provideTo(page, NavigatorContentUtils::supplementName(), NavigatorContentUtils::create(std::move(client)));
 }
 

trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.h

@@ -56 +56 @@
 #endif
 
-    static PassRef<NavigatorContentUtils> create(NavigatorContentUtilsClient*);
+    static PassRef<NavigatorContentUtils> create(std::unique_ptr<NavigatorContentUtilsClient>);
 
 private:
-    explicit NavigatorContentUtils(NavigatorContentUtilsClient* client)
-        : m_client(client)
+    explicit NavigatorContentUtils(std::unique_ptr<NavigatorContentUtilsClient> client)
+        : m_client(std::move(client))
     { }
 
-    NavigatorContentUtilsClient* client() { return m_client; }
+    NavigatorContentUtilsClient* client() { return m_client.get(); }
 
-    NavigatorContentUtilsClient* m_client;
+    std::unique_ptr<NavigatorContentUtilsClient> m_client;
 };
 

trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h

@@ -53 +53 @@
 };
 
-void provideNavigatorContentUtilsTo(Page*, NavigatorContentUtilsClient*);
+void provideNavigatorContentUtilsTo(Page*, std::unique_ptr<NavigatorContentUtilsClient>);
 
 }

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2014-04-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Change NavigatorContentUtils client ownership from port side to NavigatorContentUtils
+        https://bugs.webkit.org/show_bug.cgi?id=131299
+
+        Reviewed by Darin Adler.
+
+        EFL and GTK ports have managed own client of NavigatorContentUtils though it is only passed to
+        NavigatorContentUtils. The NavigatorContentUtils has used the client to call port functions. So,
+        there is no reason port implementation needs to manage the ownership. To manage the client is
+        unnecessary work in current implementation.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new):
+
 2014-04-07  Hyowon Kim  <hw1008.kim@samsung.com>
 

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -260 +260 @@
     WebCore::ColorChooserClient* colorChooserClient;
 #endif
-#if ENABLE(NAVIGATOR_CONTENT_UTILS) || ENABLE(CUSTOM_SCHEME_HANDLER)
-    std::unique_ptr<WebCore::NavigatorContentUtilsClientEfl> navigatorContentUtilsClient;
-#endif
     struct {
         Ewk_Menu menu;
@@ -688 +685 @@
 
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
-    priv->navigatorContentUtilsClient = std::make_unique<WebCore::NavigatorContentUtilsClientEfl>(smartData->self);
-    WebCore::provideNavigatorContentUtilsTo(priv->page.get(), priv->navigatorContentUtilsClient.get());
+    WebCore::provideNavigatorContentUtilsTo(priv->page.get(), std::make_unique<WebCore::NavigatorContentUtilsClientEfl>(smartData->self));
 #endif
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2014-04-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Change NavigatorContentUtils client ownership from port side to NavigatorContentUtils
+        https://bugs.webkit.org/show_bug.cgi?id=131299
+
+        Reviewed by Darin Adler.
+
+        EFL and GTK ports have managed own client of NavigatorContentUtils though it is only passed to
+        NavigatorContentUtils. The NavigatorContentUtils has used the client to call port functions. So,
+        there is no reason port implementation needs to manage the ownership. To manage the client is
+        unnecessary work in current implementation.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_init):
+        * webkit/webkitwebviewprivate.h:
+
 2014-04-07  Hyowon Kim  <hw1008.kim@samsung.com>
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -3871 +3871 @@
 
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
-    priv->navigatorContentUtilsClient = std::make_unique<WebKit::NavigatorContentUtilsClient>();
-    WebCore::provideNavigatorContentUtilsTo(priv->corePage, priv->navigatorContentUtilsClient.get());
+    WebCore::provideNavigatorContentUtilsTo(priv->corePage, std::make_unique<WebKit::NavigatorContentUtilsClient>());
 #endif
 

trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h

@@ -117 +117 @@
     std::unique_ptr<WebCore::GeolocationClientMock> geolocationClientMock;
 #endif
-
-#if ENABLE(NAVIGATOR_CONTENT_UTILS)
-    std::unique_ptr<WebKit::NavigatorContentUtilsClient> navigatorContentUtilsClient;
-#endif
 };