Changeset 254239 in webkit


Ignore:
Timestamp:
Jan 8, 2020 5:21:01 PM (4 years ago)
Author:
wilander@apple.com
Message:

Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
​https://bugs.webkit.org/show_bug.cgi?id=205963
<rdar://problem/58424136>

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
cookie blocking 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):

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r254232 r254239  
     12020-01-08  John Wilander  <wilander@apple.com>
     2
     3        Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
     4        https://bugs.webkit.org/show_bug.cgi?id=205963
     5        <rdar://problem/58424136>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        To get default on behavior, experimental features in the network process need to be
     10        turned from enable flags to disable flags. This patch does that for the experimental
     11        cookie blocking flag.
     12
     13        No new tests. This change just reverses the interpretation of a flag.
     14
     15        * page/Settings.yaml:
     16
    1172020-01-08  Devin Rousso  <drousso@apple.com>
    218

  • trunk/Source/WebCore/page/Settings.yaml

    r254115 r254239  
    887887  inspectorOverride: true
    888888
    889 isThirdPartyCookieBlockingEnabled:
    890   initial: true
     889isThirdPartyCookieBlockingDisabled:
     890  initial: false
    891891
    892892isFirstPartyWebsiteDataRemovalEnabled:

  • trunk/Source/WebKit/ChangeLog

    r254237 r254239  
     12020-01-08  John Wilander  <wilander@apple.com>
     2
     3        Resource Load Statistics: Flip experimental cookie blocking setting from an enable to a disable
     4        https://bugs.webkit.org/show_bug.cgi?id=205963
     5        <rdar://problem/58424136>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        To get default on behavior, experimental features in the network process need to be
     10        turned from enable flags to disable flags. This patch does that for the experimental
     11        cookie blocking flag.
     12
     13        This change also aligns the init values of the setting to match the default.
     14
     15        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.h:
     16        * NetworkProcess/NetworkSession.h:
     17        * NetworkProcess/NetworkSessionCreationParameters.h:
     18        * Shared/WebPreferences.yaml:
     19        * UIProcess/WebProcessPool.cpp:
     20        (WebKit::WebProcessPool::ensureNetworkProcess):
     21        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     22        (WebKit::WebsiteDataStore::parameters):
     23
    1242020-01-08  Brent Fulgham  <bfulgham@apple.com>
    225

  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.h

    r253484 r254239  
    275275    bool m_debugLoggingEnabled { false };
    276276    bool m_debugModeEnabled { false };
    277     WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
     277    WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
    278278    bool m_dataRecordsBeingRemoved { false };
    279279    ShouldIncludeLocalhost m_shouldIncludeLocalhost { ShouldIncludeLocalhost::Yes };

  • trunk/Source/WebKit/NetworkProcess/NetworkSession.h

    r254087 r254239  
    154154    bool m_enableResourceLoadStatisticsLogTestingEvent;
    155155    bool m_downgradeReferrer { true };
    156     WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
     156    WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
    157157    WebCore::FirstPartyWebsiteDataRemovalMode m_firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
    158158#endif

  • trunk/Source/WebKit/NetworkProcess/NetworkSessionCreationParameters.h

    r253277 r254239  
    8787    bool shouldIncludeLocalhostInResourceLoadStatistics { true };
    8888    bool enableResourceLoadStatisticsDebugMode { false };
    89     WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction };
     89    WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
    9090    WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode { WebCore::FirstPartyWebsiteDataRemovalMode::None };
    9191    bool deviceManagementRestrictionsEnabled { false };

  • trunk/Source/WebKit/Shared/WebPreferences.yaml

    r254130 r254239  
    18321832  category: experimental
    18331833
    1834 IsThirdPartyCookieBlockingEnabled:
    1835   type: bool
    1836   defaultValue: true
    1837   humanReadableName: "Block All 3rd-Party Cookies (ITP)"
    1838   humanReadableDescription: "Block all third-party cookies when Intelligent Tracking Prevention is enabled"
     1834IsThirdPartyCookieBlockingDisabled:
     1835  type: bool
     1836  defaultValue: false
     1837  humanReadableName: "Disable Full 3rd-Party Cookie Blocking (ITP)"
     1838  humanReadableDescription: "Disable full third-party cookie blocking when Intelligent Tracking Prevention is enabled"
    18391839  category: experimental
    18401840

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r254130 r254239  
    577577    bool shouldIncludeLocalhost = true;
    578578    bool enableResourceLoadStatisticsDebugMode = false;
    579     WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
     579    WebCore::ThirdPartyCookieBlockingMode thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    580580    WebCore::FirstPartyWebsiteDataRemovalMode firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
    581581    WebCore::RegistrableDomain manualPrevalentResource { };

  • trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r253834 r254239  
    7373    bool shouldLogCookieInformation = false;
    7474    bool enableResourceLoadStatisticsDebugMode = false;
    75     auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::OnlyAccordingToPerDomainPolicy;
     75    auto thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    7676    auto firstPartyWebsiteDataRemovalMode = WebCore::FirstPartyWebsiteDataRemovalMode::None;
    7777    bool enableLegacyTLS = false;
    … …  
    8888#if ENABLE(RESOURCE_LOAD_STATISTICS)
    8989    enableResourceLoadStatisticsDebugMode = [defaults boolForKey:@"ITPDebugMode"];
    90     if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isThirdPartyCookieBlockingEnabledKey().createCFString().get()]])
     90    if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isThirdPartyCookieBlockingDisabledKey().createCFString().get()]])
     91        thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
     92    else
    9193        thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::All;
    92     else
    93         thirdPartyCookieBlockingMode = WebCore::ThirdPartyCookieBlockingMode::AllOnSitesWithoutUserInteraction;
    9494    if ([defaults boolForKey:[NSString stringWithFormat:@"Experimental%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalEnabledKey().createCFString().get()]]) {
    9595        if ([defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isFirstPartyWebsiteDataRemovalReproTestingEnabledKey().createCFString().get()]])
Note: See TracChangeset for help on using the changeset viewer.