Changeset 258734 in webkit
- Timestamp:
- Mar 19, 2020 3:18:30 PM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r258728 r258734 1 2020-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 1 14 2020-03-19 Takashi Komori <Takashi.Komori@sony.com> 2 15 -
trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp
r258667 r258734 51 51 #include "RemoteNetworkingContext.h" 52 52 #include "ShouldGrandfatherStatistics.h" 53 #include "StatisticsData.h"54 53 #include "StorageAccessStatus.h" 55 54 #include "StorageManagerSet.h" -
trunk/Source/WebKit/Sources.txt
r258180 r258734 177 177 Shared/SharedStringHashTableReadOnly.cpp 178 178 Shared/SharedStringHashTable.cpp 179 Shared/StatisticsData.cpp180 179 Shared/TouchBarMenuData.cpp 181 180 Shared/TouchBarMenuItemData.cpp … … 288 287 UIProcess/ProvisionalPageProxy.cpp 289 288 UIProcess/ResponsivenessTimer.cpp 290 UIProcess/StatisticsRequest.cpp291 289 UIProcess/SuspendedPageProxy.cpp 292 290 UIProcess/SystemPreviewController.cpp -
trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp
r253103 r258734 518 518 void WKContextGetStatistics(WKContextRef contextRef, void* context, WKContextGetStatisticsFunction callback) 519 519 { 520 WebKit::toImpl(contextRef)->getStatistics(0xFFFFFFFF, WebKit::toGenericCallbackFunction(context, callback));521 520 } 522 521 523 522 void WKContextGetStatisticsWithOptions(WKContextRef contextRef, WKStatisticsOptions optionsMask, void* context, WKContextGetStatisticsFunction callback) 524 523 { 525 WebKit::toImpl(contextRef)->getStatistics(optionsMask, WebKit::toGenericCallbackFunction(context, callback));526 524 } 527 525 -
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
r258678 r258734 51 51 #include "PluginProcessManager.h" 52 52 #include "SandboxExtension.h" 53 #include "StatisticsData.h"54 53 #include "TextChecker.h" 55 54 #include "UIGamepad.h" … … 1864 1863 } 1865 1864 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 1884 1865 static WebProcessProxy* webProcessProxyFromConnection(IPC::Connection& connection, const Vector<RefPtr<WebProcessProxy>>& processes) 1885 1866 { … … 1910 1891 completionHandler(UserData(webProcessProxy->transformObjectsToHandles(returnData.get()))); 1911 1892 }); 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);1923 1893 } 1924 1894 -
trunk/Source/WebKit/UIProcess/WebProcessPool.h
r258557 r258734 38 38 #include "PluginInfoStore.h" 39 39 #include "ProcessThrottler.h" 40 #include "StatisticsRequest.h"41 40 #include "VisitedLinkStore.h" 42 41 #include "WebContextClient.h" … … 111 110 struct GPUProcessCreationParameters; 112 111 struct NetworkProcessCreationParameters; 113 struct StatisticsData;114 112 struct WebProcessCreationParameters; 115 113 struct WebProcessDataStoreParameters; … … 360 358 bool httpPipeliningEnabled() const; 361 359 362 void getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&&);363 364 360 bool javaScriptConfigurationFileEnabled() { return m_javaScriptConfigurationFileEnabled; } 365 361 void setJavaScriptConfigurationFileEnabled(bool flag); … … 559 555 void initializeNewWebProcess(WebProcessProxy&, WebsiteDataStore*, WebProcessProxy::IsPrewarmed = WebProcessProxy::IsPrewarmed::No); 560 556 561 void requestWebContentStatistics(StatisticsRequest&);562 563 557 void platformInitializeNetworkProcess(NetworkProcessCreationParameters&); 564 558 565 559 void handleMessage(IPC::Connection&, const String& messageName, const UserData& messageBody); 566 560 void handleSynchronousMessage(IPC::Connection&, const String& messageName, const UserData& messageBody, CompletionHandler<void(UserData&&)>&&); 567 568 void didGetStatistics(const StatisticsData&, uint64_t callbackID);569 561 570 562 #if ENABLE(GAMEPAD) … … 718 710 719 711 HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks; 720 HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;721 712 722 713 #if USE(SOUP) -
trunk/Source/WebKit/UIProcess/WebProcessPool.messages.in
r250084 r258734 25 25 HandleSynchronousMessage(String messageName, WebKit::UserData messageBody) -> (WebKit::UserData returnData) Synchronous WantsConnection 26 26 27 DidGetStatistics(struct WebKit::StatisticsData statisticsData, uint64_t callbackID)28 29 27 #if ENABLE(GAMEPAD) 30 28 StartedUsingGamepads() WantsConnection -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r258667 r258734 1015 1015 51489CC7237237800044E68A /* WKFindResultInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51489CC6237237780044E68A /* WKFindResultInternal.h */; }; 1016 1016 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 */; };1018 1017 514D9F5719119D35000063A7 /* ServicesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 514D9F5519119D35000063A7 /* ServicesController.h */; }; 1019 1018 515262BC1FB9515D0070E579 /* WebSWServerToContextConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 515262BB1FB951310070E579 /* WebSWServerToContextConnectionMessages.h */; }; … … 1082 1081 51FAEC3B1B0657680009C4E7 /* AuxiliaryProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* AuxiliaryProcessMessageReceiver.cpp */; }; 1083 1082 51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; }; 1084 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };1085 1083 5272D4C91E735F0900EB4290 /* WKProtectionSpaceNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1086 1084 528C37C1195CBB1A00D8B9CC /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9F28101958F478008CAC72 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3676 3674 514AB9EF235FA59B00EDC396 /* WKFindConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFindConfiguration.h; sourceTree = "<group>"; }; 3677 3675 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>"; };3679 3676 514D9F5519119D35000063A7 /* ServicesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesController.h; sourceTree = "<group>"; }; 3680 3677 514D9F5619119D35000063A7 /* ServicesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesController.mm; sourceTree = "<group>"; }; … … 3727 3724 51933DEC1965EB24008AC3EA /* MenuUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MenuUtilities.mm; sourceTree = "<group>"; }; 3728 3725 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>"; };3730 3726 51A555F3128C6C47009ABCEC /* WKContextMenuItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKContextMenuItem.cpp; sourceTree = "<group>"; }; 3731 3727 51A555F4128C6C47009ABCEC /* WKContextMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextMenuItem.h; sourceTree = "<group>"; }; … … 3819 3815 51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkResourceLoader.cpp; sourceTree = "<group>"; }; 3820 3816 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>"; };3823 3817 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKProtectionSpaceNS.h; path = mac/WKProtectionSpaceNS.h; sourceTree = "<group>"; }; 3824 3818 5272D4C81E735F0900EB4290 /* WKProtectionSpaceNS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKProtectionSpaceNS.mm; path = mac/WKProtectionSpaceNS.mm; sourceTree = "<group>"; }; … … 6037 6031 83F9644C1FA0F76300C47750 /* SharedStringHashTableReadOnly.h */, 6038 6032 1D67B338212E1F6100FAA786 /* ShareSheetCallbackID.h */, 6039 5272B2881406985D0096A5D0 /* StatisticsData.cpp */,6040 5272B2891406985D0096A5D0 /* StatisticsData.h */,6041 6033 1A5E4DA312D3BD3D0099A2BB /* TextCheckerState.h */, 6042 6034 2FD43B921FA006A30083F51C /* TouchBarMenuData.cpp */, … … 8891 8883 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */, 8892 8884 5CA98549210BEB5A0057EB6B /* SafeBrowsingWarning.h */, 8893 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */,8894 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */,8895 8885 515C415A207D74E000726E02 /* SuspendedPageProxy.cpp */, 8896 8886 515C415B207D74E100726E02 /* SuspendedPageProxy.h */, … … 11023 11013 576CA9D722B862180030143C /* SOAuthorizationNSURLExtras.h in Headers */, 11024 11014 57FD318522B35169008D0E8B /* SOAuthorizationSession.h in Headers */, 11025 5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */,11026 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,11027 11015 7A3FECA221F7C09700F267CD /* StorageAccessStatus.h in Headers */, 11028 11016 46BEB6D722FB9BD700269867 /* StorageArea.h in Headers */, -
trunk/Source/WebKit/WebProcess/WebProcess.cpp
r258665 r258734 46 46 #include "RemoteAudioSession.h" 47 47 #include "RemoteLegacyCDMFactory.h" 48 #include "StatisticsData.h"49 48 #include "StorageAreaMap.h" 50 49 #include "UserData.h"
Note: See TracChangeset
for help on using the changeset viewer.