Changeset 225694 in webkit

Timestamp:

Dec 8, 2017 12:32:20 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Modernize APIWebsiteDataStore.h and WebProcessPool.h
​https://bugs.webkit.org/show_bug.cgi?id=180588

Reviewed by Chris Dumez.

pragma once, Ref instead of RefPtr, initializer list in header instead of literals in constructor.

• UIProcess/API/APIWebsiteDataStore.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::WebProcessPool):

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIWebsiteDataStore.h (modified) (3 diffs)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-08  Alex Christensen  <achristensen@webkit.org>
+
+        Modernize APIWebsiteDataStore.h and WebProcessPool.h
+        https://bugs.webkit.org/show_bug.cgi?id=180588
+
+        Reviewed by Chris Dumez.
+
+        pragma once, Ref instead of RefPtr, initializer list in header instead of literals in constructor.
+
+        * UIProcess/API/APIWebsiteDataStore.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::WebProcessPool):
+        * UIProcess/WebProcessPool.h:
+
 2017-12-08  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebKit/UIProcess/API/APIWebsiteDataStore.h

@@ -24 +24 @@
  */
 
-#ifndef APIWebsiteDataStore_h
-#define APIWebsiteDataStore_h
+#pragma once
 
 #include "APIHTTPCookieStore.h"
@@ -50 +49 @@
     void setResourceLoadStatisticsEnabled(bool);
 
-    WebKit::WebsiteDataStore& websiteDataStore() { return *m_websiteDataStore; }
+    WebKit::WebsiteDataStore& websiteDataStore() { return m_websiteDataStore.get(); }
     HTTPCookieStore& httpCookieStore();
 
@@ -78 +77 @@
     static String websiteDataDirectoryFileSystemRepresentation(const String& directoryName);
 
-    RefPtr<WebKit::WebsiteDataStore> m_websiteDataStore;
+    Ref<WebKit::WebsiteDataStore> m_websiteDataStore;
     RefPtr<HTTPCookieStore> m_apiHTTPCookieStore;
 };
 
 }
-
-#endif // APIWebsiteDataStore_h

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -217 +217 @@
 WebProcessPool::WebProcessPool(API::ProcessPoolConfiguration& configuration)
     : m_configuration(configuration.copy())
-    , m_haveInitialEmptyProcess(false)
-    , m_processWithPageCache(0)
     , m_defaultPageGroup(WebPageGroup::createNonNull())
     , m_injectedBundleClient(std::make_unique<API::InjectedBundleClient>())
@@ -226 +224 @@
     , m_customProtocolManagerClient(std::make_unique<API::CustomProtocolManagerClient>())
     , m_visitedLinkStore(VisitedLinkStore::create())
-    , m_visitedLinksPopulated(false)
-    , m_plugInAutoStartProvider(this)
-    , m_alwaysUsesComplexTextCodePath(false)
-    , m_shouldUseFontSmoothing(true)
-    , m_memorySamplerEnabled(false)
-    , m_memorySamplerInterval(1400.0)
 #if PLATFORM(MAC)
     , m_highPerformanceGraphicsUsageSampler(std::make_unique<HighPerformanceGraphicsUsageSampler>(*this))
     , m_perActivityStateCPUUsageSampler(std::make_unique<PerActivityStateCPUUsageSampler>(*this))
 #endif
-    , m_shouldUseTestingNetworkSession(false)
-    , m_processTerminationEnabled(true)
-    , m_canHandleHTTPSServerTrustEvaluation(true)
-    , m_didNetworkProcessCrash(false)
-    , m_memoryCacheDisabled(false)
     , m_alwaysRunsAtBackgroundPriority(m_configuration->alwaysRunsAtBackgroundPriority())
     , m_shouldTakeUIBackgroundAssertion(m_configuration->shouldTakeUIBackgroundAssertion())

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -488 +488 @@
 
     Vector<RefPtr<WebProcessProxy>> m_processes;
-    bool m_haveInitialEmptyProcess;
-
-    WebProcessProxy* m_processWithPageCache;
+    bool m_haveInitialEmptyProcess { false };
+
+    WebProcessProxy* m_processWithPageCache { nullptr };
 #if ENABLE(SERVICE_WORKER)
     ServiceWorkerProcessProxy* m_serviceWorkerProcess { nullptr };
@@ -515 +515 @@
 #endif
     Ref<VisitedLinkStore> m_visitedLinkStore;
-    bool m_visitedLinksPopulated;
-
-    PlugInAutoStartProvider m_plugInAutoStartProvider;
+    bool m_visitedLinksPopulated { false };
+
+    PlugInAutoStartProvider m_plugInAutoStartProvider { this };
         
     HashSet<String> m_schemesToRegisterAsEmptyDocument;
@@ -530 +530 @@
     HashSet<String> m_schemesToRegisterAsCachePartitioned;
 
-    bool m_alwaysUsesComplexTextCodePath;
-    bool m_shouldUseFontSmoothing;
+    bool m_alwaysUsesComplexTextCodePath { false };
+    bool m_shouldUseFontSmoothing { true };
 
     Vector<String> m_fontWhitelist;
@@ -539 +539 @@
     Vector<std::pair<String, RefPtr<API::Object>>> m_messagesToInjectedBundlePostedToEmptyContext;
 
-    bool m_memorySamplerEnabled;
-    double m_memorySamplerInterval;
+    bool m_memorySamplerEnabled { false };
+    double m_memorySamplerInterval { 1400.0 };
 
     RefPtr<API::WebsiteDataStore> m_websiteDataStore;
@@ -566 +566 @@
     String m_overrideCookieStorageDirectory;
 
-    bool m_shouldUseTestingNetworkSession;
-
-    bool m_processTerminationEnabled;
-
-    bool m_canHandleHTTPSServerTrustEvaluation;
-    bool m_didNetworkProcessCrash;
+    bool m_shouldUseTestingNetworkSession { false };
+
+    bool m_processTerminationEnabled { true };
+
+    bool m_canHandleHTTPSServerTrustEvaluation { true };
+    bool m_didNetworkProcessCrash { false };
     RefPtr<NetworkProcessProxy> m_networkProcess;
     RefPtr<StorageProcessProxy> m_storageProcess;
@@ -582 +582 @@
 #endif
 
-    bool m_memoryCacheDisabled;
+    bool m_memoryCacheDisabled { false };
     bool m_resourceLoadStatisticsEnabled { false };
     bool m_javaScriptConfigurationFileEnabled { false };