Changeset 216338 in webkit


Ignore:
Timestamp:
May 6, 2017 8:25:20 PM (7 years ago)
Author:
timothy_horton@apple.com
Message:

Reduce the number of includes in WebPage.h and WebProcess.h
https://bugs.webkit.org/show_bug.cgi?id=171779

Reviewed by Sam Weinig.

  • WebProcess/InjectedBundle/API/APIInjectedBundleEditorClient.h:
  • WebProcess/Network/NetworkProcessConnection.cpp:
  • WebProcess/Network/webrtc/LibWebRTCProvider.cpp:
  • WebProcess/Network/webrtc/LibWebRTCResolver.cpp:
  • WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
  • WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
  • WebProcess/WebPage/FindController.cpp:
  • WebProcess/WebPage/WebFrame.cpp:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::disableEnumeratingAllNetworkInterfaces):
(WebKit::WebPage::enableEnumeratingAllNetworkInterfaces):
(WebKit::WebPage::didReceivePolicyDecision):

  • WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::disableEnumeratingAllNetworkInterfaces): Deleted.
(WebKit::WebPage::enableEnumeratingAllNetworkInterfaces): Deleted.

  • WebProcess/WebPage/ios/FindIndicatorOverlayClientIOS.h:
  • WebProcess/WebProcess.cpp:
  • WebProcess/WebProcess.h:

In my measurement, this improves WebKit2 debug clean build time by
~10% for Mac and ~5% for iOS. The most valuable change is the one to
remove LibWebRTC headers..

  • page/TextIndicator.h:
