Changeset 258734 in webkit


Ignore:
Timestamp:
Mar 19, 2020 3:18:30 PM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Remove unused WebProcessPool::didGetStatistics
https://bugs.webkit.org/show_bug.cgi?id=209303
<rdar://problem/60648454>

Patch by Alex Christensen <achristensen@webkit.org> on 2020-03-19
Reviewed by Geoffrey Garen.

  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::didGetStatistics): Deleted.

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebProcessPool.messages.in:
Location:
trunk/Source/WebKit
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r258728 r258734  
     12020-03-19  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unused WebProcessPool::didGetStatistics
     4        https://bugs.webkit.org/show_bug.cgi?id=209303
     5        <rdar://problem/60648454>
     6
     7        Reviewed by Geoffrey Garen.
     8
     9        * UIProcess/WebProcessPool.cpp:
     10        (WebKit::WebProcessPool::didGetStatistics): Deleted.
     11        * UIProcess/WebProcessPool.h:
     12        * UIProcess/WebProcessPool.messages.in:
     13
    1142020-03-19  Takashi Komori  <Takashi.Komori@sony.com>
    215
  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r258667 r258734  
    5151#include "RemoteNetworkingContext.h"
    5252#include "ShouldGrandfatherStatistics.h"
    53 #include "StatisticsData.h"
    5453#include "StorageAccessStatus.h"
    5554#include "StorageManagerSet.h"
  • trunk/Source/WebKit/Sources.txt

    r258180 r258734  
    177177Shared/SharedStringHashTableReadOnly.cpp
    178178Shared/SharedStringHashTable.cpp
    179 Shared/StatisticsData.cpp
    180179Shared/TouchBarMenuData.cpp
    181180Shared/TouchBarMenuItemData.cpp
     
    288287UIProcess/ProvisionalPageProxy.cpp
    289288UIProcess/ResponsivenessTimer.cpp
    290 UIProcess/StatisticsRequest.cpp
    291289UIProcess/SuspendedPageProxy.cpp
    292290UIProcess/SystemPreviewController.cpp
  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r253103 r258734  
    518518void WKContextGetStatistics(WKContextRef contextRef, void* context, WKContextGetStatisticsFunction callback)
    519519{
    520     WebKit::toImpl(contextRef)->getStatistics(0xFFFFFFFF, WebKit::toGenericCallbackFunction(context, callback));
    521520}
    522521
    523522void WKContextGetStatisticsWithOptions(WKContextRef contextRef, WKStatisticsOptions optionsMask, void* context, WKContextGetStatisticsFunction callback)
    524523{
    525     WebKit::toImpl(contextRef)->getStatistics(optionsMask, WebKit::toGenericCallbackFunction(context, callback));
    526524}
    527525
  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r258678 r258734  
    5151#include "PluginProcessManager.h"
    5252#include "SandboxExtension.h"
    53 #include "StatisticsData.h"
    5453#include "TextChecker.h"
    5554#include "UIGamepad.h"
     
    18641863}
    18651864
    1866 void WebProcessPool::getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&& callbackFunction)
    1867 {
    1868     if (!statisticsMask) {
    1869         callbackFunction(nullptr, CallbackBase::Error::Unknown);
    1870         return;
    1871     }
    1872 
    1873     auto request = StatisticsRequest::create(DictionaryCallback::create(WTFMove(callbackFunction)));
    1874 
    1875     if (statisticsMask & StatisticsRequestTypeWebContent)
    1876         requestWebContentStatistics(request.get());
    1877 }
    1878 
    1879 void WebProcessPool::requestWebContentStatistics(StatisticsRequest& request)
    1880 {
    1881     // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
    1882 }
    1883 
    18841865static WebProcessProxy* webProcessProxyFromConnection(IPC::Connection& connection, const Vector<RefPtr<WebProcessProxy>>& processes)
    18851866{
     
    19101891        completionHandler(UserData(webProcessProxy->transformObjectsToHandles(returnData.get())));
    19111892    });
    1912 }
    1913 
    1914 void WebProcessPool::didGetStatistics(const StatisticsData& statisticsData, uint64_t requestID)
    1915 {
    1916     RefPtr<StatisticsRequest> request = m_statisticsRequests.take(requestID);
    1917     if (!request) {
    1918         LOG_ERROR("Cannot report networking statistics.");
    1919         return;
    1920     }
    1921 
    1922     request->completedRequest(requestID, statisticsData);
    19231893}
    19241894
  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r258557 r258734  
    3838#include "PluginInfoStore.h"
    3939#include "ProcessThrottler.h"
    40 #include "StatisticsRequest.h"
    4140#include "VisitedLinkStore.h"
    4241#include "WebContextClient.h"
     
    111110struct GPUProcessCreationParameters;
    112111struct NetworkProcessCreationParameters;
    113 struct StatisticsData;
    114112struct WebProcessCreationParameters;
    115113struct WebProcessDataStoreParameters;
     
    360358    bool httpPipeliningEnabled() const;
    361359
    362     void getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&&);
    363    
    364360    bool javaScriptConfigurationFileEnabled() { return m_javaScriptConfigurationFileEnabled; }
    365361    void setJavaScriptConfigurationFileEnabled(bool flag);
     
    559555    void initializeNewWebProcess(WebProcessProxy&, WebsiteDataStore*, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No);
    560556
    561     void requestWebContentStatistics(StatisticsRequest&);
    562 
    563557    void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
    564558
    565559    void handleMessage(IPC::Connection&, const String& messageName, const UserData& messageBody);
    566560    void handleSynchronousMessage(IPC::Connection&, const String& messageName, const UserData& messageBody, CompletionHandler<void(UserData&&)>&&);
    567 
    568     void didGetStatistics(const StatisticsData&, uint64_t callbackID);
    569561
    570562#if ENABLE(GAMEPAD)
     
    718710
    719711    HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
    720     HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
    721712
    722713#if USE(SOUP)
  • trunk/Source/WebKit/UIProcess/WebProcessPool.messages.in

    r250084 r258734  
    2525    HandleSynchronousMessage(String messageName, WebKit::UserData messageBody) -> (WebKit::UserData returnData) Synchronous WantsConnection
    2626
    27     DidGetStatistics(struct WebKit::StatisticsData statisticsData, uint64_t callbackID)
    28 
    2927#if ENABLE(GAMEPAD)
    3028    StartedUsingGamepads() WantsConnection
  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r258667 r258734  
    10151015                51489CC7237237800044E68A /* WKFindResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51489CC6237237780044E68A /* WKFindResultInternal.h */; };
    10161016                514AB9F02360D2A900EDC396 /* WKFindConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 514AB9EF235FA59B00EDC396 /* WKFindConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
    1017                 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */; };
    10181017                514D9F5719119D35000063A7 /* ServicesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 514D9F5519119D35000063A7 /* ServicesController.h */; };
    10191018                515262BC1FB9515D0070E579 /* WebSWServerToContextConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 515262BB1FB951310070E579 /* WebSWServerToContextConnectionMessages.h */; };
     
    10821081                51FAEC3B1B0657680009C4E7 /* AuxiliaryProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* AuxiliaryProcessMessageReceiver.cpp */; };
    10831082                51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; };
    1084                 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
    10851083                5272D4C91E735F0900EB4290 /* WKProtectionSpaceNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10861084                528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    36763674                514AB9EF235FA59B00EDC396 /* WKFindConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFindConfiguration.h; sourceTree = "<group>"; };
    36773675                514AB9F12360E83D00EDC396 /* WKFindConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFindConfiguration.mm; sourceTree = "<group>"; };
    3678                 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsRequest.h; sourceTree = "<group>"; };
    36793676                514D9F5519119D35000063A7 /* ServicesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesController.h; sourceTree = "<group>"; };
    36803677                514D9F5619119D35000063A7 /* ServicesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesController.mm; sourceTree = "<group>"; };
     
    37273724                51933DEC1965EB24008AC3EA /* MenuUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MenuUtilities.mm; sourceTree = "<group>"; };
    37283725                5194B3861F192FB900FA4708 /* CookieStorageUtilsCF.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CookieStorageUtilsCF.h; sourceTree = "<group>"; };
    3729                 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsRequest.cpp; sourceTree = "<group>"; };
    37303726                51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKContextMenuItem.cpp; sourceTree = "<group>"; };
    37313727                51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItem.h; sourceTree = "<group>"; };
     
    38193815                51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkResourceLoader.cpp; sourceTree = "<group>"; };
    38203816                51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkResourceLoader.h; sourceTree = "<group>"; };
    3821                 5272B2881406985D0096A5D0 /* StatisticsData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StatisticsData.cpp; sourceTree = "<group>"; };
    3822                 5272B2891406985D0096A5D0 /* StatisticsData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsData.h; sourceTree = "<group>"; };
    38233817                5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKProtectionSpaceNS.h; path = mac/WKProtectionSpaceNS.h; sourceTree = "<group>"; };
    38243818                5272D4C81E735F0900EB4290 /* WKProtectionSpaceNS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKProtectionSpaceNS.mm; path = mac/WKProtectionSpaceNS.mm; sourceTree = "<group>"; };
     
    60376031                                83F9644C1FA0F76300C47750 /* SharedStringHashTableReadOnly.h */,
    60386032                                1D67B338212E1F6100FAA786 /* ShareSheetCallbackID.h */,
    6039                                 5272B2881406985D0096A5D0 /* StatisticsData.cpp */,
    6040                                 5272B2891406985D0096A5D0 /* StatisticsData.h */,
    60416033                                1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */,
    60426034                                2FD43B921FA006A30083F51C /* TouchBarMenuData.cpp */,
     
    88918883                                1A30066C1110F4F70031937C /* ResponsivenessTimer.h */,
    88928884                                5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */,
    8893                                 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */,
    8894                                 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */,
    88958885                                515C415A207D74E000726E02 /* SuspendedPageProxy.cpp */,
    88968886                                515C415B207D74E100726E02 /* SuspendedPageProxy.h */,
     
    1102311013                                576CA9D722B862180030143C /* SOAuthorizationNSURLExtras.h in Headers */,
    1102411014                                57FD318522B35169008D0E8B /* SOAuthorizationSession.h in Headers */,
    11025                                 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,
    11026                                 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,
    1102711015                                7A3FECA221F7C09700F267CD /* StorageAccessStatus.h in Headers */,
    1102811016                                46BEB6D722FB9BD700269867 /* StorageArea.h in Headers */,
  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r258665 r258734  
    4646#include "RemoteAudioSession.h"
    4747#include "RemoteLegacyCDMFactory.h"
    48 #include "StatisticsData.h"
    4948#include "StorageAreaMap.h"
    5049#include "UserData.h"
Note: See TracChangeset for help on using the changeset viewer.