Attachment 238764 Details for Bug 137173 – Patch for ews

[patch] Patch for ews

bug-137173-20140927160007.patch (text/plain), 10.17 KB, created by Gyuyoung Kim on 2014-09-27 00:00:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Gyuyoung Kim

Created: 2014-09-27 00:00:08 PDT

Size: 10.17 KB

patch

obsolete

>Subversion Revision: 173996
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d3d274bf57b88877c15c31e3343f30aac699d05c..e1d2b6ee5e12247855b9e24cd411a219aa4b8666 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2014-09-26  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Move ColorInputType class to std::unique_ptr
>+        https://bugs.webkit.org/show_bug.cgi?id=137173 
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace uses of PassOwnPtr in code under ColorInputType class with std::unique_ptr.
>+
>+        No new tests, no behavior changes.
>+
>+        * html/ColorInputType.cpp:
>+        (WebCore::ColorInputType::didEndChooser):
>+        * html/ColorInputType.h:
>+        * loader/EmptyClients.cpp:
>+        (WebCore::EmptyChromeClient::createColorChooser):
>+        * loader/EmptyClients.h:
>+        * page/Chrome.cpp:
>+        (WebCore::Chrome::createColorChooser):
>+        * page/Chrome.h:
>+        * page/ChromeClient.h:
>+
> 2014-09-25  Brian J. Burg  <burg@cs.washington.edu>
> 
>         Web Inspector: FunctionCall timeline records omit profile data if the debugger has paused
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index 3c09b7256d5abdf1115c8da7d590e9f3a1bea0f9..4dc1f2fee75db2396ae888b0312768ef4e3323c2 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,16 @@
>+2014-09-26  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Move ColorInputType class to std::unique_ptr
>+        https://bugs.webkit.org/show_bug.cgi?id=137173 
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace uses of PassOwnPtr in code under ColorInputType class with std::unique_ptr.
>+
>+        * WebCoreSupport/WebChromeClient.h:
>+        * WebCoreSupport/WebChromeClient.mm:
>+        (WebChromeClient::createColorChooser):
>+
> 2014-09-24  Christophe Dumez  <cdumez@apple.com>
> 
>         Add initial is<>() / downcast<>() support for any type of Nodes
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 8719914ee9c0938f861661b4b8ffece6a1cf3d56..fbd94abf16e98736d4204b8f8d0897596278f365 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,16 @@
>+2014-09-26  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
>+
>+        Move ColorInputType class to std::unique_ptr
>+        https://bugs.webkit.org/show_bug.cgi?id=137173 
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Replace uses of PassOwnPtr in code under ColorInputType class with std::unique_ptr.
>+
>+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
>+        (WebKit::WebChromeClient::createColorChooser):
>+        * WebProcess/WebCoreSupport/WebChromeClient.h:
>+
> 2014-09-25  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Clean up unused parameter warnings
>diff --git a/Source/WebCore/html/ColorInputType.cpp b/Source/WebCore/html/ColorInputType.cpp
>index 98e8a92599ebc743426cb96401ad9ef564526f09..bdeb272132bef1ecbf834589d4dc8bfd50f4c0d9 100644
>--- a/Source/WebCore/html/ColorInputType.cpp
>+++ b/Source/WebCore/html/ColorInputType.cpp
>@@ -178,7 +178,7 @@ void ColorInputType::didChooseColor(const Color& color)
> 
> void ColorInputType::didEndChooser()
> {
>-    m_chooser.clear();
>+    m_chooser = nullptr;
> }
> 
> void ColorInputType::endColorChooser()
>diff --git a/Source/WebCore/html/ColorInputType.h b/Source/WebCore/html/ColorInputType.h
>index bf94e86e63d9795a362defd631c25216d8faba5f..2726d9ad6b454b15739a6944b1327971eccadb4e 100644
>--- a/Source/WebCore/html/ColorInputType.h
>+++ b/Source/WebCore/html/ColorInputType.h
>@@ -69,7 +69,7 @@ private:
>     void updateColorSwatch();
>     HTMLElement* shadowColorSwatch() const;
> 
>-    OwnPtr<ColorChooser> m_chooser;
>+    std::unique_ptr<ColorChooser> m_chooser;
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/loader/EmptyClients.cpp b/Source/WebCore/loader/EmptyClients.cpp
>index 37d40d2b79341e99ec85f260b1d85f8de481437d..9f15e25e6620b511f93d1c57a221750f31b36a7d 100644
>--- a/Source/WebCore/loader/EmptyClients.cpp
>+++ b/Source/WebCore/loader/EmptyClients.cpp
>@@ -101,7 +101,7 @@ PassRefPtr<SearchPopupMenu> EmptyChromeClient::createSearchPopupMenu(PopupMenuCl
> }
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-PassOwnPtr<ColorChooser> EmptyChromeClient::createColorChooser(ColorChooserClient*, const Color&)
>+std::unique_ptr<ColorChooser> EmptyChromeClient::createColorChooser(ColorChooserClient*, const Color&)
> {
>     return nullptr;
> }
>diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
>index ff08f608b51d5b4933baed447f2f551431a1a712..c4e418822d81a3dae4c6e4c94e1f8347dbb44c50 100644
>--- a/Source/WebCore/loader/EmptyClients.h
>+++ b/Source/WebCore/loader/EmptyClients.h
>@@ -161,7 +161,7 @@ public:
>     virtual void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) override { }
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) override;
>+    virtual std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) override;
> #endif
> 
> #if ENABLE(DATE_AND_TIME_INPUT_TYPES) && !PLATFORM(IOS)
>diff --git a/Source/WebCore/page/Chrome.cpp b/Source/WebCore/page/Chrome.cpp
>index 3a84ad6971636da4d2464aa87c550051cb115355..ba3b779a3b2f57fda26d6ff0b1f26339e594ad5e 100644
>--- a/Source/WebCore/page/Chrome.cpp
>+++ b/Source/WebCore/page/Chrome.cpp
>@@ -474,7 +474,7 @@ void Chrome::disableSuddenTermination()
> }
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-PassOwnPtr<ColorChooser> Chrome::createColorChooser(ColorChooserClient* client, const Color& initialColor)
>+std::unique_ptr<ColorChooser> Chrome::createColorChooser(ColorChooserClient* client, const Color& initialColor)
> {
>     notifyPopupOpeningObservers();
>     return m_client.createColorChooser(client, initialColor);
>diff --git a/Source/WebCore/page/Chrome.h b/Source/WebCore/page/Chrome.h
>index 3e4f5f0ae70667760b3625cb66c09892b06bd87c..2413a4f09ab2f8d780af112bb16da0f5e3bcb90d 100644
>--- a/Source/WebCore/page/Chrome.h
>+++ b/Source/WebCore/page/Chrome.h
>@@ -160,7 +160,7 @@ public:
>     WEBCORE_EXPORT void disableSuddenTermination();
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-    PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color& initialColor);
>+    std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color& initialColor);
> #endif
> 
> #if ENABLE(DATE_AND_TIME_INPUT_TYPES) && !PLATFORM(IOS)
>diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
>index 0ca046cba5cbbd0b075f45617bf5b5f8293c63dc..e8da0e972d73654d4d3a0bb81abb9ce545e95e43 100644
>--- a/Source/WebCore/page/ChromeClient.h
>+++ b/Source/WebCore/page/ChromeClient.h
>@@ -39,7 +39,6 @@
> #include "WebCoreKeyboardUIMode.h"
> #include <runtime/ConsoleTypes.h>
> #include <wtf/Forward.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/Vector.h>
> 
> #if PLATFORM(IOS)
>@@ -274,7 +273,7 @@ public:
> #endif
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-    virtual PassOwnPtr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) = 0;
>+    virtual std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) = 0;
> #endif
> 
> #if ENABLE(DATE_AND_TIME_INPUT_TYPES) && !PLATFORM(IOS)
>diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
>index 3e3a5a82e1fd6bdad0fe7b228930bf54c2359f55..1d4828167c0043238cac24825a60a0670472cfdb 100644
>--- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
>+++ b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
>@@ -139,7 +139,7 @@ public:
> #endif
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
>+    virtual std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
> #endif
> 
>     virtual WebCore::KeyboardUIMode keyboardUIMode() override;
>diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
>index 936f4541bef6cc3ff82775118d6d581b2651edc3..e1dc10dfc42544bda6b6a887a6d366d3312eb6e9 100644
>--- a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
>+++ b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
>@@ -736,7 +736,7 @@ void WebChromeClient::annotatedRegionsChanged()
> #endif
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
>+std::unique_ptr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
> {
>     // FIXME: Implement <input type='color'> for WK1 (Bug 119094).
>     ASSERT_NOT_REACHED();
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
>index c2d5110795ea20fd62840838144bbc9e55ee2584..cdecbda4f9c4cc1bb04665dd09dd0d416de7af2c 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
>@@ -751,9 +751,9 @@ String WebChromeClient::generateReplacementFile(const String& path)
> }
> 
> #if ENABLE(INPUT_TYPE_COLOR)
>-PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
>+std::unique_ptr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
> {
>-    return adoptPtr(new WebColorChooser(m_page, client, initialColor));
>+    return std::unique_ptr<WebColorChooser>(new WebColorChooser(m_page, client, initialColor));
> }
> #endif
> 
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
>index 982eaae0cab72675e5dd1575297e9b9cd6e33f53..b9dc32e4ca01b0854412a190b037c51071d77809 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
>@@ -156,7 +156,7 @@ private:
>     virtual String generateReplacementFile(const String& path) override;
>     
> #if ENABLE(INPUT_TYPE_COLOR)
>-    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
>+    virtual std::unique_ptr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
> #endif
> 
> #if ENABLE(IOS_TOUCH_EVENTS)

Actions: View | Formatted Diff | Diff

Attachments on bug 137173: 238764 | 238775