Location:
trunk/Source
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r216336 r216338  
     12017-05-06  Tim Horton  <timothy_horton@apple.com>
     2
     3        Reduce the number of includes in WebPage.h and WebProcess.h
     4        https://bugs.webkit.org/show_bug.cgi?id=171779
     5
     6        Reviewed by Sam Weinig.
     7
     8        * page/TextIndicator.h:
     9
    1102017-05-06  Alexey Proskuryakov  <ap@apple.com>
    211
  • trunk/Source/WebCore/page/TextIndicator.h

    r214231 r216338  
    3838
    3939// FIXME: Move PresentationTransition to TextIndicatorWindow, because it's about presentation.
    40 enum class TextIndicatorPresentationTransition {
     40enum class TextIndicatorPresentationTransition : uint8_t {
    4141    None,
    4242
  • trunk/Source/WebKit2/ChangeLog

    r216336 r216338  
     12017-05-06  Tim Horton  <timothy_horton@apple.com>
     2
     3        Reduce the number of includes in WebPage.h and WebProcess.h
     4        https://bugs.webkit.org/show_bug.cgi?id=171779
     5
     6        Reviewed by Sam Weinig.
     7
     8        * WebProcess/InjectedBundle/API/APIInjectedBundleEditorClient.h:
     9        * WebProcess/Network/NetworkProcessConnection.cpp:
     10        * WebProcess/Network/webrtc/LibWebRTCProvider.cpp:
     11        * WebProcess/Network/webrtc/LibWebRTCResolver.cpp:
     12        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
     13        * WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm:
     14        * WebProcess/WebPage/FindController.cpp:
     15        * WebProcess/WebPage/WebFrame.cpp:
     16        * WebProcess/WebPage/WebPage.cpp:
     17        (WebKit::WebPage::disableEnumeratingAllNetworkInterfaces):
     18        (WebKit::WebPage::enableEnumeratingAllNetworkInterfaces):
     19        (WebKit::WebPage::didReceivePolicyDecision):
     20        * WebProcess/WebPage/WebPage.h:
     21        (WebKit::WebPage::disableEnumeratingAllNetworkInterfaces): Deleted.
     22        (WebKit::WebPage::enableEnumeratingAllNetworkInterfaces): Deleted.
     23        * WebProcess/WebPage/ios/FindIndicatorOverlayClientIOS.h:
     24        * WebProcess/WebProcess.cpp:
     25        * WebProcess/WebProcess.h:
     26        In my measurement, this improves WebKit2 debug clean build time by
     27        ~10% for Mac and ~5% for iOS. The most valuable change is the one to
     28        remove LibWebRTC headers..
     29
    1302017-05-06  Alexey Proskuryakov  <ap@apple.com>
    231
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/APIInjectedBundleEditorClient.h

    r209307 r216338  
    2727
    2828#include <WebCore/EditorInsertAction.h>
    29 #include <WebCore/SharedBuffer.h>
    3029#include <WebCore/TextAffinity.h>
    3130#include <wtf/Forward.h>
     31#include <wtf/Vector.h>
    3232
    3333namespace WebCore {
     
    3535class Node;
    3636class Range;
     37class SharedBuffer;
    3738}
    3839
  • trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp

    r214413 r216338  
    2828
    2929#include "DataReference.h"
     30#include "LibWebRTCNetwork.h"
    3031#include "NetworkConnectionToWebProcessMessages.h"
    3132#include "WebCoreArgumentCoders.h"
  • trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCProvider.cpp

    r213418 r216338  
    2929#if USE(LIBWEBRTC)
    3030
     31#include "LibWebRTCNetwork.h"
    3132#include "WebProcess.h"
    3233#include <webrtc/pc/peerconnectionfactory.h>
  • trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCResolver.cpp

    r211441 r216338  
    2929#if USE(LIBWEBRTC)
    3030
     31#include "LibWebRTCNetwork.h"
    3132#include "NetworkProcessConnection.h"
    3233#include "NetworkRTCProviderMessages.h"
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

    r203338 r216338  
    3434#include "WebPage.h"
    3535#include <WebCore/ContextMenu.h>
     36#include <WebCore/Editor.h>
    3637#include <WebCore/Event.h>
    3738#include <WebCore/FrameLoader.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm

    r192333 r216338  
    3333#import "WebPageProxyMessages.h"
    3434#import <WebCore/DictionaryLookup.h>
     35#import <WebCore/Editor.h>
    3536#import <WebCore/FrameView.h>
    3637#import <WebCore/MainFrame.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm

    r206261 r216338  
    3636#import "WebPageProxyMessages.h"
    3737#import "WebProcess.h"
     38#import <WebCore/Editor.h>
    3839#import <WebCore/FocusController.h>
    3940#import <WebCore/Frame.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

    r214893 r216338  
    3737#include <WebCore/FloatQuad.h>
    3838#include <WebCore/FocusController.h>
     39#include <WebCore/FrameSelection.h>
    3940#include <WebCore/FrameView.h>
    4041#include <WebCore/GraphicsContext.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

    r212312 r216338  
    5454#include <WebCore/Chrome.h>
    5555#include <WebCore/DocumentLoader.h>
     56#include <WebCore/Editor.h>
    5657#include <WebCore/EventHandler.h>
    5758#include <WebCore/File.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r216234 r216338  
    587587    m_page->rtcController().disableICECandidateFiltering();
    588588}
     589
     590#if USE(LIBWEBRTC)
     591void WebPage::disableEnumeratingAllNetworkInterfaces()
     592{
     593    m_page->libWebRTCProvider().disableEnumeratingAllNetworkInterfaces();
     594}
     595
     596void WebPage::enableEnumeratingAllNetworkInterfaces()
     597{
     598    m_page->libWebRTCProvider().enableEnumeratingAllNetworkInterfaces();
     599}
     600#endif
    589601#endif
    590602
     
    27212733}
    27222734
    2723 void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID downloadID)
     2735void WebPage::didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, const DownloadID& downloadID)
    27242736{
    27252737    WebFrame* frame = WebProcess::singleton().webFrame(frameID);
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r216212 r216338  
    3131#include "APIInjectedBundlePageUIClient.h"
    3232#include "APIObject.h"
    33 #include "Download.h"
    3433#include "EditingRange.h"
    3534#include "FindController.h"
    3635#include "GeolocationPermissionRequestManager.h"
    37 #include "ImageOptions.h"
    3836#include "InjectedBundlePageFullScreenClient.h"
    3937#include "InjectedBundlePageLoaderClient.h"
     
    4543#include "Plugin.h"
    4644#include "SandboxExtension.h"
    47 #include "ShareableBitmap.h"
    4845#include "UserData.h"
    4946#include "UserMediaPermissionRequestManager.h"
    5047#include "WebURLSchemeHandler.h"
    5148#include <WebCore/ActivityState.h>
    52 #include <WebCore/DictationAlternative.h>
    53 #include <WebCore/DictionaryPopupInfo.h>
    54 #include <WebCore/DragData.h>
    55 #include <WebCore/Editor.h>
    5649#include <WebCore/FrameLoaderTypes.h>
    57 #include <WebCore/HitTestResult.h>
    5850#include <WebCore/HysteresisActivity.h>
    5951#include <WebCore/IntRect.h>
    6052#include <WebCore/IntSizeHash.h>
    61 #include <WebCore/LibWebRTCProvider.h>
    6253#include <WebCore/Page.h>
    6354#include <WebCore/PageOverlay.h>
    6455#include <WebCore/PageVisibilityState.h>
    65 #include <WebCore/PlatformMouseEvent.h>
    66 #include <WebCore/ScrollTypes.h>
    67 #include <WebCore/TextChecking.h>
    68 #include <WebCore/TextIndicator.h>
    6956#include <WebCore/UserActivity.h>
    7057#include <WebCore/UserContentTypes.h>
    7158#include <WebCore/UserInterfaceLayoutDirection.h>
    7259#include <WebCore/UserScriptTypes.h>
    73 #include <WebCore/ViewportConfiguration.h>
    7460#include <WebCore/WebCoreKeyboardUIMode.h>
    7561#include <memory>
     
    9379#if PLATFORM(IOS)
    9480#include "GestureTypes.h"
    95 #import "WebPageMessages.h"
     81#include "WebPageMessages.h"
     82#include <WebCore/ViewportConfiguration.h>
    9683#endif
    9784
     
    133120class GraphicsContext;
    134121class Frame;
     122class FrameSelection;
    135123class FrameView;
    136124class HTMLPlugInElement;
     
    149137class URL;
    150138class VisibleSelection;
     139enum class TextIndicatorPresentationTransition : uint8_t;
     140enum SyntheticClickType : int8_t;
    151141struct Highlight;
    152142struct KeypressCommand;
    153143struct TextCheckingResult;
     144struct ViewportArguments;
    154145
    155146#if ENABLE(VIDEO) && USE(GSTREAMER)
     
    160151namespace WebKit {
    161152class DrawingArea;
     153class DownloadID;
     154class GamepadData;
    162155class InjectedBundleBackForwardList;
    163156class NotificationPermissionRequestManager;
     
    197190struct EditingRange;
    198191struct EditorState;
    199 class GamepadData;
    200192struct InteractionInformationAtPosition;
    201193struct InteractionInformationRequest;
     
    206198struct WebPreferencesStore;
    207199struct WebSelectionData;
     200
     201typedef uint32_t SnapshotOptions;
    208202
    209203#if PLATFORM(COCOA)
     
    11191113    void updatePreferences(const WebPreferencesStore&);
    11201114
    1121     void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, DownloadID);
     1115    void didReceivePolicyDecision(uint64_t frameID, uint64_t listenerID, uint32_t policyAction, uint64_t navigationID, const DownloadID&);
    11221116    void setUserAgent(const String&);
    11231117    void setCustomTextEncodingName(const String&);
     
    11941188    void enableICECandidateFiltering();
    11951189#if USE(LIBWEBRTC)
    1196     void disableEnumeratingAllNetworkInterfaces() { m_page->libWebRTCProvider().disableEnumeratingAllNetworkInterfaces(); }
    1197     void enableEnumeratingAllNetworkInterfaces() { m_page->libWebRTCProvider().enableEnumeratingAllNetworkInterfaces(); }
     1190    void disableEnumeratingAllNetworkInterfaces();
     1191    void enableEnumeratingAllNetworkInterfaces();
    11981192#endif
    11991193#endif
  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp

    r210845 r216338  
    3838#include "WindowsKeyboardCodes.h"
    3939#include <WebCore/BackForwardController.h>
     40#include <WebCore/Editor.h>
    4041#include <WebCore/EventHandler.h>
    4142#include <WebCore/FocusController.h>
     
    4748#include <WebCore/PlatformKeyboardEvent.h>
    4849#include <WebCore/Settings.h>
     50#include <WebCore/SharedBuffer.h>
    4951#include <WebCore/UserAgent.h>
    5052#include <wtf/glib/GUniquePtr.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/ios/FindIndicatorOverlayClientIOS.h

    r201224 r216338  
    3030#import <WebCore/GraphicsContext.h>
    3131#import <WebCore/PageOverlay.h>
    32 
    33 namespace WebCore {
    34 class TextIndicator;
    35 }
     32#import <WebCore/TextIndicator.h>
    3633
    3734namespace WebKit {
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r216234 r216338  
    3535#include "EventDispatcher.h"
    3636#include "InjectedBundle.h"
     37#include "LibWebRTCNetwork.h"
    3738#include "Logging.h"
    3839#include "NetworkConnectionToWebProcessMessages.h"
  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r215941 r216338  
    2828#include "CacheModel.h"
    2929#include "ChildProcess.h"
    30 #include "DrawingArea.h"
    31 #include "LibWebRTCNetwork.h"
    3230#include "PluginProcessConnectionManager.h"
    3331#include "ResourceCachesToClear.h"
    3432#include "SandboxExtension.h"
    35 #include "SharedMemory.h"
    3633#include "TextCheckerState.h"
    3734#include "ViewUpdateDispatcher.h"
    38 #include "VisitedLinkTable.h"
    3935#include "WebInspectorInterruptDispatcher.h"
     36#include <WebCore/ActivityState.h>
    4037#include <WebCore/HysteresisActivity.h>
    41 #include <WebCore/ResourceLoadStatisticsStore.h>
    4238#include <WebCore/SessionID.h>
    4339#include <WebCore/Timer.h>
     
    6965class SessionID;
    7066class UserGestureToken;
     67class ResourceLoadStatisticsStore;
    7168struct PluginInfo;
    7269struct SecurityOriginData;
     
    7976class GamepadData;
    8077class InjectedBundle;
     78class LibWebRTCNetwork;
    8179class NetworkProcessConnection;
    8280class ObjCObjectGraph;
Note: See TracChangeset for help on using the changeset viewer.