Changeset 220709 in webkit


Ignore:
Timestamp:
Aug 14, 2017 10:56:47 AM (7 years ago)
Author:
timothy_horton@apple.com
Message:

Only create directory and sandbox extension handle for storage directories if they are set
https://bugs.webkit.org/show_bug.cgi?id=175522

Reviewed by Brady Eidson.

Source/WebKit:

  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
If using a non-persistent WebsiteDataStore, all the storage directories
are unset, but we still try to create them and make sandbox extensions
for them. This has no effect except a ton of noisy logging, but that
is reason enough to stop.

This is similar to r216053, but for more directories.

Tools:

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewDoesNotLogDuringInitialization.mm: Added.

(TEST):
Add a test that making a WKWebView with an ephemeral WKWebsiteDataStore
doesn't log anything to stderr.

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r220700 r220709  
     12017-08-14  Tim Horton  <timothy_horton@apple.com>
     2
     3        Only create directory and sandbox extension handle for storage directories if they are set
     4        https://bugs.webkit.org/show_bug.cgi?id=175522
     5
     6        Reviewed by Brady Eidson.
     7
     8        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     9        (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
     10        If using a non-persistent WebsiteDataStore, all the storage directories
     11        are unset, but we still try to create them and make sandbox extensions
     12        for them. This has no effect except a ton of noisy logging, but that
     13        is reason enough to stop.
     14
     15        This is similar to r216053, but for more directories.
     16
    1172017-08-14  Zan Dobersek  <zdobersek@igalia.com>
    218
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r220538 r220709  
    114114
    115115    // Resolve directory paths.
    116     m_resolvedConfiguration.applicationCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.applicationCacheDirectory);
    117     m_resolvedConfiguration.mediaCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaCacheDirectory);
    118     m_resolvedConfiguration.mediaKeysStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaKeysStorageDirectory);
    119     m_resolvedConfiguration.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.webSQLDatabaseDirectory);
     116    if (!m_configuration.applicationCacheDirectory.isEmpty())
     117        m_resolvedConfiguration.applicationCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.applicationCacheDirectory);
     118    if (!m_configuration.mediaCacheDirectory.isEmpty())
     119        m_resolvedConfiguration.mediaCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaCacheDirectory);
     120    if (!m_configuration.mediaKeysStorageDirectory.isEmpty())
     121        m_resolvedConfiguration.mediaKeysStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaKeysStorageDirectory);
     122    if (!m_configuration.webSQLDatabaseDirectory.isEmpty())
     123        m_resolvedConfiguration.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.webSQLDatabaseDirectory);
    120124
    121125    if (!m_configuration.indexedDBDatabaseDirectory.isEmpty())
  • trunk/Tools/ChangeLog

    r220708 r220709  
     12017-08-14  Tim Horton  <timothy_horton@apple.com>
     2
     3        Only create directory and sandbox extension handle for storage directories if they are set
     4        https://bugs.webkit.org/show_bug.cgi?id=175522
     5
     6        Reviewed by Brady Eidson.
     7
     8        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
     9        * TestWebKitAPI/Tests/WebKit2Cocoa/WKWebViewDoesNotLogDuringInitialization.mm: Added.
     10        (TEST):
     11        Add a test that making a WKWebView with an ephemeral WKWebsiteDataStore
     12        doesn't log anything to stderr.
     13
    1142017-08-14  Jonathan Bedard  <jbedard@apple.com>
    215
  • trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r220562 r220709  
    7272                2D838B1F1EEF3A5C009B980E /* WKContentViewEditingActions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D838B1E1EEF3A5B009B980E /* WKContentViewEditingActions.mm */; };
    7373                2DB0232F1E4E871800707123 /* InteractionDeadlockAfterCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DB0232E1E4E871800707123 /* InteractionDeadlockAfterCrash.mm */; };
     74                2DB647881F4163D60051A89E /* WKWebViewDoesNotLogDuringInitialization.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DB647871F4161F70051A89E /* WKWebViewDoesNotLogDuringInitialization.mm */; };
    7475                2DC4CF771D2D9DD800ECCC94 /* DataDetection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC4CF761D2D9DD800ECCC94 /* DataDetection.mm */; };
    7576                2DC60E231E79F88C00FA6C7D /* DoAfterNextPresentationUpdateAfterCrash.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DC60E221E79F88C00FA6C7D /* DoAfterNextPresentationUpdateAfterCrash.mm */; };
     
    10851086                2D9A53AE1B31FA8D0074D5AA /* ShrinkToFit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ShrinkToFit.mm; sourceTree = "<group>"; };
    10861087                2DB0232E1E4E871800707123 /* InteractionDeadlockAfterCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InteractionDeadlockAfterCrash.mm; sourceTree = "<group>"; };
     1088                2DB647871F4161F70051A89E /* WKWebViewDoesNotLogDuringInitialization.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewDoesNotLogDuringInitialization.mm; sourceTree = "<group>"; };
    10871089                2DC4CF761D2D9DD800ECCC94 /* DataDetection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataDetection.mm; sourceTree = "<group>"; };
    10881090                2DC60E221E79F88C00FA6C7D /* DoAfterNextPresentationUpdateAfterCrash.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DoAfterNextPresentationUpdateAfterCrash.mm; sourceTree = "<group>"; };
     
    19621964                                7C417F311D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm */,
    19631965                                46E66A8F1F0D75590026D83C /* WKWebViewDiagnosticLogging.mm */,
     1966                                2DB647871F4161F70051A89E /* WKWebViewDoesNotLogDuringInitialization.mm */,
    19641967                                0F3B94A51A77266C00DE3272 /* WKWebViewEvaluateJavaScript.mm */,
    19651968                                D3BE5E341E4CE85E00FD563A /* WKWebViewGetContents.mm */,
     
    33573360                                7C417F331D19E14800B8EF53 /* WKWebViewDefaultNavigationDelegate.mm in Sources */,
    33583361                                46E66A901F0D75590026D83C /* WKWebViewDiagnosticLogging.mm in Sources */,
     3362                                2DB647881F4163D60051A89E /* WKWebViewDoesNotLogDuringInitialization.mm in Sources */,
    33593363                                0F3B94A71A77267400DE3272 /* WKWebViewEvaluateJavaScript.mm in Sources */,
    33603364                                D34E08761E4E42E1005FF14A /* WKWebViewGetContents.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.