Title: [174881] trunk/Source/WebKit2
- Revision
- 174881
- Author
- [email protected]
- Date
- 2014-10-20 02:54:50 -0700 (Mon, 20 Oct 2014)
Log Message
[GTK] Remove the factory method from DragAndDropHandler
https://bugs.webkit.org/show_bug.cgi?id=137872
Reviewed by Sergio Villar Senin.
Make the constructor public and use std::make_unique instead.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseDragAndDropHandler):
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::create): Deleted.
* UIProcess/gtk/DragAndDropHandler.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174880 => 174881)
--- trunk/Source/WebKit2/ChangeLog 2014-10-20 08:44:19 UTC (rev 174880)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-20 09:54:50 UTC (rev 174881)
@@ -1,5 +1,20 @@
2014-10-20 Carlos Garcia Campos <[email protected]>
+ [GTK] Remove the factory method from DragAndDropHandler
+ https://bugs.webkit.org/show_bug.cgi?id=137872
+
+ Reviewed by Sergio Villar Senin.
+
+ Make the constructor public and use std::make_unique instead.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseDragAndDropHandler):
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::create): Deleted.
+ * UIProcess/gtk/DragAndDropHandler.h:
+
+2014-10-20 Carlos Garcia Campos <[email protected]>
+
[GTK] Add initial gestures support
https://bugs.webkit.org/show_bug.cgi?id=137812
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (174880 => 174881)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-20 08:44:19 UTC (rev 174880)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-20 09:54:50 UTC (rev 174881)
@@ -1092,7 +1092,7 @@
{
WebKitWebViewBasePrivate* priv = webViewBase->priv;
if (!priv->dragAndDropHandler)
- priv->dragAndDropHandler = DragAndDropHandler::create(*priv->pageProxy);
+ priv->dragAndDropHandler = std::make_unique<DragAndDropHandler>(*priv->pageProxy);
return *priv->dragAndDropHandler;
}
#endif // ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (174880 => 174881)
--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2014-10-20 08:44:19 UTC (rev 174880)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2014-10-20 09:54:50 UTC (rev 174881)
@@ -43,11 +43,6 @@
namespace WebKit {
-std::unique_ptr<DragAndDropHandler> DragAndDropHandler::create(WebPageProxy& page)
-{
- return std::unique_ptr<DragAndDropHandler>(new DragAndDropHandler(page));
-}
-
DragAndDropHandler::DragAndDropHandler(WebPageProxy& page)
: m_page(page)
{
Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h (174880 => 174881)
--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2014-10-20 08:44:19 UTC (rev 174880)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2014-10-20 09:54:50 UTC (rev 174881)
@@ -49,7 +49,7 @@
class DragAndDropHandler {
WTF_MAKE_NONCOPYABLE(DragAndDropHandler);
public:
- static std::unique_ptr<DragAndDropHandler> create(WebPageProxy&);
+ DragAndDropHandler(WebPageProxy&);
void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
void fillDragData(GdkDragContext*, GtkSelectionData*, unsigned info);
@@ -71,8 +71,6 @@
bool dropHappened;
};
- DragAndDropHandler(WebPageProxy&);
-
WebCore::DataObjectGtk* dataObjectForDropData(GdkDragContext*, GtkSelectionData*, unsigned info, WebCore::IntPoint& position);
WebCore::DataObjectGtk* requestDragData(GdkDragContext*, const WebCore::IntPoint& position, unsigned time);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
