Changeset 237146 in webkit

Timestamp:

Oct 15, 2018, 2:33:52 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Remove unused parameters of WebPageGroupData
​https://bugs.webkit.org/show_bug.cgi?id=190600

Reviewed by Chris Dumez.

visibleToInjectedBundle and visibleToHistoryClient are both always true.
This removes a mysterious check in the history code.

• Shared/WebPageGroupData.cpp:

(WebKit::WebPageGroupData::encode const):
(WebKit::WebPageGroupData::decode):

• Shared/WebPageGroupData.h:
• UIProcess/WebPageGroup.cpp:

(WebKit::WebPageGroup::create):
(WebKit::pageGroupData):
(WebKit::WebPageGroup::WebPageGroup):

• UIProcess/WebPageGroup.h:

(WebKit::WebPageGroup::WebPageGroup):
(WebKit::WebPageGroup::create):

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::updateGlobalHistory):
(WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
(WebKit::WebFrameLoaderClient::setTitle):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::create):
(WebKit::WebPage::close):

• WebProcess/WebPage/WebPageGroupProxy.cpp:

(WebKit::WebPageGroupProxy::create):

• WebProcess/WebPage/WebPageGroupProxy.h:

(WebKit::WebPageGroupProxy::pageGroupID const):
(WebKit::WebPageGroupProxy::isVisibleToInjectedBundle const): Deleted.
(WebKit::WebPageGroupProxy::isVisibleToHistoryClient const): Deleted.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPageGroupData.cpp (modified) (2 diffs)
• Shared/WebPageGroupData.h (modified) (1 diff)
• UIProcess/WebPageGroup.cpp (modified) (4 diffs)
• UIProcess/WebPageGroup.h (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebPage/WebPageGroupProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPageGroupProxy.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2018-10-15  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused parameters of WebPageGroupData
+        https://bugs.webkit.org/show_bug.cgi?id=190600
+
+        Reviewed by Chris Dumez.
+
+        visibleToInjectedBundle and visibleToHistoryClient are both always true.
+        This removes a mysterious check in the history code.
+
+        * Shared/WebPageGroupData.cpp:
+        (WebKit::WebPageGroupData::encode const):
+        (WebKit::WebPageGroupData::decode):
+        * Shared/WebPageGroupData.h:
+        * UIProcess/WebPageGroup.cpp:
+        (WebKit::WebPageGroup::create):
+        (WebKit::pageGroupData):
+        (WebKit::WebPageGroup::WebPageGroup):
+        * UIProcess/WebPageGroup.h:
+        (WebKit::WebPageGroup::WebPageGroup):
+        (WebKit::WebPageGroup::create):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::updateGlobalHistory):
+        (WebKit::WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
+        (WebKit::WebFrameLoaderClient::setTitle):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::create):
+        (WebKit::WebPage::close):
+        * WebProcess/WebPage/WebPageGroupProxy.cpp:
+        (WebKit::WebPageGroupProxy::create):
+        * WebProcess/WebPage/WebPageGroupProxy.h:
+        (WebKit::WebPageGroupProxy::pageGroupID const):
+        (WebKit::WebPageGroupProxy::isVisibleToInjectedBundle const): Deleted.
+        (WebKit::WebPageGroupProxy::isVisibleToHistoryClient const): Deleted.
+
 2018-10-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/WebPageGroupData.cpp ¶

@@ -35 +35 @@
     encoder << identifier;
     encoder << pageGroupID;
-    encoder << visibleToInjectedBundle;
-    encoder << visibleToHistoryClient;
     encoder << userContentControllerIdentifier.toUInt64();
 }
@@ -42 +40 @@
 std::optional<WebPageGroupData> WebPageGroupData::decode(IPC::Decoder& decoder)
 {
-    String id;
-    if (!decoder.decode(id))
+    std::optional<String> identifier;
+    decoder >> identifier;
+    if (!identifier)
         return std::nullopt;
-    uint64_t pageGroupID;
-    if (!decoder.decode(pageGroupID))
+    
+    std::optional<uint64_t> pageGroupID;
+    decoder >> pageGroupID;
+    if (!pageGroupID)
         return std::nullopt;
-    bool visibleToInjectedBundle;
-    if (!decoder.decode(visibleToInjectedBundle))
-        return std::nullopt;
-    bool visibleToHistoryClient;
-    if (!decoder.decode(visibleToHistoryClient))
-        return std::nullopt;
-    std::optional<uint64_t> userContentControllerIdentifier;
+    
+    std::optional<UserContentControllerIdentifier> userContentControllerIdentifier;
     decoder >> userContentControllerIdentifier;
     if (!userContentControllerIdentifier)
         return std::nullopt;
-    return { { id, pageGroupID, visibleToInjectedBundle, visibleToHistoryClient, makeObjectIdentifier<UserContentControllerIdentifierType>(*userContentControllerIdentifier) } };
+    
+    return {{ WTFMove(*identifier), WTFMove(*pageGroupID), WTFMove(*userContentControllerIdentifier) }};
 }
 

