[webkit-changes] [178491] trunk/Source/WebKit2

[carlosgc]

Title: [178491] trunk/Source/WebKit2

Revision

178491

Author

carlo...@webkit.org

Date

2015-01-15 00:00:33 -0800 (Thu, 15 Jan 2015)

Log Message

Unreviewed. Fix GTK+ build after r178464.

* UIProcess/API/gtk/WebKitUserContent.cpp:
(_WebKitUserScript::_WebKitUserScript):
(webkitUserScriptGetUserScript):
* UIProcess/API/gtk/WebKitUserContentPrivate.h:

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp
• trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentPrivate.h

Diff

Modified: trunk/Source/WebKit2/ChangeLog (178490 => 178491)

--- trunk/Source/WebKit2/ChangeLog	2015-01-15 07:59:09 UTC (rev 178490)
+++ trunk/Source/WebKit2/ChangeLog	2015-01-15 08:00:33 UTC (rev 178491)
@@ -1,3 +1,12 @@
+2015-01-14  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK+ build after r178464.
+
+        * UIProcess/API/gtk/WebKitUserContent.cpp:
+        (_WebKitUserScript::_WebKitUserScript):
+        (webkitUserScriptGetUserScript):
+        * UIProcess/API/gtk/WebKitUserContentPrivate.h:
+
 2015-01-14  Sam Weinig  <s...@webkit.org>
 
         Convert WKUserScript to be an API::Object bridged object

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp (178490 => 178491)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp	2015-01-15 07:59:09 UTC (rev 178490)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp	2015-01-15 08:00:33 UTC (rev 178491)
@@ -175,16 +175,16 @@
 
 struct _WebKitUserScript {
     _WebKitUserScript(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist)
-        : userScript(std::make_unique<UserScript>(
+        : userScript(adoptRef(new API::UserScript(UserScript {
             String::fromUTF8(source), URL { },
             toStringVector(whitelist), toStringVector(blacklist),
             toUserScriptInjectionTime(injectionTime),
-            toUserContentInjectedFrames(injectedFrames)))
+            toUserContentInjectedFrames(injectedFrames) })))
         , referenceCount(1)
     {
     }
 
-    std::unique_ptr<UserScript> userScript;
+    RefPtr<API::UserScript> userScript;
     int referenceCount;
 };
 
@@ -254,7 +254,7 @@
     return userScript;
 }
 
-const UserScript& webkitUserScriptGetUserScript(WebKitUserScript* userScript)
+API::UserScript& webkitUserScriptGetUserScript(WebKitUserScript* userScript)
 {
     return *userScript->userScript;
 }

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentPrivate.h (178490 => 178491)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentPrivate.h	2015-01-15 07:59:09 UTC (rev 178490)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentPrivate.h	2015-01-15 08:00:33 UTC (rev 178491)
@@ -20,11 +20,12 @@
 #ifndef WebKitUserContentPrivate_h
 #define WebKitUserContentPrivate_h
 
+#include "APIUserScript.h"
 #include "WebKitUserContent.h"
 #include <WebCore/UserScript.h>
 #include <WebCore/UserStyleSheet.h>
 
-const WebCore::UserScript& webkitUserScriptGetUserScript(WebKitUserScript*);
+API::UserScript& webkitUserScriptGetUserScript(WebKitUserScript*);
 const WebCore::UserStyleSheet& webkitUserStyleSheetGetUserStyleSheet(WebKitUserStyleSheet*);
 
 #endif // WebKitUserContentPrivate_h

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes