Changeset 218332 in webkit


Ignore:
Timestamp:
Jun 15, 2017 8:40:20 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

[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:
Location:
trunk/Source/WebKit2
Files:
93 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r218331 r218332  
     12017-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Cleanup headers includes in GTK+ API files
     4        https://bugs.webkit.org/show_bug.cgi?id=173415
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        - Remove WTFGType.h from WebKitPrivate.h and include it in all other files instead of WebKitPrivate if needed.
     9        - Stop including WebKitPrivate.h in all other private headers.
     10        - Remove all C API includes.
     11
     12        * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
     13        * UIProcess/API/gtk/WebKitAuthenticationRequest.cpp:
     14        * UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h:
     15        * UIProcess/API/gtk/WebKitAutomationSession.cpp:
     16        * UIProcess/API/gtk/WebKitBackForwardList.cpp:
     17        * UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
     18        * UIProcess/API/gtk/WebKitColorChooser.h:
     19        * UIProcess/API/gtk/WebKitColorChooserRequest.cpp:
     20        * UIProcess/API/gtk/WebKitContextMenu.cpp:
     21        * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
     22        * UIProcess/API/gtk/WebKitContextMenuItemPrivate.h:
     23        * UIProcess/API/gtk/WebKitContextMenuPrivate.h:
     24        * UIProcess/API/gtk/WebKitCookieManager.cpp:
     25        * UIProcess/API/gtk/WebKitCookieManagerPrivate.h:
     26        * UIProcess/API/gtk/WebKitCredentialPrivate.h:
     27        * UIProcess/API/gtk/WebKitDownload.cpp:
     28        * UIProcess/API/gtk/WebKitDownloadClient.cpp:
     29        * UIProcess/API/gtk/WebKitDownloadPrivate.h:
     30        * UIProcess/API/gtk/WebKitEditorState.cpp:
     31        * UIProcess/API/gtk/WebKitEditorStatePrivate.h:
     32        * UIProcess/API/gtk/WebKitError.cpp:
     33        * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
     34        * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
     35        * UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h:
     36        * UIProcess/API/gtk/WebKitFindController.cpp:
     37        * UIProcess/API/gtk/WebKitFormClient.cpp:
     38        * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
     39        * UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h:
     40        * UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp:
     41        * UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h:
     42        * UIProcess/API/gtk/WebKitHitTestResult.cpp:
     43        * UIProcess/API/gtk/WebKitHitTestResultPrivate.h:
     44        * UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp:
     45        * UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h:
     46        * UIProcess/API/gtk/WebKitJavascriptResult.cpp:
     47        * UIProcess/API/gtk/WebKitJavascriptResultPrivate.h:
     48        * UIProcess/API/gtk/WebKitMimeInfoPrivate.h:
     49        * UIProcess/API/gtk/WebKitNavigationActionPrivate.h:
     50        * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
     51        * UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h:
     52        * UIProcess/API/gtk/WebKitNetworkProxySettings.cpp:
     53        * UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h:
     54        * UIProcess/API/gtk/WebKitNotification.cpp:
     55        * UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp:
     56        * UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h:
     57        * UIProcess/API/gtk/WebKitNotificationPrivate.h:
     58        * UIProcess/API/gtk/WebKitOptionMenu.cpp:
     59        * UIProcess/API/gtk/WebKitPlugin.cpp:
     60        * UIProcess/API/gtk/WebKitPluginPrivate.h:
     61        * UIProcess/API/gtk/WebKitPolicyDecision.cpp:
     62        * UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h:
     63        * UIProcess/API/gtk/WebKitPrintCustomWidget.cpp:
     64        * UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h:
     65        * UIProcess/API/gtk/WebKitPrintOperation.cpp:
     66        * UIProcess/API/gtk/WebKitPrivate.h:
     67        * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
     68        * UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h:
     69        * UIProcess/API/gtk/WebKitSecurityManager.cpp:
     70        * UIProcess/API/gtk/WebKitSecurityOrigin.cpp:
     71        * UIProcess/API/gtk/WebKitSecurityOriginPrivate.h:
     72        * UIProcess/API/gtk/WebKitSettings.cpp:
     73        * UIProcess/API/gtk/WebKitUIClient.cpp:
     74        * UIProcess/API/gtk/WebKitURIRequest.cpp:
     75        * UIProcess/API/gtk/WebKitURIResponse.cpp:
     76        * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
     77        * UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
     78        * UIProcess/API/gtk/WebKitUserContent.cpp:
     79        * UIProcess/API/gtk/WebKitUserContentManager.cpp:
     80        * UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp:
     81        * UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h:
     82        * UIProcess/API/gtk/WebKitWebContext.cpp:
     83        * UIProcess/API/gtk/WebKitWebContextPrivate.h:
     84        * UIProcess/API/gtk/WebKitWebInspector.cpp:
     85        * UIProcess/API/gtk/WebKitWebInspectorPrivate.h:
     86        * UIProcess/API/gtk/WebKitWebResource.cpp:
     87        * UIProcess/API/gtk/WebKitWebResourcePrivate.h:
     88        * UIProcess/API/gtk/WebKitWebView.cpp:
     89        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     90        * UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp:
     91        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
     92        * UIProcess/API/gtk/WebKitWebViewPrivate.h:
     93        * UIProcess/API/gtk/WebKitWebsiteDataManager.cpp:
     94        * UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h:
     95        * UIProcess/API/gtk/WebKitWebsiteDataPrivate.h:
     96        * UIProcess/API/gtk/WebKitWindowProperties.cpp:
     97        * UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h:
     98        * WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp:
     99        * WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp:
     100        * WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp:
     101        * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
     102        * WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp:
     103        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
     104
    11052017-06-15  Carlos Garcia Campos  <cgarcia@igalia.com>
    2106
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp

    r216584 r218332  
    2424#include "WebKitAuthenticationRequestPrivate.h"
    2525#include "WebKitCredentialPrivate.h"
    26 #include "WebKitPrivate.h"
    2726#include "WebKitWebView.h"
    2827#include <glib/gi18n-lib.h>
     28#include <wtf/glib/WTFGType.h>
    2929#include <wtf/text/CString.h>
    3030
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp

    r213703 r218332  
    2727#include "WebProtectionSpace.h"
    2828#include <glib/gi18n-lib.h>
     29#include <wtf/glib/WTFGType.h>
    2930#include <wtf/text/CString.h>
    3031
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequestPrivate.h

    r153882 r218332  
    1818 */
    1919
    20 #ifndef WebKitAuthenticationRequestPrivate_h
    21 #define WebKitAuthenticationRequestPrivate_h
     20#pragma once
    2221
    2322#include "AuthenticationChallengeProxy.h"
    2423#include "WebKitAuthenticationRequest.h"
    25 #include "WebKitPrivate.h"
    2624
    2725WebKitAuthenticationRequest* webkitAuthenticationRequestCreate(WebKit::AuthenticationChallengeProxy*, bool privateBrowsingEnabled);
    2826WebKit::AuthenticationChallengeProxy* webkitAuthenticationRequestGetAuthenticationChallenge(WebKitAuthenticationRequest*);
    29 
    30 #endif // WebKitAuthenticationRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAutomationSession.cpp

    r218098 r218332  
    2323#include "APIAutomationSessionClient.h"
    2424#include "WebKitAutomationSessionPrivate.h"
    25 #include "WebKitPrivate.h"
    2625#include "WebKitWebViewPrivate.h"
    2726#include <glib/gi18n-lib.h>
     27#include <wtf/glib/WTFGType.h>
    2828#include <wtf/text/CString.h>
    2929
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp

    r217960 r218332  
    2323#include "APIArray.h"
    2424#include "WebKitBackForwardListPrivate.h"
    25 #include "WebKitPrivate.h"
    2625#include <wtf/glib/GRefPtr.h>
     26#include <wtf/glib/WTFGType.h>
    2727
    2828/**
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp

    r185502 r218332  
    2222
    2323#include "WebKitBackForwardListPrivate.h"
    24 #include "WebKitPrivate.h"
    2524#include <wtf/HashMap.h>
    2625#include <wtf/NeverDestroyed.h>
    2726#include <wtf/glib/GRefPtr.h>
     27#include <wtf/glib/WTFGType.h>
    2828#include <wtf/text/CString.h>
    2929
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h

    r197563 r218332  
    1818 */
    1919
    20 #ifndef WebKitColorChooser_h
    21 #define WebKitColorChooser_h
     20#pragma once
    2221
    2322#include "WebColorPickerGtk.h"
    24 #include "WebKitPrivate.h"
     23#include <WebCore/IntRect.h>
    2524#include <wtf/glib/GRefPtr.h>
    2625
     
    2928namespace WebCore {
    3029class Color;
    31 class IntRect;
    3230}
    3331
     
    5553
    5654} // namespace WebKit
    57 
    58 #endif // WebKitColorChooser_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp

    r179984 r218332  
    3030#include "WebKitColorChooserRequestPrivate.h"
    3131#include <glib/gi18n-lib.h>
     32#include <wtf/glib/WTFGType.h>
    3233
    3334using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp

    r212225 r218332  
    2626#include "WebKitContextMenuPrivate.h"
    2727#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2829
    2930using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp

    r217209 r218332  
    3333#include <wtf/glib/GRefPtr.h>
    3434#include <wtf/glib/GUniquePtr.h>
     35#include <wtf/glib/WTFGType.h>
    3536
    3637using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItemPrivate.h

    r192247 r218332  
    1818 */
    1919
    20 #ifndef WebKitContextMenuItemPrivate_h
    21 #define WebKitContextMenuItemPrivate_h
     20#pragma once
    2221
    2322#include "WebContextMenuItemGtk.h"
    2423#include "WebKitContextMenuItem.h"
    25 #include "WebKitPrivate.h"
    2624
    2725WebKitContextMenuItem* webkitContextMenuItemCreate(const WebKit::WebContextMenuItemData&);
    2826WebKit::WebContextMenuItemGtk webkitContextMenuItemToWebContextMenuItemGtk(WebKitContextMenuItem*);
    2927WebKit::WebContextMenuItemData webkitContextMenuItemToWebContextMenuItemData(WebKitContextMenuItem*);
    30 
    31 #endif // WebKitContextMenuItemPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuPrivate.h

    r192247 r218332  
    1818 */
    1919
    20 #ifndef WebKitContextMenuPrivate_h
    21 #define WebKitContextMenuPrivate_h
     20#pragma once
    2221
    2322#include "WebContextMenuItemGtk.h"
    2423#include "WebKitContextMenu.h"
    25 #include "WebKitPrivate.h"
    2624
    2725WebKitContextMenu* webkitContextMenuCreate(const Vector<WebKit::WebContextMenuItemData>&);
     
    3028void webkitContextMenuSetParentItem(WebKitContextMenu*, WebKitContextMenuItem*);
    3129WebKitContextMenuItem* webkitContextMenuGetParentItem(WebKitContextMenu*);
    32 
    33 #endif // WebKitContextMenuPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp

    r218062 r218332  
    3030#include <WebCore/SessionID.h>
    3131#include <wtf/glib/GRefPtr.h>
     32#include <wtf/glib/WTFGType.h>
    3233#include <wtf/text/CString.h>
    3334
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManagerPrivate.h

    r212345 r218332  
    2020#pragma once
    2121
    22 #include "WebKitPrivate.h"
     22#include "WebKitCookieManager.h"
    2323#include "WebKitWebsiteDataManager.h"
    2424
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredentialPrivate.h

    r153882 r218332  
    1818 */
    1919
    20 #ifndef WebKitCredentialPrivate_h
    21 #define WebKitCredentialPrivate_h
     20#pragma once
    2221
    2322#include "WebKitCredential.h"
    24 #include "WebKitPrivate.h"
    2523#include <WebCore/Credential.h>
    2624
    2725WebKitCredential* webkitCredentialCreate(const WebCore::Credential&);
    2826const WebCore::Credential& webkitCredentialGetCredential(WebKitCredential*);
    29 
    30 #endif // WebKitCredentialPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp

    r218185 r218332  
    3131#include <wtf/glib/GRefPtr.h>
    3232#include <wtf/glib/GUniquePtr.h>
     33#include <wtf/glib/WTFGType.h>
    3334#include <wtf/text/CString.h>
    3435
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp

    r218185 r218332  
    2727#include "WebKitWebViewPrivate.h"
    2828#include "WebProcessPool.h"
    29 #include <WebKit/WKString.h>
    3029#include <wtf/glib/GRefPtr.h>
    3130#include <wtf/text/CString.h>
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadPrivate.h

    r218185 r218332  
    1818 */
    1919
    20 #ifndef WebKitDownloadPrivate_h
    21 #define WebKitDownloadPrivate_h
     20#pragma once
    2221
    2322#include "WebKitDownload.h"
    24 #include "WebKitPrivate.h"
    2523#include <WebCore/ResourceError.h>
    2624#include <WebCore/ResourceRequest.h>
     
    3634String webkitDownloadDecideDestinationWithSuggestedFilename(WebKitDownload*, const CString& suggestedFilename, bool& allowOverwrite);
    3735void webkitDownloadDestinationCreated(WebKitDownload*, const String& destinationPath);
    38 
    39 #endif // WebKitDownloadPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorState.cpp

    r213703 r218332  
    2424#include "WebKitEditorStatePrivate.h"
    2525#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2627
    2728using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitEditorStatePrivate.h

    r187100 r218332  
    1818 */
    1919
    20 #ifndef WebKitEditorStatePrivate_h
    21 #define WebKitEditorStatePrivate_h
     20#pragma once
    2221
     22#include "EditorState.h"
    2323#include "WebKitEditorState.h"
    24 #include "WebKitPrivate.h"
    2524
    2625WebKitEditorState* webkitEditorStateCreate(const WebKit::EditorState&);
    2726void webkitEditorStateChanged(WebKitEditorState*, const WebKit::EditorState&);
    28 
    29 #endif // WebKitEditorStatePrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp

    r214934 r218332  
    2222#include "WebKitError.h"
    2323
     24#include "APIError.h"
    2425#include "WebKitPrivate.h"
    2526
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp

    r218172 r218332  
    2222
    2323#include "WebKitFaviconDatabasePrivate.h"
    24 #include "WebKitPrivate.h"
    2524#include <WebCore/FileSystem.h>
    2625#include <WebCore/Image.h>
     
    3130#include <wtf/glib/GRefPtr.h>
    3231#include <wtf/glib/GUniquePtr.h>
     32#include <wtf/glib/WTFGType.h>
    3333#include <wtf/text/CString.h>
     34#include <wtf/text/StringHash.h>
    3435
    3536using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp

    r213703 r218332  
    2727#include "WebOpenPanelResultListenerProxy.h"
    2828#include <WebCore/FileSystem.h>
     29#include <WebCore/URL.h>
    2930#include <glib/gi18n-lib.h>
    3031#include <wtf/glib/GRefPtr.h>
    3132#include <wtf/glib/GUniquePtr.h>
     33#include <wtf/glib/WTFGType.h>
    3234#include <wtf/text/CString.h>
    3335
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequestPrivate.h

    r199577 r218332  
    1818 */
    1919
    20 #ifndef WebKitFileChooserRequestPrivate_h
    21 #define WebKitFileChooserRequestPrivate_h
     20#pragma once
    2221
    2322#include "WebKitFileChooserRequest.h"
    24 #include "WebKitPrivate.h"
     23#include "WebOpenPanelResultListenerProxy.h"
    2524
    2625WebKitFileChooserRequest* webkitFileChooserRequestCreate(API::OpenPanelParameters*, WebKit::WebOpenPanelResultListenerProxy*);
    27 
    28 #endif // WebKitFileChooserRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp

    r218098 r218332  
    2323#include "APIFindClient.h"
    2424#include "WebKitEnumTypes.h"
    25 #include "WebKitPrivate.h"
    2625#include "WebKitWebViewPrivate.h"
    2726#include <glib/gi18n-lib.h>
    2827#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2929#include <wtf/text/CString.h>
    3030
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp

    r218098 r218332  
    2424#include "WebFormSubmissionListenerProxy.h"
    2525#include "WebKitFormSubmissionRequestPrivate.h"
    26 #include "WebKitPrivate.h"
    2726#include "WebKitWebViewPrivate.h"
    2827#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2929
    3030using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp

    r217963 r218332  
    2626#include "WebKitFormSubmissionRequestPrivate.h"
    2727#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2829#include <wtf/text/CString.h>
    2930
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h

    r217963 r218332  
    2121
    2222#include "WebKitFormSubmissionRequest.h"
    23 #include "WebKitPrivate.h"
    2423
    2524WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(const Vector<std::pair<String, String>>&, Ref<WebKit::WebFormSubmissionListenerProxy>&&);
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequest.cpp

    r213703 r218332  
    2424#include "WebKitGeolocationPermissionRequestPrivate.h"
    2525#include "WebKitPermissionRequest.h"
     26#include <wtf/glib/WTFGType.h>
    2627
    2728using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationPermissionRequestPrivate.h

    r131760 r218332  
    1818 */
    1919
    20 #ifndef WebKitGeolocationPermissionRequestPrivate_h
    21 #define WebKitGeolocationPermissionRequestPrivate_h
     20#pragma once
    2221
    2322#include "WebKitGeolocationPermissionRequest.h"
    24 #include "WebKitPrivate.h"
    2523
    2624WebKitGeolocationPermissionRequest* webkitGeolocationPermissionRequestCreate(WebKit::GeolocationPermissionRequestProxy*);
    27 
    28 #endif // WebKitGeolocationPermissionRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResult.cpp

    r213703 r218332  
    2424#include "WebKitHitTestResultPrivate.h"
    2525#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2627#include <wtf/text/CString.h>
    2728
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitHitTestResultPrivate.h

    r190823 r218332  
    1818 */
    1919
    20 #ifndef WebKitHitTestResultPrivate_h
    21 #define WebKitHitTestResultPrivate_h
     20#pragma once
    2221
    2322#include "WebKitHitTestResult.h"
    24 #include "WebKitPrivate.h"
    2523
    2624WebKitHitTestResult* webkitHitTestResultCreate(const WebKit::WebHitTestResultData&);
    2725bool webkitHitTestResultCompare(WebKitHitTestResult*, const WebKit::WebHitTestResultData&);
    28 
    29 #endif // WebKitHitTestResultPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequest.cpp

    r188124 r218332  
    2424#include "WebKitPermissionRequest.h"
    2525#include "WebPageProxy.h"
     26#include <wtf/glib/WTFGType.h>
    2627
    2728#if ENABLE(VIDEO)
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h

    r188121 r218332  
    1818 */
    1919
    20 #ifndef WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
    21 #define WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
     20#pragma once
    2221
    2322#include "InstallMissingMediaPluginsPermissionRequest.h"
    2423#include "WebKitInstallMissingMediaPluginsPermissionRequest.h"
    25 #include "WebKitPrivate.h"
    2624
    2725#if ENABLE(VIDEO)
    2826WebKitInstallMissingMediaPluginsPermissionRequest* webkitInstallMissingMediaPluginsPermissionRequestCreate(WebKit::InstallMissingMediaPluginsPermissionRequest&);
    2927#endif
    30 
    31 #endif // WebKitInstallMissingMediaPluginsPermissionRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp

    r187485 r218332  
    2424#include "WebKitJavascriptResultPrivate.h"
    2525#include <wtf/glib/GRefPtr.h>
    26 
    27 using namespace WebKit;
    2826
    2927struct _WebKitJavascriptResult {
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResultPrivate.h

    r175414 r218332  
    1818 */
    1919
    20 #ifndef WebKitJavascriptResultPrivate_h
    21 #define WebKitJavascriptResultPrivate_h
     20#pragma once
    2221
    2322#include <WebCore/SerializedScriptValue.h>
    2423#include "WebKitJavascriptResult.h"
    25 #include "WebKitPrivate.h"
    2624#include "WebKitWebView.h"
    2725
    2826WebKitJavascriptResult* webkitJavascriptResultCreate(WebKitWebView*, WebCore::SerializedScriptValue&);
    29 
    30 #endif // WebKitJavascriptResultPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfoPrivate.h

    r117305 r218332  
    1818 */
    1919
    20 #ifndef WebKitMimeInfoPrivate_h
    21 #define WebKitMimeInfoPrivate_h
     20#pragma once
    2221
    2322#include "WebKitMimeInfo.h"
    24 #include "WebKitPrivate.h"
    2523#include <WebCore/PluginData.h>
    2624
    2725WebKitMimeInfo* webkitMimeInfoCreate(const WebCore::MimeClassInfo&);
    28 
    29 #endif // WebKitMimeInfoPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationActionPrivate.h

    r203338 r218332  
    1818 */
    1919
    20 #ifndef WebKitNavigationActionPrivate_h
    21 #define WebKitNavigationActionPrivate_h
     20#pragma once
    2221
    2322#include "NavigationActionData.h"
    2423#include "WebKitNavigationAction.h"
    2524#include "WebKitPrivate.h"
     25#include <wtf/glib/GRefPtr.h>
    2626
    2727struct _WebKitNavigationAction {
     
    5252
    5353WebKitNavigationAction* webkitNavigationActionCreate(WebKitURIRequest*, const WebKit::NavigationActionData&);
    54 
    55 #endif // WebKitNavigationActionPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp

    r185502 r218332  
    2828#include <glib/gi18n-lib.h>
    2929#include <wtf/glib/GRefPtr.h>
     30#include <wtf/glib/WTFGType.h>
    3031#include <wtf/text/CString.h>
    3132
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h

    r172211 r218332  
    1818 */
    1919
    20 #ifndef WebKitNavigationPolicyDecisionPrivate_h
    21 #define WebKitNavigationPolicyDecisionPrivate_h
     20#pragma once
    2221
    2322#include "NavigationActionData.h"
     23#include "WebFramePolicyListenerProxy.h"
    2424#include "WebKitNavigationPolicyDecision.h"
    25 #include "WebKitPrivate.h"
     25#include <WebCore/ResourceRequest.h>
    2626
    2727WebKitPolicyDecision* webkitNavigationPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, WebKit::WebFramePolicyListenerProxy*);
    2828WebKitPolicyDecision* webkitNewWindowPolicyDecisionCreate(const WebKit::NavigationActionData&, const WebCore::ResourceRequest&, const String& frameName, WebKit::WebFramePolicyListenerProxy*);
    29 
    30 #endif // WebKitNavigationPolicyDecisionPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettings.cpp

    r210921 r218332  
    2323#include "WebKitNetworkProxySettingsPrivate.h"
    2424#include <WebCore/SoupNetworkProxySettings.h>
    25 #include <wtf/text/WTFString.h>
     25#include <wtf/glib/WTFGType.h>
    2626
    27 using namespace WebKit;
    2827using namespace WebCore;
    2928
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNetworkProxySettingsPrivate.h

    r210921 r218332  
    2121
    2222#include "WebKitNetworkProxySettings.h"
    23 #include "WebKitPrivate.h"
    2423#include <WebCore/SoupNetworkProxySettings.h>
    2524
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotification.cpp

    r208977 r218332  
    2222
    2323#include "WebKitNotificationPrivate.h"
    24 #include "WebKitPrivate.h"
    2524#include "WebNotification.h"
    2625#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2727#include <wtf/text/CString.h>
    2828
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp

    r188121 r218332  
    2424#include "WebKitNotificationPermissionRequestPrivate.h"
    2525#include "WebKitPermissionRequest.h"
     26#include <wtf/glib/WTFGType.h>
    2627
    2728using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h

    r177073 r218332  
    1818 */
    1919
    20 #ifndef WebKitNotificationPermissionRequestPrivate_h
    21 #define WebKitNotificationPermissionRequestPrivate_h
     20#pragma once
    2221
    2322#include "WebKitNotificationPermissionRequest.h"
    24 #include "WebKitPrivate.h"
    2523
    2624WebKitNotificationPermissionRequest* webkitNotificationPermissionRequestCreate(WebKit::NotificationPermissionRequest*);
    27 
    28 #endif // WebKitNotificationPermissionRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNotificationPrivate.h

    r177073 r218332  
    1818 */
    1919
    20 #ifndef WebKitNotificationPrivate_h
    21 #define WebKitNotificationPrivate_h
     20#pragma once
    2221
    2322#include "WebKitNotification.h"
    24 #include "WebKitPrivate.h"
    2523#include "WebNotification.h"
    2624#include <wtf/text/CString.h>
     
    2826WebKitNotification* webkitNotificationCreate(WebKitWebView*, const WebKit::WebNotification&);
    2927WebKitWebView* webkitNotificationGetWebView(WebKitNotification*);
    30 
    31 #endif // WebKitNotificationPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitOptionMenu.cpp

    r218325 r218332  
    2323#include "WebKitOptionMenuItemPrivate.h"
    2424#include "WebKitOptionMenuPrivate.h"
    25 #include "WebKitPrivate.h"
     25#include <wtf/glib/WTFGType.h>
    2626
    2727using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPlugin.cpp

    r167884 r218332  
    2323#include "WebKitMimeInfoPrivate.h"
    2424#include "WebKitPluginPrivate.h"
     25#include <wtf/glib/WTFGType.h>
    2526#include <wtf/text/CString.h>
    2627
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPluginPrivate.h

    r117305 r218332  
    1818 */
    1919
    20 #ifndef WebKitPluginPrivate_h
    21 #define WebKitPluginPrivate_h
     20#pragma once
    2221
    2322#include "PluginModuleInfo.h"
    2423#include "WebKitPlugin.h"
    25 #include "WebKitPrivate.h"
    2624
    2725WebKitPlugin* webkitPluginCreate(const WebKit::PluginModuleInfo&);
    28 
    29 #endif // WebKitPluginPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecision.cpp

    r213703 r218332  
    2424#include "WebKitPolicyDecisionPrivate.h"
    2525#include "WebsitePolicies.h"
     26#include <wtf/glib/WTFGType.h>
    2627
    2728using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyDecisionPrivate.h

    r131760 r218332  
    1818 */
    1919
    20 #ifndef WebKitPolicyDecisionPrivate_h
    21 #define WebKitPolicyDecisionPrivate_h
     20#pragma once
    2221
     22#include "WebFramePolicyListenerProxy.h"
    2323#include "WebKitPolicyDecision.h"
    24 #include "WebKitPrivate.h"
    2524
    2625void webkitPolicyDecisionSetListener(WebKitPolicyDecision*, WebKit::WebFramePolicyListenerProxy*);
    27 
    28 #endif // WebKitResponsePolicyDecisionPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp

    r211481 r218332  
    2525#include <gtk/gtk.h>
    2626#include <wtf/glib/GRefPtr.h>
    27 
    28 using namespace WebKit;
     27#include <wtf/glib/WTFGType.h>
     28#include <wtf/text/CString.h>
    2929
    3030/**
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidgetPrivate.h

    r211481 r218332  
    2121
    2222#include "WebKitPrintCustomWidget.h"
    23 #include "WebKitPrivate.h"
    2423#include <gtk/gtk.h>
    2524
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp

    r218098 r218332  
    3131#include <wtf/glib/GRefPtr.h>
    3232#include <wtf/glib/GUniquePtr.h>
     33#include <wtf/glib/WTFGType.h>
    3334#include <wtf/text/CString.h>
    3435
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h

    r218176 r218332  
    2626#pragma once
    2727
     28#include "WebEvent.h"
    2829#include "WebKitNavigationAction.h"
    29 #include <WebKit/WKAPICast.h>
    30 #include <WebKit/WKDownload.h>
    31 #include <WebKit/WKFindOptions.h>
    32 #include <WebKit/WKGeolocationManager.h>
    33 #include <WebKit/WKGeolocationPermissionRequest.h>
    34 #include <WebKit/WKGeolocationPosition.h>
    35 #include <WebKit/WKIconDatabase.h>
    36 #include <WebKit/WKInspector.h>
    37 #include <WebKit/WKRetainPtr.h>
    38 #include <WebKit/WKSerializedScriptValue.h>
    39 #include <WebKit/WKString.h>
    40 #include <WebKit/WKUserMediaPermissionRequest.h>
    41 #include <WebKit/WebKit2_C.h>
    42 #include <glib.h>
    43 #include <wtf/Assertions.h>
    44 #include <wtf/glib/WTFGType.h>
     30#include <WebCore/FrameLoaderTypes.h>
    4531
    4632unsigned toGdkModifiers(WebKit::WebEvent::Modifiers);
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp

    r213703 r218332  
    2222
    2323#include "WebKitPolicyDecisionPrivate.h"
    24 #include "WebKitPrivate.h"
    2524#include "WebKitURIRequestPrivate.h"
    2625#include "WebKitURIResponsePrivate.h"
    2726#include <glib/gi18n-lib.h>
    2827#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2929#include <wtf/text/CString.h>
    3030
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h

    r172211 r218332  
    1818 */
    1919
    20 #ifndef WebKitResponsePolicyDecisionPrivate_h
    21 #define WebKitResponsePolicyDecisionPrivate_h
     20#pragma once
    2221
    23 #include "WebKitPrivate.h"
    2422#include "WebKitResponsePolicyDecision.h"
    2523
    2624WebKitPolicyDecision* webkitResponsePolicyDecisionCreate(const WebCore::ResourceRequest&, const WebCore::ResourceResponse&, bool canShowMIMEType, WebKit::WebFramePolicyListenerProxy*);
    27 
    28 #endif // WebKitResponsePolicyDecisionPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityManager.cpp

    r213703 r218332  
    2525#include "WebProcessPool.h"
    2626#include <WebCore/SchemeRegistry.h>
     27#include <wtf/glib/WTFGType.h>
    2728
    2829using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOrigin.cpp

    r211639 r218332  
    2424#include <WebCore/URL.h>
    2525#include <wtf/text/CString.h>
    26 
    27 using namespace WebKit;
    2826
    2927/**
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSecurityOriginPrivate.h

    r210664 r218332  
    2020#pragma once
    2121
    22 #include "WebKitPrivate.h"
    2322#include "WebKitSecurityOrigin.h"
    2423#include <WebCore/SecurityOrigin.h>
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp

    r216247 r218332  
    3434#include "HardwareAccelerationManager.h"
    3535#include "WebKitEnumTypes.h"
    36 #include "WebKitPrivate.h"
    3736#include "WebKitSettingsPrivate.h"
    3837#include "WebPageProxy.h"
     
    4039#include <WebCore/UserAgent.h>
    4140#include <glib/gi18n-lib.h>
     41#include <wtf/glib/WTFGType.h>
    4242#include <wtf/text/CString.h>
    4343
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp

    r218098 r218332  
    2626#include "WebKitNavigationActionPrivate.h"
    2727#include "WebKitNotificationPermissionRequestPrivate.h"
    28 #include "WebKitPrivate.h"
    2928#include "WebKitURIRequestPrivate.h"
    3029#include "WebKitUserMediaPermissionRequestPrivate.h"
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp

    r193622 r218332  
    2121#include "WebKitURIRequest.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include "WebKitURIRequestPrivate.h"
    2524#include <WebCore/GUniquePtrSoup.h>
    2625#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2727#include <wtf/text/CString.h>
    2828
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp

    r173060 r218332  
    2121#include "WebKitURIResponse.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include "WebKitURIResponsePrivate.h"
    2524#include <WebCore/GUniquePtrSoup.h>
    2625#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2727#include <wtf/text/CString.h>
    2828
    29 using namespace WebKit;
    3029using namespace WebCore;
    3130
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp

    r215455 r218332  
    3232#include <wtf/glib/GRefPtr.h>
    3333#include <wtf/glib/RunLoopSourcePriority.h>
     34#include <wtf/glib/WTFGType.h>
    3435#include <wtf/text/CString.h>
    3536
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h

    r213441 r218332  
    1818 */
    1919
    20 #ifndef WebKitURISchemeRequestPrivate_h
    21 #define WebKitURISchemeRequestPrivate_h
     20#pragma once
    2221
    2322#include "LegacyCustomProtocolManagerProxy.h"
    24 #include "WebKitPrivate.h"
    2523#include "WebKitURISchemeRequest.h"
    2624#include "WebKitWebContext.h"
     
    3129WebKit::LegacyCustomProtocolManagerProxy* webkitURISchemeRequestGetManager(WebKitURISchemeRequest*);
    3230void webkitURISchemeRequestInvalidate(WebKitURISchemeRequest*);
    33 
    34 #endif // WebKitURISchemeRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp

    r204466 r218332  
    2121#include "WebKitUserContent.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include "WebKitUserContentPrivate.h"
    2524#include <wtf/text/CString.h>
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp

    r218299 r218332  
    2323#include "APISerializedScriptValue.h"
    2424#include "WebKitJavascriptResultPrivate.h"
    25 #include "WebKitPrivate.h"
    2625#include "WebKitUserContentManagerPrivate.h"
    2726#include "WebKitUserContentPrivate.h"
     
    2928#include "WebScriptMessageHandler.h"
    3029#include <wtf/glib/GRefPtr.h>
     30#include <wtf/glib/WTFGType.h>
    3131
    3232using namespace WebCore;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp

    r213703 r218332  
    2424#include "WebKitUserMediaPermissionRequestPrivate.h"
    2525#include <glib/gi18n-lib.h>
     26#include <wtf/glib/WTFGType.h>
    2627
    2728using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h

    r197114 r218332  
    1717 */
    1818
    19 #ifndef WebKitUserMediaPermissionRequestPrivate_h
    20 #define WebKitUserMediaPermissionRequestPrivate_h
     19#pragma once
    2120
    22 #include "WebKitPrivate.h"
     21#include "APISecurityOrigin.h"
    2322#include "WebKitUserMediaPermissionRequest.h"
    2423
    25 class SecurityOrigin;
    26 
    2724WebKitUserMediaPermissionRequest* webkitUserMediaPermissionRequestCreate(WebKit::UserMediaPermissionRequestProxy&, API::SecurityOrigin&, API::SecurityOrigin&);
    28 
    29 #endif // WebKitUserMediaPermissionRequestPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

    r218322 r218332  
    6868#include <wtf/glib/GRefPtr.h>
    6969#include <wtf/glib/GUniquePtr.h>
     70#include <wtf/glib/WTFGType.h>
    7071#include <wtf/text/CString.h>
    7172
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h

    r213441 r218332  
    2424 */
    2525
    26 #ifndef WebKitWebContextPrivate_h
    27 #define WebKitWebContextPrivate_h
     26#pragma once
    2827
    2928#include "DownloadProxy.h"
    3029#include "LegacyCustomProtocolManagerProxy.h"
    31 #include "WebKitPrivate.h"
    3230#include "WebKitUserContentManager.h"
    3331#include "WebKitWebContext.h"
     
    5048GVariant* webkitWebContextInitializeWebExtensions(WebKitWebContext*);
    5149void webkitWebContextInitializeNotificationPermissions(WebKitWebContext*);
    52 
    53 #endif // WebKitWebContextPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp

    r218089 r218332  
    2626#include <glib/gi18n-lib.h>
    2727#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2829#include <wtf/text/CString.h>
    2930
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspectorPrivate.h

    r131760 r218332  
    1818 */
    1919
    20 #ifndef WebKitWebInspectorPrivate_h
    21 #define WebKitWebInspectorPrivate_h
     20#pragma once
    2221
    23 #include "WebKitPrivate.h"
    2422#include "WebKitWebInspector.h"
    2523
    2624WebKitWebInspector* webkitWebInspectorCreate(WebKit::WebInspectorProxy*);
    27 
    28 #endif // WebKitWebInspectorPrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp

    r217960 r218332  
    2727#include <glib/gi18n-lib.h>
    2828#include <wtf/glib/GRefPtr.h>
     29#include <wtf/glib/WTFGType.h>
    2930#include <wtf/text/CString.h>
    3031
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResourcePrivate.h

    r175618 r218332  
    1818 */
    1919
    20 #ifndef WebKitWebResourcePrivate_h
    21 #define WebKitWebResourcePrivate_h
     20#pragma once
    2221
    23 #include "WebKitPrivate.h"
    2422#include "WebKitWebResource.h"
    2523
     
    3230void webkitWebResourceFailedWithTLSErrors(WebKitWebResource*, GTlsCertificateFlags, GTlsCertificate*);
    3331WebKit::WebFrameProxy* webkitWebResourceGetFrame(WebKitWebResource*);
    34 
    35 
    36 #endif // WebKitWebResourcePrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r218325 r218332  
    7272#include <glib/gi18n-lib.h>
    7373#include <wtf/glib/GRefPtr.h>
     74#include <wtf/glib/WTFGType.h>
    7475#include <wtf/text/CString.h>
    7576#include <wtf/text/StringBuilder.h>
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r218064 r218332  
    4444#include "WebKit2Initialize.h"
    4545#include "WebKitAuthenticationDialog.h"
    46 #include "WebKitPrivate.h"
    4746#include "WebKitWebViewBaseAccessible.h"
    4847#include "WebKitWebViewBasePrivate.h"
     
    6766#include <wtf/HashMap.h>
    6867#include <wtf/glib/GRefPtr.h>
     68#include <wtf/glib/WTFGType.h>
    6969#include <wtf/text/CString.h>
    7070
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp

    r165760 r218332  
    2121#include "WebKitWebViewBaseAccessible.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include <gtk/gtk.h>
     24#include <wtf/glib/WTFGType.h>
    2525
    2626struct _WebKitWebViewBaseAccessiblePrivate {
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

    r218064 r218332  
    2626 */
    2727
    28 #ifndef WebKitWebViewBasePrivate_h
    29 #define WebKitWebViewBasePrivate_h
     28#pragma once
    3029
    3130#include "APIPageConfiguration.h"
     
    3433#include "WebContextMenuProxyGtk.h"
    3534#include "WebInspectorProxy.h"
    36 #include "WebKitPrivate.h"
    3735#include "WebKitWebViewBase.h"
    3836#include "WebPageProxy.h"
     
    8179WebKit::GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase*);
    8280#endif
    83 
    84 #endif // WebKitWebViewBasePrivate_h
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h

    r218325 r218332  
    3232#include "WebHitTestResultData.h"
    3333#include "WebImage.h"
    34 #include "WebKitPrivate.h"
    3534#include "WebKitWebView.h"
    3635#include "WebPageProxy.h"
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp

    r215941 r218332  
    2323#include "APIWebsiteDataStore.h"
    2424#include "WebKitCookieManagerPrivate.h"
     25#include "WebKitPrivate.h"
    2526#include "WebKitWebsiteDataManagerPrivate.h"
    2627#include "WebKitWebsiteDataPrivate.h"
     
    2930#include <glib/gi18n-lib.h>
    3031#include <wtf/glib/GUniquePtr.h>
     32#include <wtf/glib/WTFGType.h>
    3133
    3234using namespace WebKit;
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManagerPrivate.h

    r212345 r218332  
    2121
    2222#include "APIWebsiteDataStore.h"
    23 #include "WebKitPrivate.h"
    2423#include "WebProcessPool.h"
    2524#include "WebsiteDataStore.h"
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataPrivate.h

    r211079 r218332  
    2020#pragma once
    2121
    22 #include "WebKitPrivate.h"
    2322#include "WebKitWebsiteData.h"
    2423#include "WebsiteDataRecord.h"
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp

    r188446 r218332  
    2424#include "APINumber.h"
    2525#include "APIURLRequest.h"
    26 #include "WebKitPrivate.h"
    2726#include "WebKitWindowPropertiesPrivate.h"
    2827#include <WebCore/IntRect.h>
    2928#include <WebCore/WindowFeatures.h>
    3029#include <glib/gi18n-lib.h>
    31 
    32 using namespace WebKit;
     30#include <wtf/glib/WTFGType.h>
     31
    3332using namespace WebCore;
    3433
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h

    r170702 r218332  
    2525 */
    2626
    27 #ifndef WebKitWindowPropertiesPrivate_h
    28 #define WebKitWindowPropertiesPrivate_h
     27#pragma once
    2928
    30 #include "WebKitPrivate.h"
    3129#include "WebKitWindowProperties.h"
     30#include <WebCore/WindowFeatures.h>
    3231
    3332WebKitWindowProperties* webkitWindowPropertiesCreate();
     
    4039void webkitWindowPropertiesSetResizable(WebKitWindowProperties*, bool resizable);
    4140void webkitWindowPropertiesSetFullscreen(WebKitWindowProperties*, bool fullscreen);
    42 
    43 #endif // WebKitWindowPropertiesPrivate_h
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp

    r213703 r218332  
    2222
    2323#include "WebKitFramePrivate.h"
    24 #include "WebKitPrivate.h"
    2524#include "WebKitScriptWorldPrivate.h"
     25#include <wtf/glib/WTFGType.h>
    2626#include <wtf/text/CString.h>
    2727
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp

    r217960 r218332  
    2121#include "WebKitScriptWorld.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include "WebKitScriptWorldPrivate.h"
    2524#include <wtf/HashMap.h>
    2625#include <wtf/NeverDestroyed.h>
     26#include <wtf/glib/WTFGType.h>
    2727
    2828using namespace WebKit;
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebEditor.cpp

    r218251 r218332  
    2121#include "WebKitWebEditor.h"
    2222
    23 #include "WebKitPrivate.h"
    2423#include "WebKitWebEditorPrivate.h"
    2524#include "WebKitWebPagePrivate.h"
     25#include <wtf/glib/WTFGType.h>
    2626
    2727using namespace WebKit;
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp

    r218323 r218332  
    2424#include "APIInjectedBundleBundleClient.h"
    2525#include "APIString.h"
    26 #include "WebKitPrivate.h"
    2726#include "WebKitWebExtensionPrivate.h"
    2827#include "WebKitWebPagePrivate.h"
     
    3029#include <wtf/HashMap.h>
    3130#include <wtf/glib/GRefPtr.h>
     31#include <wtf/glib/WTFGType.h>
    3232
    3333using namespace WebKit;
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp

    r185502 r218332  
    2323#include "InjectedBundleHitTestResult.h"
    2424#include "WebKitDOMNodePrivate.h"
    25 #include "WebKitPrivate.h"
    2625#include "WebKitWebHitTestResultPrivate.h"
    2726#include <glib/gi18n-lib.h>
    2827#include <wtf/glib/GRefPtr.h>
     28#include <wtf/glib/WTFGType.h>
    2929#include <wtf/text/CString.h>
    3030
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

    r218324 r218332  
    2323#include "APIArray.h"
    2424#include "APIDictionary.h"
     25#include "APIError.h"
     26#include "APINumber.h"
     27#include "APIString.h"
     28#include "APIURLRequest.h"
     29#include "APIURLResponse.h"
    2530#include "ImageOptions.h"
    2631#include "InjectedBundle.h"
     
    4853#include <glib/gi18n-lib.h>
    4954#include <wtf/NeverDestroyed.h>
     55#include <wtf/glib/WTFGType.h>
    5056#include <wtf/text/CString.h>
    5157#include <wtf/text/StringBuilder.h>
Note: See TracChangeset for help on using the changeset viewer.