Changeset 167789 in webkit

Timestamp:

Apr 24, 2014 8:59:46 PM (10 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Mark Supplement instead of RefCountedSupplement in NavigatorContentUtils
​https://bugs.webkit.org/show_bug.cgi?id=132151

Reviewed by Darin Adler.

Though Original goal was to make it sharable across navigator instances, the NavigatorContentUtils
has used RefCountedSupplement<Page> instead of RefCountedSupplement<Navigator>. This patch makes it
use Supplement<Page> because there is no scenario which needs to be shared across navigator instances.

Blink merge from ​https://src.chromium.org/viewvc/blink?view=rev&revision=171403.

No new tests, no behavior changes.

• Modules/navigatorcontentutils/NavigatorContentUtils.cpp:

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

• Modules/navigatorcontentutils/NavigatorContentUtils.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/navigatorcontentutils/NavigatorContentUtils.cpp (modified) (3 diffs)
• Modules/navigatorcontentutils/NavigatorContentUtils.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Mark Supplement instead of RefCountedSupplement in NavigatorContentUtils 
+        https://bugs.webkit.org/show_bug.cgi?id=132151
+
+        Reviewed by Darin Adler.
+
+        Though Original goal was to make it sharable across navigator instances, the NavigatorContentUtils
+        has used RefCountedSupplement<Page> instead of RefCountedSupplement<Navigator>. This patch makes it
+        use Supplement<Page> because there is no scenario which needs to be shared across navigator instances.
+
+        Blink merge from https://src.chromium.org/viewvc/blink?view=rev&revision=171403.
+
+        No new tests, no behavior changes.
+
+        * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+        (WebCore::NavigatorContentUtils::from):
+        (WebCore::NavigatorContentUtils::create):
+        (WebCore::provideNavigatorContentUtilsTo):
+        * Modules/navigatorcontentutils/NavigatorContentUtils.h:
+
 2014-04-24  Commit Queue  <commit-queue@webkit.org>
 

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

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

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

@@ -42 +42 @@
 typedef int ExceptionCode;
 
-class NavigatorContentUtils final : public RefCountedSupplement<Page, NavigatorContentUtils> {
+class NavigatorContentUtils final : public Supplement<Page> {
 public:
     virtual ~NavigatorContentUtils();
@@ -56 +56 @@
 #endif
 
-    static PassRef<NavigatorContentUtils> create(std::unique_ptr<NavigatorContentUtilsClient>);
+    static PassOwnPtr<NavigatorContentUtils> create(std::unique_ptr<NavigatorContentUtilsClient>);
 
 private: