Diff
Modified: trunk/Source/WebKit2/ChangeLog (177649 => 177650)
--- trunk/Source/WebKit2/ChangeLog 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-22 20:48:53 UTC (rev 177650)
@@ -1,3 +1,18 @@
+2014-12-22 Csaba Osztrogonác <[email protected]>
+
+ Last URTBF after r177639, GTK builds now.
+
+ * UIProcess/API/gtk/WebKitJavascriptResult.cpp:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * UIProcess/API/gtk/WebKitUserContentManager.cpp:
+ * UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp:
+ (webkitUserMediaPermissionRequestCreate):
+ * UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewRunJavaScriptCallback):
+ (webkit_web_view_run_javascript):
+ (resourcesStreamReadCallback):
+
2014-12-22 Anders Carlsson <[email protected]>
Move more API classes from Shared to Shared/API.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2014-12-22 20:48:53 UTC (rev 177650)
@@ -20,8 +20,8 @@
#include "config.h"
#include "WebKitJavascriptResult.h"
+#include "APISerializedScriptValue.h"
#include "WebKitJavascriptResultPrivate.h"
-#include "APISerializedScriptValue.h"
#include <wtf/gobject/GRefPtr.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2014-12-22 20:48:53 UTC (rev 177650)
@@ -153,21 +153,21 @@
return true;
}
- virtual bool decidePolicyForGeolocationPermissionRequest(WebPageProxy*, WebFrameProxy*, WebSecurityOrigin*, GeolocationPermissionRequestProxy* permissionRequest) override
+ virtual bool decidePolicyForGeolocationPermissionRequest(WebPageProxy*, WebFrameProxy*, API::SecurityOrigin*, GeolocationPermissionRequestProxy* permissionRequest) override
{
GRefPtr<WebKitGeolocationPermissionRequest> geolocationPermissionRequest = adoptGRef(webkitGeolocationPermissionRequestCreate(permissionRequest));
webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(geolocationPermissionRequest.get()));
return true;
}
- virtual bool decidePolicyForUserMediaPermissionRequest(WebPageProxy&, WebFrameProxy&, WebSecurityOrigin& securityOrigin, UserMediaPermissionRequestProxy& permissionRequest) override
+ virtual bool decidePolicyForUserMediaPermissionRequest(WebPageProxy&, WebFrameProxy&, API::SecurityOrigin& securityOrigin, UserMediaPermissionRequestProxy& permissionRequest) override
{
GRefPtr<WebKitUserMediaPermissionRequest> userMediaPermissionRequest = adoptGRef(webkitUserMediaPermissionRequestCreate(permissionRequest, securityOrigin));
webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(userMediaPermissionRequest.get()));
return true;
}
- virtual bool decidePolicyForNotificationPermissionRequest(WebPageProxy*, WebSecurityOrigin*, NotificationPermissionRequest* permissionRequest) override
+ virtual bool decidePolicyForNotificationPermissionRequest(WebPageProxy*, API::SecurityOrigin*, NotificationPermissionRequest* permissionRequest) override
{
GRefPtr<WebKitNotificationPermissionRequest> notificationPermissionRequest = adoptGRef(webkitNotificationPermissionRequestCreate(permissionRequest));
webkitWebViewMakePermissionRequest(m_webView, WEBKIT_PERMISSION_REQUEST(notificationPermissionRequest.get()));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2014-12-22 20:48:53 UTC (rev 177650)
@@ -20,13 +20,13 @@
#include "config.h"
#include "WebKitUserContentManager.h"
+#include "APISerializedScriptValue.h"
#include "WebKitJavascriptResultPrivate.h"
#include "WebKitPrivate.h"
#include "WebKitUserContentManagerPrivate.h"
#include "WebKitUserContentPrivate.h"
#include "WebKitWebContextPrivate.h"
#include "WebScriptMessageHandler.h"
-#include "APISerializedScriptValue.h"
#include <wtf/gobject/GRefPtr.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2014-12-22 20:48:53 UTC (rev 177650)
@@ -174,7 +174,7 @@
WEBKIT_PARAM_READABLE));
}
-WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(UserMediaPermissionRequestProxy& request, WebSecurityOrigin& securityOrigin)
+WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(UserMediaPermissionRequestProxy& request, API::SecurityOrigin& securityOrigin)
{
WebKitUserMediaPermissionRequest* usermediaPermissionRequest = WEBKIT_USER_MEDIA_PERMISSION_REQUEST(g_object_new(WEBKIT_TYPE_USER_MEDIA_PERMISSION_REQUEST, nullptr));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h 2014-12-22 20:48:53 UTC (rev 177650)
@@ -22,6 +22,8 @@
#include "WebKitPrivate.h"
#include "WebKitUserMediaPermissionRequest.h"
-WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(WebKit::UserMediaPermissionRequestProxy&, WebKit::WebSecurityOrigin&);
+class SecurityOrigin;
+WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(WebKit::UserMediaPermissionRequestProxy&, API::SecurityOrigin&);
+
#endif // WebKitUserMediaPermissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (177649 => 177650)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-12-22 20:39:02 UTC (rev 177649)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-12-22 20:48:53 UTC (rev 177650)
@@ -23,6 +23,7 @@
#include "WebKitWebView.h"
#include "APIData.h"
+#include "APISerializedScriptValue.h"
#include "ImageOptions.h"
#include "WebCertificateInfo.h"
#include "WebContextMenuItem.h"
@@ -59,7 +60,6 @@
#include "WebKitWebViewBasePrivate.h"
#include "WebKitWebViewPrivate.h"
#include "WebKitWindowPropertiesPrivate.h"
-#include "WebSerializedScriptValue.h"
#include <_javascript_Core/APICast.h>
#include <WebCore/CertificateInfo.h>
#include <WebCore/DragIcon.h>
@@ -2949,7 +2949,7 @@
return webView->priv->_javascript_GlobalContext;
}
-static void webkitWebViewRunJavaScriptCallback(WebSerializedScriptValue* wkSerializedScriptValue, GTask* task)
+static void webkitWebViewRunJavaScriptCallback(API::SerializedScriptValue* wkSerializedScriptValue, GTask* task)
{
if (g_task_return_error_if_cancelled(task))
return;
@@ -2986,7 +2986,7 @@
g_return_if_fail(script);
GTask* task = g_task_new(webView, cancellable, callback, userData);
- getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
+ getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, adoptGRef(task).get());
});
}
@@ -3077,7 +3077,7 @@
WebKitWebView* webView = WEBKIT_WEB_VIEW(g_task_get_source_object(task.get()));
gpointer outputStreamData = g_memory_output_stream_get_data(G_MEMORY_OUTPUT_STREAM(object));
getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
- [task](WebSerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
+ [task](API::SerializedScriptValue* serializedScriptValue, CallbackBase::Error) {
webkitWebViewRunJavaScriptCallback(serializedScriptValue, task.get());
});
}
