Diff
Modified: trunk/Source/WebKit2/ChangeLog (218331 => 218332)
--- trunk/Source/WebKit2/ChangeLog 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-15 15:40:20 UTC (rev 218332)
@@ -1,5 +1,109 @@
2017-06-15 Carlos Garcia Campos <[email protected]>
+ [GTK] Cleanup headers includes in GTK+ API files
+ https://bugs.webkit.org/show_bug.cgi?id=173415
+
+ Reviewed by Michael Catanzaro.
+
+ - Remove WTFGType.h from WebKitPrivate.h and include it in all other files instead of WebKitPrivate if needed.
+ - Stop including WebKitPrivate.h in all other private headers.
+ - Remove all C API includes.
+
+ * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+ * UIProcess/API/gtk/WebKitAuthenticationRequest.cpp:
+ * UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitAutomationSession.cpp:
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ * UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
+ * UIProcess/API/gtk/WebKitColorChooser.h:
+ * UIProcess/API/gtk/WebKitColorChooserRequest.cpp:
+ * UIProcess/API/gtk/WebKitContextMenu.cpp:
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ * UIProcess/API/gtk/WebKitContextMenuItemPrivate.h:
+ * UIProcess/API/gtk/WebKitContextMenuPrivate.h:
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ * UIProcess/API/gtk/WebKitCookieManagerPrivate.h:
+ * UIProcess/API/gtk/WebKitCredentialPrivate.h:
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ * UIProcess/API/gtk/WebKitDownloadPrivate.h:
+ * UIProcess/API/gtk/WebKitEditorState.cpp:
+ * UIProcess/API/gtk/WebKitEditorStatePrivate.h:
+ * UIProcess/API/gtk/WebKitError.cpp:
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ * UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitFindController.cpp:
+ * UIProcess/API/gtk/WebKitFormClient.cpp:
+ * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitHitTestResult.cpp:
+ * UIProcess/API/gtk/WebKitHitTestResultPrivate.h:
+ * UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitJavascriptResult.cpp:
+ * UIProcess/API/gtk/WebKitJavascriptResultPrivate.h:
+ * UIProcess/API/gtk/WebKitMimeInfoPrivate.h:
+ * UIProcess/API/gtk/WebKitNavigationActionPrivate.h:
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitNetworkProxySettings.cpp:
+ * UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h:
+ * UIProcess/API/gtk/WebKitNotification.cpp:
+ * UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitNotificationPrivate.h:
+ * UIProcess/API/gtk/WebKitOptionMenu.cpp:
+ * UIProcess/API/gtk/WebKitPlugin.cpp:
+ * UIProcess/API/gtk/WebKitPluginPrivate.h:
+ * UIProcess/API/gtk/WebKitPolicyDecision.cpp:
+ * UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitPrintCustomWidget.cpp:
+ * UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h:
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ * UIProcess/API/gtk/WebKitPrivate.h:
+ * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
+ * UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitSecurityManager.cpp:
+ * UIProcess/API/gtk/WebKitSecurityOrigin.cpp:
+ * UIProcess/API/gtk/WebKitSecurityOriginPrivate.h:
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * UIProcess/API/gtk/WebKitURIRequest.cpp:
+ * UIProcess/API/gtk/WebKitURIResponse.cpp:
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ * UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitUserContent.cpp:
+ * UIProcess/API/gtk/WebKitUserContentManager.cpp:
+ * UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ * UIProcess/API/gtk/WebKitWebContextPrivate.h:
+ * UIProcess/API/gtk/WebKitWebInspector.cpp:
+ * UIProcess/API/gtk/WebKitWebInspectorPrivate.h:
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ * UIProcess/API/gtk/WebKitWebResourcePrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ * UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp:
+ * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+ * UIProcess/API/gtk/WebKitWebViewPrivate.h:
+ * UIProcess/API/gtk/WebKitWebsiteDataManager.cpp:
+ * UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h:
+ * UIProcess/API/gtk/WebKitWebsiteDataPrivate.h:
+ * UIProcess/API/gtk/WebKitWindowProperties.cpp:
+ * UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h:
+ * WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+
+2017-06-15 Carlos Garcia Campos <[email protected]>
+
[GTK] Do not use the C API in WebGtkExtensionManager
https://bugs.webkit.org/show_bug.cgi?id=173408
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,9 +23,9 @@
#include "AuthenticationDecisionListener.h"
#include "WebKitAuthenticationRequestPrivate.h"
#include "WebKitCredentialPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitWebView.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -26,6 +26,7 @@
#include "WebKitCredentialPrivate.h"
#include "WebProtectionSpace.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,14 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitAuthenticationRequestPrivate_h
-#define WebKitAuthenticationRequestPrivate_h
+#pragma once
#include "AuthenticationChallengeProxy.h"
#include "WebKitAuthenticationRequest.h"
-#include "WebKitPrivate.h"
WebKitAuthenticationRequest* webkitAuthenticationRequestCreate(WebKit::AuthenticationChallengeProxy*, bool privateBrowsingEnabled);
WebKit::AuthenticationChallengeProxy* webkitAuthenticationRequestGetAuthenticationChallenge(WebKitAuthenticationRequest*);
-
-#endif // WebKitAuthenticationRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAutomationSession.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAutomationSession.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAutomationSession.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,9 +22,9 @@
#include "APIAutomationSessionClient.h"
#include "WebKitAutomationSessionPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitWebViewPrivate.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,8 +22,8 @@
#include "APIArray.h"
#include "WebKitBackForwardListPrivate.h"
-#include "WebKitPrivate.h"
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
/**
* SECTION: WebKitBackForwardList
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,10 +21,10 @@
#include "WebKitBackForwardListItem.h"
#include "WebKitBackForwardListPrivate.h"
-#include "WebKitPrivate.h"
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,11 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitColorChooser_h
-#define WebKitColorChooser_h
+#pragma once
#include "WebColorPickerGtk.h"
-#include "WebKitPrivate.h"
+#include <WebCore/IntRect.h>
#include <wtf/glib/GRefPtr.h>
typedef struct _WebKitColorChooserRequest WebKitColorChooserRequest;
@@ -28,7 +27,6 @@
namespace WebCore {
class Color;
-class IntRect;
}
namespace WebKit {
@@ -54,5 +52,3 @@
};
} // namespace WebKit
-
-#endif // WebKitColorChooser_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -29,6 +29,7 @@
#include "WebKitColorChooserRequestPrivate.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,6 +25,7 @@
#include "WebKitContextMenuItemPrivate.h"
#include "WebKitContextMenuPrivate.h"
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -32,6 +32,7 @@
#include <memory>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItemPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItemPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItemPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,15 +17,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitContextMenuItemPrivate_h
-#define WebKitContextMenuItemPrivate_h
+#pragma once
#include "WebContextMenuItemGtk.h"
#include "WebKitContextMenuItem.h"
-#include "WebKitPrivate.h"
WebKitContextMenuItem* webkitContextMenuItemCreate(const WebKit::WebContextMenuItemData&);
WebKit::WebContextMenuItemGtk webkitContextMenuItemToWebContextMenuItemGtk(WebKitContextMenuItem*);
WebKit::WebContextMenuItemData webkitContextMenuItemToWebContextMenuItemData(WebKitContextMenuItem*);
-
-#endif // WebKitContextMenuItemPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitContextMenuPrivate_h
-#define WebKitContextMenuPrivate_h
+#pragma once
#include "WebContextMenuItemGtk.h"
#include "WebKitContextMenu.h"
-#include "WebKitPrivate.h"
WebKitContextMenu* webkitContextMenuCreate(const Vector<WebKit::WebContextMenuItemData>&);
void webkitContextMenuPopulate(WebKitContextMenu*, Vector<WebKit::WebContextMenuItemGtk>&);
@@ -29,5 +27,3 @@
void webkitContextMenuPopulate(WebKitContextMenu*, Vector<WebKit::WebContextMenuItemData>&);
void webkitContextMenuSetParentItem(WebKitContextMenu*, WebKitContextMenuItem*);
WebKitContextMenuItem* webkitContextMenuGetParentItem(WebKitContextMenu*);
-
-#endif // WebKitContextMenuPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -29,6 +29,7 @@
#include "WebsiteDataRecord.h"
#include <WebCore/SessionID.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManagerPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManagerPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManagerPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -19,7 +19,7 @@
#pragma once
-#include "WebKitPrivate.h"
+#include "WebKitCookieManager.h"
#include "WebKitWebsiteDataManager.h"
WebKitCookieManager* webkitCookieManagerCreate(WebKitWebsiteDataManager*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredentialPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredentialPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredentialPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,14 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitCredentialPrivate_h
-#define WebKitCredentialPrivate_h
+#pragma once
#include "WebKitCredential.h"
-#include "WebKitPrivate.h"
#include <WebCore/Credential.h>
WebKitCredential* webkitCredentialCreate(const WebCore::Credential&);
const WebCore::Credential& webkitCredentialGetCredential(WebKitCredential*);
-
-#endif // WebKitCredentialPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -30,6 +30,7 @@
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -26,7 +26,6 @@
#include "WebKitWebContextPrivate.h"
#include "WebKitWebViewPrivate.h"
#include "WebProcessPool.h"
-#include <WebKit/WKString.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/text/CString.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,11 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitDownloadPrivate_h
-#define WebKitDownloadPrivate_h
+#pragma once
#include "WebKitDownload.h"
-#include "WebKitPrivate.h"
#include <WebCore/ResourceError.h>
#include <WebCore/ResourceRequest.h>
@@ -35,5 +33,3 @@
void webkitDownloadFinished(WebKitDownload*);
String webkitDownloadDecideDestinationWithSuggestedFilename(WebKitDownload*, const CString& suggestedFilename, bool& allowOverwrite);
void webkitDownloadDestinationCreated(WebKitDownload*, const String& destinationPath);
-
-#endif // WebKitDownloadPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorState.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorState.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorState.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "EditorState.h"
#include "WebKitEditorStatePrivate.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorStatePrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorStatePrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorStatePrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,13 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitEditorStatePrivate_h
-#define WebKitEditorStatePrivate_h
+#pragma once
+#include "EditorState.h"
#include "WebKitEditorState.h"
-#include "WebKitPrivate.h"
WebKitEditorState* webkitEditorStateCreate(const WebKit::EditorState&);
void webkitEditorStateChanged(WebKitEditorState*, const WebKit::EditorState&);
-
-#endif // WebKitEditorStatePrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,6 +21,7 @@
#include "config.h"
#include "WebKitError.h"
+#include "APIError.h"
#include "WebKitPrivate.h"
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,7 +21,6 @@
#include "WebKitFaviconDatabase.h"
#include "WebKitFaviconDatabasePrivate.h"
-#include "WebKitPrivate.h"
#include <WebCore/FileSystem.h>
#include <WebCore/Image.h>
#include <WebCore/IntSize.h>
@@ -30,7 +29,9 @@
#include <wtf/RunLoop.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -26,9 +26,11 @@
#include "WebKitFileChooserRequestPrivate.h"
#include "WebOpenPanelResultListenerProxy.h"
#include <WebCore/FileSystem.h>
+#include <WebCore/URL.h>
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitFileChooserRequestPrivate_h
-#define WebKitFileChooserRequestPrivate_h
+#pragma once
#include "WebKitFileChooserRequest.h"
-#include "WebKitPrivate.h"
+#include "WebOpenPanelResultListenerProxy.h"
WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
-
-#endif // WebKitFileChooserRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,10 +22,10 @@
#include "APIFindClient.h"
#include "WebKitEnumTypes.h"
-#include "WebKitPrivate.h"
#include "WebKitWebViewPrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,9 +23,9 @@
#include "APIFormClient.h"
#include "WebFormSubmissionListenerProxy.h"
#include "WebKitFormSubmissionRequestPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitWebViewPrivate.h"
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,6 +25,7 @@
#include "WebFormSubmissionListenerProxy.h"
#include "WebKitFormSubmissionRequestPrivate.h"
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,6 +20,5 @@
#pragma once
#include "WebKitFormSubmissionRequest.h"
-#include "WebKitPrivate.h"
WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(const Vector<std::pair<String, String>>&, Ref<WebKit::WebFormSubmissionListenerProxy>&&);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "GeolocationPermissionRequestProxy.h"
#include "WebKitGeolocationPermissionRequestPrivate.h"
#include "WebKitPermissionRequest.h"
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitGeolocationPermissionRequestPrivate_h
-#define WebKitGeolocationPermissionRequestPrivate_h
+#pragma once
#include "WebKitGeolocationPermissionRequest.h"
-#include "WebKitPrivate.h"
WebKitGeolocationPermissionRequest* webkitGeolocationPermissionRequestCreate(WebKit::GeolocationPermissionRequestProxy*);
-
-#endif // WebKitGeolocationPermissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResult.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResult.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResult.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "WebHitTestResultData.h"
#include "WebKitHitTestResultPrivate.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResultPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResultPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResultPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,13 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitHitTestResultPrivate_h
-#define WebKitHitTestResultPrivate_h
+#pragma once
#include "WebKitHitTestResult.h"
-#include "WebKitPrivate.h"
WebKitHitTestResult* webkitHitTestResultCreate(const WebKit::WebHitTestResultData&);
bool webkitHitTestResultCompare(WebKitHitTestResult*, const WebKit::WebHitTestResultData&);
-
-#endif // WebKitHitTestResultPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h"
#include "WebKitPermissionRequest.h"
#include "WebPageProxy.h"
+#include <wtf/glib/WTFGType.h>
#if ENABLE(VIDEO)
#include <WebCore/PlatformDisplay.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,15 +17,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
-#define WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
+#pragma once
#include "InstallMissingMediaPluginsPermissionRequest.h"
#include "WebKitInstallMissingMediaPluginsPermissionRequest.h"
-#include "WebKitPrivate.h"
#if ENABLE(VIDEO)
WebKitInstallMissingMediaPluginsPermissionRequest* webkitInstallMissingMediaPluginsPermissionRequestCreate(WebKit::InstallMissingMediaPluginsPermissionRequest&);
#endif
-
-#endif // WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -24,8 +24,6 @@
#include "WebKitJavascriptResultPrivate.h"
#include <wtf/glib/GRefPtr.h>
-using namespace WebKit;
-
struct _WebKitJavascriptResult {
_WebKitJavascriptResult(WebKitWebView* view, WebCore::SerializedScriptValue& serializedScriptValue)
: webView(view)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResultPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResultPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResultPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,14 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitJavascriptResultPrivate_h
-#define WebKitJavascriptResultPrivate_h
+#pragma once
#include <WebCore/SerializedScriptValue.h>
#include "WebKitJavascriptResult.h"
-#include "WebKitPrivate.h"
#include "WebKitWebView.h"
WebKitJavascriptResult* webkitJavascriptResultCreate(WebKitWebView*, WebCore::SerializedScriptValue&);
-
-#endif // WebKitJavascriptResultPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfoPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfoPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfoPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,13 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitMimeInfoPrivate_h
-#define WebKitMimeInfoPrivate_h
+#pragma once
#include "WebKitMimeInfo.h"
-#include "WebKitPrivate.h"
#include <WebCore/PluginData.h>
WebKitMimeInfo* webkitMimeInfoCreate(const WebCore::MimeClassInfo&);
-
-#endif // WebKitMimeInfoPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationActionPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationActionPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationActionPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitNavigationActionPrivate_h
-#define WebKitNavigationActionPrivate_h
+#pragma once
#include "NavigationActionData.h"
#include "WebKitNavigationAction.h"
#include "WebKitPrivate.h"
+#include <wtf/glib/GRefPtr.h>
struct _WebKitNavigationAction {
_WebKitNavigationAction(WebKitURIRequest* uriRequest, const WebKit::NavigationActionData& navigationActionData)
@@ -51,5 +51,3 @@
};
WebKitNavigationAction* webkitNavigationActionCreate(WebKitURIRequest*, const WebKit::NavigationActionData&);
-
-#endif // WebKitNavigationActionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -27,6 +27,7 @@
#include "WebKitURIRequestPrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,14 +17,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitNavigationPolicyDecisionPrivate_h
-#define WebKitNavigationPolicyDecisionPrivate_h
+#pragma once
#include "NavigationActionData.h"
+#include "WebFramePolicyListenerProxy.h"
#include "WebKitNavigationPolicyDecision.h"
-#include "WebKitPrivate.h"
+#include <WebCore/ResourceRequest.h>
WebKitPolicyDecision* webkitNavigationPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, WebKit::WebFramePolicyListenerProxy*);
WebKitPolicyDecision* webkitNewWindowPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, WebKit::WebFramePolicyListenerProxy*);
-
-#endif // WebKitNavigationPolicyDecisionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettings.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettings.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettings.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,9 +22,8 @@
#include "WebKitNetworkProxySettingsPrivate.h"
#include <WebCore/SoupNetworkProxySettings.h>
-#include <wtf/text/WTFString.h>
+#include <wtf/glib/WTFGType.h>
-using namespace WebKit;
using namespace WebCore;
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,7 +20,6 @@
#pragma once
#include "WebKitNetworkProxySettings.h"
-#include "WebKitPrivate.h"
#include <WebCore/SoupNetworkProxySettings.h>
const WebCore::SoupNetworkProxySettings& webkitNetworkProxySettingsGetNetworkProxySettings(WebKitNetworkProxySettings*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,9 +21,9 @@
#include "WebKitNotification.h"
#include "WebKitNotificationPrivate.h"
-#include "WebKitPrivate.h"
#include "WebNotification.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "NotificationPermissionRequest.h"
#include "WebKitNotificationPermissionRequestPrivate.h"
#include "WebKitPermissionRequest.h"
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitNotificationPermissionRequestPrivate_h
-#define WebKitNotificationPermissionRequestPrivate_h
+#pragma once
#include "WebKitNotificationPermissionRequest.h"
-#include "WebKitPrivate.h"
WebKitNotificationPermissionRequest* webkitNotificationPermissionRequestCreate(WebKit::NotificationPermissionRequest*);
-
-#endif // WebKitNotificationPermissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,15 +17,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitNotificationPrivate_h
-#define WebKitNotificationPrivate_h
+#pragma once
#include "WebKitNotification.h"
-#include "WebKitPrivate.h"
#include "WebNotification.h"
#include <wtf/text/CString.h>
WebKitNotification* webkitNotificationCreate(WebKitWebView*, const WebKit::WebNotification&);
WebKitWebView* webkitNotificationGetWebView(WebKitNotification*);
-
-#endif // WebKitNotificationPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitOptionMenu.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitOptionMenu.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitOptionMenu.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,7 +22,7 @@
#include "WebKitOptionMenuItemPrivate.h"
#include "WebKitOptionMenuPrivate.h"
-#include "WebKitPrivate.h"
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,6 +22,7 @@
#include "WebKitMimeInfoPrivate.h"
#include "WebKitPluginPrivate.h"
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPluginPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPluginPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPluginPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,13 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitPluginPrivate_h
-#define WebKitPluginPrivate_h
+#pragma once
#include "PluginModuleInfo.h"
#include "WebKitPlugin.h"
-#include "WebKitPrivate.h"
WebKitPlugin* webkitPluginCreate(const WebKit::PluginModuleInfo&);
-
-#endif // WebKitPluginPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "WebFramePolicyListenerProxy.h"
#include "WebKitPolicyDecisionPrivate.h"
#include "WebsitePolicies.h"
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitPolicyDecisionPrivate_h
-#define WebKitPolicyDecisionPrivate_h
+#pragma once
+#include "WebFramePolicyListenerProxy.h"
#include "WebKitPolicyDecision.h"
-#include "WebKitPrivate.h"
void webkitPolicyDecisionSetListener(WebKitPolicyDecision*, WebKit::WebFramePolicyListenerProxy*);
-
-#endif // WebKitResponsePolicyDecisionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -24,9 +24,9 @@
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
+#include <wtf/text/CString.h>
-using namespace WebKit;
-
/**
* SECTION: WebKitPrintCustomWidget
* @Short_description: Allows to embed a custom widget in print dialog
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,7 +20,6 @@
#pragma once
#include "WebKitPrintCustomWidget.h"
-#include "WebKitPrivate.h"
#include <gtk/gtk.h>
void webkitPrintCustomWidgetEmitCustomWidgetApplySignal(WebKitPrintCustomWidget*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -30,6 +30,7 @@
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
#if HAVE(GTK_UNIX_PRINTING)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,23 +25,9 @@
#pragma once
+#include "WebEvent.h"
#include "WebKitNavigationAction.h"
-#include <WebKit/WKAPICast.h>
-#include <WebKit/WKDownload.h>
-#include <WebKit/WKFindOptions.h>
-#include <WebKit/WKGeolocationManager.h>
-#include <WebKit/WKGeolocationPermissionRequest.h>
-#include <WebKit/WKGeolocationPosition.h>
-#include <WebKit/WKIconDatabase.h>
-#include <WebKit/WKInspector.h>
-#include <WebKit/WKRetainPtr.h>
-#include <WebKit/WKSerializedScriptValue.h>
-#include <WebKit/WKString.h>
-#include <WebKit/WKUserMediaPermissionRequest.h>
-#include <WebKit/WebKit2_C.h>
-#include <glib.h>
-#include <wtf/Assertions.h>
-#include <wtf/glib/WTFGType.h>
+#include <WebCore/FrameLoaderTypes.h>
unsigned toGdkModifiers(WebKit::WebEvent::Modifiers);
WebKitNavigationType toWebKitNavigationType(WebCore::NavigationType);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,11 +21,11 @@
#include "WebKitResponsePolicyDecision.h"
#include "WebKitPolicyDecisionPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitURIRequestPrivate.h"
#include "WebKitURIResponsePrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitResponsePolicyDecisionPrivate_h
-#define WebKitResponsePolicyDecisionPrivate_h
+#pragma once
-#include "WebKitPrivate.h"
#include "WebKitResponsePolicyDecision.h"
WebKitPolicyDecision* webkitResponsePolicyDecisionCreate(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy*);
-
-#endif // WebKitResponsePolicyDecisionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -24,6 +24,7 @@
#include "WebKitWebContextPrivate.h"
#include "WebProcessPool.h"
#include <WebCore/SchemeRegistry.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOrigin.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOrigin.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOrigin.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -24,8 +24,6 @@
#include <WebCore/URL.h>
#include <wtf/text/CString.h>
-using namespace WebKit;
-
/**
* SECTION: WebKitSecurityOrigin
* @Short_description: A security boundary for websites
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOriginPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOriginPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOriginPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -19,7 +19,6 @@
#pragma once
-#include "WebKitPrivate.h"
#include "WebKitSecurityOrigin.h"
#include <WebCore/SecurityOrigin.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -33,12 +33,12 @@
#include "HardwareAccelerationManager.h"
#include "WebKitEnumTypes.h"
-#include "WebKitPrivate.h"
#include "WebKitSettingsPrivate.h"
#include "WebPageProxy.h"
#include "WebPreferences.h"
#include <WebCore/UserAgent.h>
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
#if PLATFORM(WAYLAND)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,7 +25,6 @@
#include "WebKitGeolocationPermissionRequestPrivate.h"
#include "WebKitNavigationActionPrivate.h"
#include "WebKitNotificationPermissionRequestPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitURIRequestPrivate.h"
#include "WebKitUserMediaPermissionRequestPrivate.h"
#include "WebKitWebViewPrivate.h"
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,10 +20,10 @@
#include "config.h"
#include "WebKitURIRequest.h"
-#include "WebKitPrivate.h"
#include "WebKitURIRequestPrivate.h"
#include <WebCore/GUniquePtrSoup.h>
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
enum {
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,13 +20,12 @@
#include "config.h"
#include "WebKitURIResponse.h"
-#include "WebKitPrivate.h"
#include "WebKitURIResponsePrivate.h"
#include <WebCore/GUniquePtrSoup.h>
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
-using namespace WebKit;
using namespace WebCore;
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -31,6 +31,7 @@
#include <libsoup/soup.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/RunLoopSourcePriority.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,11 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitURISchemeRequestPrivate_h
-#define WebKitURISchemeRequestPrivate_h
+#pragma once
#include "LegacyCustomProtocolManagerProxy.h"
-#include "WebKitPrivate.h"
#include "WebKitURISchemeRequest.h"
#include "WebKitWebContext.h"
#include <WebCore/ResourceRequest.h>
@@ -30,5 +28,3 @@
void webkitURISchemeRequestCancel(WebKitURISchemeRequest*);
WebKit::LegacyCustomProtocolManagerProxy* webkitURISchemeRequestGetManager(WebKitURISchemeRequest*);
void webkitURISchemeRequestInvalidate(WebKitURISchemeRequest*);
-
-#endif // WebKitURISchemeRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,7 +20,6 @@
#include "config.h"
#include "WebKitUserContent.h"
-#include "WebKitPrivate.h"
#include "WebKitUserContentPrivate.h"
#include <wtf/text/CString.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,12 +22,12 @@
#include "APISerializedScriptValue.h"
#include "WebKitJavascriptResultPrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitUserContentManagerPrivate.h"
#include "WebKitUserContentPrivate.h"
#include "WebKitWebContextPrivate.h"
#include "WebScriptMessageHandler.h"
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebCore;
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,6 +23,7 @@
#include "WebKitPermissionRequest.h"
#include "WebKitUserMediaPermissionRequestPrivate.h"
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -16,14 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef WebKitUserMediaPermissionRequestPrivate_h
-#define WebKitUserMediaPermissionRequestPrivate_h
+#pragma once
-#include "WebKitPrivate.h"
+#include "APISecurityOrigin.h"
#include "WebKitUserMediaPermissionRequest.h"
-class SecurityOrigin;
-
WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(WebKit::UserMediaPermissionRequestProxy&, API::SecurityOrigin&, API::SecurityOrigin&);
-
-#endif // WebKitUserMediaPermissionRequestPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -67,6 +67,7 @@
#include <wtf/RefPtr.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,12 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebKitWebContextPrivate_h
-#define WebKitWebContextPrivate_h
+#pragma once
#include "DownloadProxy.h"
#include "LegacyCustomProtocolManagerProxy.h"
-#include "WebKitPrivate.h"
#include "WebKitUserContentManager.h"
#include "WebKitWebContext.h"
#include "WebProcessPool.h"
@@ -49,5 +47,3 @@
WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext*, WebKit::WebPageProxy*);
GVariant* webkitWebContextInitializeWebExtensions(WebKitWebContext*);
void webkitWebContextInitializeNotificationPermissions(WebKitWebContext*);
-
-#endif // WebKitWebContextPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,6 +25,7 @@
#include "WebKitWebInspectorPrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspectorPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspectorPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspectorPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,12 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitWebInspectorPrivate_h
-#define WebKitWebInspectorPrivate_h
+#pragma once
-#include "WebKitPrivate.h"
#include "WebKitWebInspector.h"
WebKitWebInspector* webkitWebInspectorCreate(WebKit::WebInspectorProxy*);
-
-#endif // WebKitWebInspectorPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -26,6 +26,7 @@
#include "WebKitWebResourcePrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResourcePrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResourcePrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResourcePrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -17,10 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebKitWebResourcePrivate_h
-#define WebKitWebResourcePrivate_h
+#pragma once
-#include "WebKitPrivate.h"
#include "WebKitWebResource.h"
WebKitWebResource* webkitWebResourceCreate(WebKit::WebFrameProxy*, WebKitURIRequest*, bool isMainResource);
@@ -31,6 +29,3 @@
void webkitWebResourceFailed(WebKitWebResource*, GError*);
void webkitWebResourceFailedWithTLSErrors(WebKitWebResource*, GTlsCertificateFlags, GTlsCertificate*);
WebKit::WebFrameProxy* webkitWebResourceGetFrame(WebKitWebResource*);
-
-
-#endif // WebKitWebResourcePrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -71,6 +71,7 @@
#include <WebCore/RefPtrCairo.h>
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -43,7 +43,6 @@
#include "WebInspectorProxy.h"
#include "WebKit2Initialize.h"
#include "WebKitAuthenticationDialog.h"
-#include "WebKitPrivate.h"
#include "WebKitWebViewBaseAccessible.h"
#include "WebKitWebViewBasePrivate.h"
#include "WebPageGroup.h"
@@ -66,6 +65,7 @@
#include <memory>
#include <wtf/HashMap.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
#if ENABLE(FULLSCREEN_API)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,8 +20,8 @@
#include "config.h"
#include "WebKitWebViewBaseAccessible.h"
-#include "WebKitPrivate.h"
#include <gtk/gtk.h>
+#include <wtf/glib/WTFGType.h>
struct _WebKitWebViewBaseAccessiblePrivate {
GtkWidget* widget;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -25,8 +25,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebKitWebViewBasePrivate_h
-#define WebKitWebViewBasePrivate_h
+#pragma once
#include "APIPageConfiguration.h"
#include "DragAndDropHandler.h"
@@ -33,7 +32,6 @@
#include "GestureController.h"
#include "WebContextMenuProxyGtk.h"
#include "WebInspectorProxy.h"
-#include "WebKitPrivate.h"
#include "WebKitWebViewBase.h"
#include "WebPageProxy.h"
@@ -80,5 +78,3 @@
#if HAVE(GTK_GESTURES)
WebKit::GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase*);
#endif
-
-#endif // WebKitWebViewBasePrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -31,7 +31,6 @@
#include "WebContextMenuItemData.h"
#include "WebHitTestResultData.h"
#include "WebImage.h"
-#include "WebKitPrivate.h"
#include "WebKitWebView.h"
#include "WebPageProxy.h"
#include <WebCore/IntRect.h>
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,6 +22,7 @@
#include "APIWebsiteDataStore.h"
#include "WebKitCookieManagerPrivate.h"
+#include "WebKitPrivate.h"
#include "WebKitWebsiteDataManagerPrivate.h"
#include "WebKitWebsiteDataPrivate.h"
#include "WebsiteDataFetchOption.h"
@@ -28,6 +29,7 @@
#include <WebCore/FileSystem.h>
#include <glib/gi18n-lib.h>
#include <wtf/glib/GUniquePtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,7 +20,6 @@
#pragma once
#include "APIWebsiteDataStore.h"
-#include "WebKitPrivate.h"
#include "WebProcessPool.h"
#include "WebsiteDataStore.h"
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -19,7 +19,6 @@
#pragma once
-#include "WebKitPrivate.h"
#include "WebKitWebsiteData.h"
#include "WebsiteDataRecord.h"
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,13 +23,12 @@
#include "APIDictionary.h"
#include "APINumber.h"
#include "APIURLRequest.h"
-#include "WebKitPrivate.h"
#include "WebKitWindowPropertiesPrivate.h"
#include <WebCore/IntRect.h>
#include <WebCore/WindowFeatures.h>
#include <glib/gi18n-lib.h>
+#include <wtf/glib/WTFGType.h>
-using namespace WebKit;
using namespace WebCore;
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h (218331 => 218332)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h 2017-06-15 15:40:20 UTC (rev 218332)
@@ -24,11 +24,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebKitWindowPropertiesPrivate_h
-#define WebKitWindowPropertiesPrivate_h
+#pragma once
-#include "WebKitPrivate.h"
#include "WebKitWindowProperties.h"
+#include <WebCore/WindowFeatures.h>
WebKitWindowProperties* webkitWindowPropertiesCreate();
void webkitWindowPropertiesUpdateFromWebWindowFeatures(WebKitWindowProperties*, const WebCore::WindowFeatures&);
@@ -39,5 +38,3 @@
void webkitWindowPropertiesSetScrollbarsVisible(WebKitWindowProperties*, bool scrollBarsVisible);
void webkitWindowPropertiesSetResizable(WebKitWindowProperties*, bool resizable);
void webkitWindowPropertiesSetFullscreen(WebKitWindowProperties*, bool fullscreen);
-
-#endif // WebKitWindowPropertiesPrivate_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -21,8 +21,8 @@
#include "WebKitFrame.h"
#include "WebKitFramePrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitScriptWorldPrivate.h"
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,10 +20,10 @@
#include "config.h"
#include "WebKitScriptWorld.h"
-#include "WebKitPrivate.h"
#include "WebKitScriptWorldPrivate.h"
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -20,9 +20,9 @@
#include "config.h"
#include "WebKitWebEditor.h"
-#include "WebKitPrivate.h"
#include "WebKitWebEditorPrivate.h"
#include "WebKitWebPagePrivate.h"
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -23,12 +23,12 @@
#include "APIDictionary.h"
#include "APIInjectedBundleBundleClient.h"
#include "APIString.h"
-#include "WebKitPrivate.h"
#include "WebKitWebExtensionPrivate.h"
#include "WebKitWebPagePrivate.h"
#include "WebProcess.h"
#include <wtf/HashMap.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,10 +22,10 @@
#include "InjectedBundleHitTestResult.h"
#include "WebKitDOMNodePrivate.h"
-#include "WebKitPrivate.h"
#include "WebKitWebHitTestResultPrivate.h"
#include <glib/gi18n-lib.h>
#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
using namespace WebKit;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (218331 => 218332)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2017-06-15 15:37:31 UTC (rev 218331)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2017-06-15 15:40:20 UTC (rev 218332)
@@ -22,6 +22,11 @@
#include "APIArray.h"
#include "APIDictionary.h"
+#include "APIError.h"
+#include "APINumber.h"
+#include "APIString.h"
+#include "APIURLRequest.h"
+#include "APIURLResponse.h"
#include "ImageOptions.h"
#include "InjectedBundle.h"
#include "WebContextMenuItem.h"
@@ -47,6 +52,7 @@
#include <WebCore/MainFrame.h>
#include <glib/gi18n-lib.h>
#include <wtf/NeverDestroyed.h>
+#include <wtf/glib/WTFGType.h>
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
