⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 254610 in webkit


Ignore:
Timestamp:
Jan 15, 2020, 11:15:44 AM (7 years ago)
Author:
Alan Coon
Message:

Cherry-pick r254293. rdar://problem/58549084

Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
​https://bugs.webkit.org/show_bug.cgi?id=205966
<rdar://problem/58425000>

Reviewed by Brent Fulgham.

To get default on behavior, experimental features in the network process need to be
turned from enable flags to disable flags. This patch does that for the experimental
website data removal flag.

Source/WebCore:

No new tests. This change just reverses the interpretation of a flag.

  • page/Settings.yaml:

Source/WebKit:

This change also aligns the init values of the setting to match the default.

  • NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
  • NetworkProcess/NetworkSession.h:
  • NetworkProcess/NetworkSessionCreationParameters.h:
  • Shared/WebPreferences.yaml:
  • UIProcess/WebProcessPool.cpp: (WebKit::WebProcessPool::ensureNetworkProcess):
  • UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm: (WebKit::WebsiteDataStore::parameters):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254293 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-609-branch/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/safari-609-branch/Source/WebCore/ChangeLog

    r254608 r254610  
     12020-01-14  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r254293. rdar://problem/58549084
     4
     5    Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
     6    https://bugs.webkit.org/show_bug.cgi?id=205966
     7    <rdar://problem/58425000>
     8   
     9    Reviewed by Brent Fulgham.
     10   
     11    To get default on behavior, experimental features in the network process need to be
     12    turned from enable flags to disable flags. This patch does that for the experimental
     13    website data removal flag.
     14   
     15    Source/WebCore:
     16   
     17    No new tests. This change just reverses the interpretation of a flag.
     18   
     19    * page/Settings.yaml:
     20   
     21    Source/WebKit:
     22   
     23    This change also aligns the init values of the setting to match the default.
     24   
     25    * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
     26    * NetworkProcess/NetworkSession.h:
     27    * NetworkProcess/NetworkSessionCreationParameters.h:
     28    * Shared/WebPreferences.yaml:
     29    * UIProcess/WebProcessPool.cpp:
     30    (WebKit::WebProcessPool::ensureNetworkProcess):
     31    * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     32    (WebKit::WebsiteDataStore::parameters):
     33   
     34   
     35    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     36
     37    2020-01-09  John Wilander  <wilander@apple.com>
     38
     39            Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
     40            https://bugs.webkit.org/show_bug.cgi?id=205966
     41            <rdar://problem/58425000>
     42
     43            Reviewed by Brent Fulgham.
     44
     45            To get default on behavior, experimental features in the network process need to be
     46            turned from enable flags to disable flags. This patch does that for the experimental
     47            website data removal flag.
     48
     49            No new tests. This change just reverses the interpretation of a flag.
     50
     51            * page/Settings.yaml:
     52
    1532020-01-14  Alan Coon  <alancoon@apple.com>
    254
  • branches/safari-609-branch/Source/WebCore/page/Settings.yaml

    r254601 r254610  
    890890  initial: false
    891891
    892 isFirstPartyWebsiteDataRemovalEnabled:
    893   initial: true
     892isFirstPartyWebsiteDataRemovalDisabled:
     893  initial: false
    894894
    895895isFirstPartyWebsiteDataRemovalLiveOnTestingEnabled:
  • branches/safari-609-branch/Source/WebKit/ChangeLog

    r254609 r254610  
     12020-01-14  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r254293. rdar://problem/58549084
     4
     5    Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
     6    https://bugs.webkit.org/show_bug.cgi?id=205966
     7    <rdar://problem/58425000>
     8   
     9    Reviewed by Brent Fulgham.
     10   
     11    To get default on behavior, experimental features in the network process need to be
     12    turned from enable flags to disable flags. This patch does that for the experimental
     13    website data removal flag.
     14   
     15    Source/WebCore:
     16   
     17    No new tests. This change just reverses the interpretation of a flag.
     18   
     19    * page/Settings.yaml:
     20   
     21    Source/WebKit:
     22   
     23    This change also aligns the init values of the setting to match the default.
     24   
     25    * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
     26    * NetworkProcess/NetworkSession.h:
     27    * NetworkProcess/NetworkSessionCreationParameters.h:
     28    * Shared/WebPreferences.yaml:
     29    * UIProcess/WebProcessPool.cpp:
     30    (WebKit::WebProcessPool::ensureNetworkProcess):
     31    * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     32    (WebKit::WebsiteDataStore::parameters):
     33   
     34   
     35    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     36
     37    2020-01-09  John Wilander  <wilander@apple.com>
     38
     39            Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
     40            https://bugs.webkit.org/show_bug.cgi?id=205966
     41            <rdar://problem/58425000>
     42
     43            Reviewed by Brent Fulgham.
     44
     45            To get default on behavior, experimental features in the network process need to be
     46            turned from enable flags to disable flags. This patch does that for the experimental
     47            website data removal flag.
     48
     49            This change also aligns the init values of the setting to match the default.
     50
     51            * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
     52            * NetworkProcess/NetworkSession.h:
     53            * NetworkProcess/NetworkSessionCreationParameters.h:
     54            * Shared/WebPreferences.yaml:
     55            * UIProcess/WebProcessPool.cpp:
     56            (WebKit::WebProcessPool::ensureNetworkProcess):
     57            * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     58            (WebKit::WebsiteDataStore::parameters):
     59
    1602020-01-14  Alan Coon  <alancoon@apple.com>
    261
  • branches/safari-609-branch/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

    r254601 r254610  
    278278    bool m_dataRecordsBeingRemoved { false };
    279279    ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };
    280     WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
     280    WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
    281281};
    282282
  • branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSession.h

    r254601 r254610  
    155155    bool m_downgradeReferrer { true };
    156156    WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
    157     WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
     157    WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
    158158#endif
    159159    bool m_isStaleWhileRevalidateEnabled { false };
  • branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

    r254601 r254610  
    8888    bool enableResourceLoadStatisticsDebugMode { false };
    8989    WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
    90     WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
     90    WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies };
    9191    bool deviceManagementRestrictionsEnabled { false };
    9292    bool allLoadsBlockedByDeviceManagementRestrictionsForTesting { false };
  • branches/safari-609-branch/Source/WebKit/Shared/WebPreferences.yaml

    r254601 r254610  
    18301830  category: experimental
    18311831
    1832 IsFirstPartyWebsiteDataRemovalEnabled:
    1833   type: bool
    1834   defaultValue: true
    1835   humanReadableName: "Remove Non-Cookie Data After 7 Days of No User Interaction (ITP)"
    1836   humanReadableDescription: "Remove all non-cookie website data after seven days of no user interaction when Intelligent Tracking Prevention is enabled"
     1832IsFirstPartyWebsiteDataRemovalDisabled:
     1833  type: bool
     1834  defaultValue: false
     1835  humanReadableName: "Disable Removal of Non-Cookie Data After 7 Days of No User Interaction (ITP)"
     1836  humanReadableDescription: "Disable removal of all non-cookie website data after seven days of no user interaction when Intelligent Tracking Prevention is enabled"
    18371837  category: experimental
    18381838
  • branches/safari-609-branch/Source/WebKit/UIProcess/WebProcessPool.cpp

    r254601 r254610  
    578578    bool enableResourceLoadStatisticsDebugMode = false;
    579579    WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    580     WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
     580    WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies;
    581581    WebCore::RegistrableDomain manualPrevalentResource { };
    582582    if (withWebsiteDataStore) {
  • branches/safari-609-branch/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r254601 r254610  
    7474    bool enableResourceLoadStatisticsDebugMode = false;
    7575    auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    76     auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
     76    auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookies;
    7777    bool enableLegacyTLS = false;
    7878    if (id value = [defaults objectForKey:@"WebKitEnableLegacyTLS"])
    … …  
    9292    else
    9393        thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    94     if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalEnabledKey().createCFString().get()]]) {
     94    if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalDisabledKey().createCFString().get()]])
     95        firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
     96    else {
    9597        if ([defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalReproTestingEnabledKey().createCFString().get()]])
    9698            firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::AllButCookiesReproTestingTimeout;
Note: See TracChangeset for help on using the changeset viewer.