trunk/Source/WebKit/Shared/WebPageGroupData.h ¶

@@ -42 +42 @@
     String identifier;
     uint64_t pageGroupID;
-    bool visibleToInjectedBundle;
-    bool visibleToHistoryClient;
 
     UserContentControllerIdentifier userContentControllerIdentifier;

trunk/Source/WebKit/UIProcess/WebPageGroup.cpp ¶

@@ -55 +55 @@
 }
 
-Ref<WebPageGroup> WebPageGroup::create(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
+Ref<WebPageGroup> WebPageGroup::create(const String& identifier)
 {
-    return adoptRef(*new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient));
+    return adoptRef(*new WebPageGroup(identifier));
 }
 
@@ -65 +65 @@
 }
 
-static WebPageGroupData pageGroupData(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
+static WebPageGroupData pageGroupData(const String& identifier)
 {
     WebPageGroupData data;
@@ -76 +76 @@
         data.identifier = makeString("__uniquePageGroupID-", String::number(data.pageGroupID));
 
-    data.visibleToInjectedBundle = visibleToInjectedBundle;
-    data.visibleToHistoryClient = visibleToHistoryClient;
-
     return data;
 }
@@ -84 +81 @@
 // FIXME: Why does the WebPreferences object here use ".WebKit2" instead of "WebKit2." which all the other constructors use.
 // If it turns out that it's wrong, we can change it to to "WebKit2." and get rid of the globalDebugKeyPrefix from WebPreferences.
-WebPageGroup::WebPageGroup(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
-    : m_data(pageGroupData(identifier, visibleToInjectedBundle, visibleToHistoryClient))
+WebPageGroup::WebPageGroup(const String& identifier)
+    : m_data(pageGroupData(identifier))
     , m_preferences(WebPreferences::createWithLegacyDefaults(m_data.identifier, ".WebKit2", "WebKit2."))
     , m_userContentController(WebUserContentControllerProxy::create())

trunk/Source/WebKit/UIProcess/WebPageGroup.h ¶

@@ -42 +42 @@
 class WebPageGroup : public API::ObjectImpl<API::Object::Type::PageGroup> {
 public:
-    WebPageGroup(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
-    static Ref<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
+    explicit WebPageGroup(const String& identifier = { });
+    static Ref<WebPageGroup> create(const String& identifier = { });
 
     static WebPageGroup* get(uint64_t pageGroupID);

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp ¶

@@ -1080 +1080 @@
 {
     WebPage* webPage = m_frame->page();
-    if (!webPage || !webPage->pageGroup()->isVisibleToHistoryClient())
+    if (!webPage)
         return;
 
@@ -1098 +1098 @@
 {
     WebPage* webPage = m_frame->page();
-    if (!webPage || !webPage->pageGroup()->isVisibleToHistoryClient())
+    if (!webPage)
         return;
 
@@ -1341 +1341 @@
 {
     WebPage* webPage = m_frame->page();
-    if (!webPage || !webPage->pageGroup()->isVisibleToHistoryClient())
+    if (!webPage)
         return;
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp ¶

@@ -342 +342 @@
     Ref<WebPage> page = adoptRef(*new WebPage(pageID, WTFMove(parameters)));
 
-    if (page->pageGroup()->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+    if (WebProcess::singleton().injectedBundle())
         WebProcess::singleton().injectedBundle()->didCreatePage(page.ptr());
 
@@ -1177 +1177 @@
         reportUsedFeatures();
 
-    if (pageGroup()->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+    if (WebProcess::singleton().injectedBundle())
         WebProcess::singleton().injectedBundle()->willDestroyPage(this);
 

trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.cpp ¶

@@ -40 +40 @@
     auto pageGroup = adoptRef(*new WebPageGroupProxy(data));
 
-    if (pageGroup->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+    if (WebProcess::singleton().injectedBundle())
         WebProcess::singleton().injectedBundle()->didInitializePageGroup(pageGroup.ptr());
 

trunk/Source/WebKit/WebProcess/WebPage/WebPageGroupProxy.h ¶

@@ -45 +45 @@
     const String& identifier() const { return m_data.identifier; }
     uint64_t pageGroupID() const { return m_data.pageGroupID; }
-    bool isVisibleToInjectedBundle() const { return m_data.visibleToInjectedBundle; }
-    bool isVisibleToHistoryClient() const { return m_data.visibleToHistoryClient; }
     WebCore::PageGroup* corePageGroup() const { return m_pageGroup; }