Changeset 207144 in webkit

Timestamp:

Oct 11, 2016 9:33:30 AM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r207067.

This change caused webkitpy test failures.

Reverted changeset:

"[Win] Parallel DRTs are sharing preferences and cache."
​https://bugs.webkit.org/show_bug.cgi?id=163013
​http://trac.webkit.org/changeset/207067

Location:

trunk

Files:

• Source/WebKit/win/ChangeLog (modified) (1 diff)
• Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (modified) (1 diff)
• Source/WebKit/win/WebApplicationCache.cpp (modified) (2 diffs)
• Source/WebKit/win/WebCache.cpp (modified) (3 diffs)
• Source/WebKit/win/WebDatabaseManager.cpp (modified) (2 diffs)
• Source/WebKit/win/WebPreferences.cpp (modified) (7 diffs)
• Source/WebKit/win/WebPreferences.h (modified) (6 diffs)
• Source/WebKit/win/WebView.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/win/DumpRenderTree.cpp (modified) (2 diffs)
• Tools/Scripts/webkitpy/port/win.py (modified) (2 diffs)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2016-10-11  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r207067.
+
+        This change caused webkitpy test failures.
+
+        Reverted changeset:
+
+        "[Win] Parallel DRTs are sharing preferences and cache."
+        https://bugs.webkit.org/show_bug.cgi?id=163013
+        http://trac.webkit.org/changeset/207067
+
 2016-10-11  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl

@@ -188 +188 @@
 }
 
-[uuid(F9582D72-6348-45B1-AB09-39E33459B5B9)]
-interface IWebPreferencesPrivate4 : IWebPreferencesPrivate3
-{
-    HRESULT setApplicationId([in] BSTR applicationId);
-}

trunk/Source/WebKit/win/WebApplicationCache.cpp

@@ -29 +29 @@
 #include "CFDictionaryPropertyBag.h"
 #include "MarshallingHelpers.h"
-#include "WebPreferences.h"
 #include "WebSecurityOrigin.h"
 #include <wtf/RetainPtr.h>
@@ -70 +69 @@
 
 #if USE(CF)
-    auto cacheDirectoryPreference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, WebPreferences::applicationId()));
+    auto cacheDirectoryPreference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, kCFPreferencesCurrentApplication));
     if (cacheDirectoryPreference && CFStringGetTypeID() == CFGetTypeID(cacheDirectoryPreference.get()))
         path = static_cast<CFStringRef>(cacheDirectoryPreference.get());

trunk/Source/WebKit/win/WebCache.cpp

@@ -36 +36 @@
 #if USE(CURL)
 #include <WebCore/CurlCacheManager.h>
-#elif USE(CFNETWORK)
-#include <CFNetwork/CFURLCachePriv.h>
-#include <WebKitSystemInterface/WebKitSystemInterface.h>
-#endif
-
-using namespace WebCore;
+#endif
 
 // WebCache ---------------------------------------------------------------------------
@@ -249 +244 @@
     *location = WebCore::BString(cacheFolder).release();
     return S_OK;
-#elif USE(CFNETWORK)
-    RetainPtr<CFStringRef> cfurlCacheDirectory = adoptCF(wkCopyFoundationCacheDirectory(0));
-    *location = BString(cfurlCacheDirectory.get()).release();
-    return S_OK;
+#else
+    return E_NOTIMPL;
 #endif
 }
@@ -262 +255 @@
     WebCore::CurlCacheManager::getInstance().setCacheDirectory(cacheFolder);
     return S_OK;
-#elif USE(CFNETWORK)
-    RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
-    CFIndex memoryCapacity = CFURLCacheMemoryCapacity(cache.get());
-    CFIndex diskCapacity = CFURLCacheDiskCapacity(cache.get());
-    RetainPtr<CFURLCacheRef> newCache = adoptCF(CFURLCacheCreate(kCFAllocatorDefault, memoryCapacity, diskCapacity, String(location).createCFString().get()));
-    CFURLCacheSetSharedURLCache(newCache.get());
-    return S_OK;
-#endif
-}
+#else
+    return E_NOTIMPL;
+#endif
+}

trunk/Source/WebKit/win/WebDatabaseManager.cpp

@@ -34 +34 @@
 #include "MarshallingHelpers.h"
 #include "WebNotificationCenter.h"
-#include "WebPreferences.h"
 #include "WebSecurityOrigin.h"
 
@@ -422 +421 @@
 {
 #if USE(CF)
-    RetainPtr<CFPropertyListRef> directoryPref = adoptCF(CFPreferencesCopyAppValue(WebDatabaseDirectoryDefaultsKey, WebPreferences::applicationId()));
+    RetainPtr<CFPropertyListRef> directoryPref = adoptCF(CFPreferencesCopyAppValue(WebDatabaseDirectoryDefaultsKey, kCFPreferencesCurrentApplication));
     if (directoryPref && (CFStringGetTypeID() == CFGetTypeID(directoryPref.get())))
         return static_cast<CFStringRef>(directoryPref.get());

trunk/Source/WebKit/win/WebPreferences.cpp

@@ -102 +102 @@
 static CFDictionaryRef defaultSettings;
 
-RetainPtr<CFStringRef> WebPreferences::m_applicationId = kCFPreferencesCurrentApplication;
-
 static HashMap<WTF::String, COMPtr<WebPreferences>>& webPreferencesInstances()
 {
@@ -184 +182 @@
     if (webPreference && webPreference->m_refCount == 1)
         webPreferencesInstances().remove(identifierString);
-}
-
-CFStringRef WebPreferences::applicationId()
-{
-    return m_applicationId.get();
 }
 
@@ -314 +307 @@
         return value;
 
-    value = adoptCF(CFPreferencesCopyAppValue(key, applicationId()));
+    value = adoptCF(CFPreferencesCopyAppValue(key, kCFPreferencesCurrentApplication));
     if (value)
         return value;
@@ -325 +318 @@
     CFDictionarySetValue(m_privatePrefs.get(), key, value);
     if (m_autoSaves) {
-        CFPreferencesSetAppValue(key, value, applicationId());
+        CFPreferencesSetAppValue(key, value, kCFPreferencesCurrentApplication);
         save();
     }
@@ -456 +449 @@
 void WebPreferences::save()
 {
-    CFPreferencesAppSynchronize(applicationId());
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
 }
 
@@ -548 +541 @@
     else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate3))
         *ppvObject = static_cast<IWebPreferencesPrivate3*>(this);
-    else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate4))
-        *ppvObject = static_cast<IWebPreferencesPrivate4*>(this);
     else if (IsEqualGUID(riid, CLSID_WebPreferences))
         *ppvObject = this;
@@ -2003 +1994 @@
     return S_OK;
 }
-
-HRESULT WebPreferences::setApplicationId(BSTR applicationId)
-{
-    m_applicationId = String(applicationId).createCFString();
-    return S_OK;
-}

trunk/Source/WebKit/win/WebPreferences.h

@@ -24 +24 @@
  */
 
-#pragma once
+#ifndef WebPreferences_H
+#define WebPreferences_H
 
 #include "WebKit.h"
@@ -31 +32 @@
 #include <wtf/RetainPtr.h>
 
-class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate4 {
+class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate3 {
 public:
     static WebPreferences* createInstance();
@@ -244 +245 @@
     virtual HRESULT STDMETHODCALLTYPE setModernMediaControlsEnabled(BOOL);
 
-    // IWebPreferencesPrivate4
-    virtual HRESULT STDMETHODCALLTYPE setApplicationId(BSTR);
-
     // WebPreferences
 
@@ -259 +257 @@
     static void removeReferenceForIdentifier(BSTR identifier);
     static WebPreferences* sharedStandardPreferences();
-
-    static CFStringRef applicationId();
 
     // From WebHistory.h
@@ -268 +264 @@
     HRESULT setHistoryAgeInDaysLimit(int);
 
-    void willAddToWebView();
-    void didRemoveFromWebView();
+     void willAddToWebView();
+     void didRemoveFromWebView();
 
     HRESULT postPreferencesChangesNotification();
@@ -302 +298 @@
     bool m_automaticallyDetectsCacheModel { true };
     unsigned m_numWebViews { 0 };
-    static RetainPtr<CFStringRef> m_applicationId;
 };
+
+#endif

trunk/Source/WebKit/win/WebView.cpp

@@ -502 +502 @@
     RetainPtr<CFStringRef> cfurlCacheDirectory = adoptCF(wkCopyFoundationCacheDirectory(0));
     if (!cfurlCacheDirectory) {
-        RetainPtr<CFPropertyListRef> preference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, WebPreferences::applicationId()));
+        RetainPtr<CFPropertyListRef> preference = adoptCF(CFPreferencesCopyAppValue(WebKitLocalCacheDefaultsKey, kCFPreferencesCurrentApplication));
         if (preference && (CFStringGetTypeID() == CFGetTypeID(preference.get())))
             cfurlCacheDirectory = adoptCF(static_cast<CFStringRef>(preference.leakRef()));

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-11  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r207067.
+
+        This change caused webkitpy test failures.
+
+        Reverted changeset:
+
+        "[Win] Parallel DRTs are sharing preferences and cache."
+        https://bugs.webkit.org/show_bug.cgi?id=163013
+        http://trac.webkit.org/changeset/207067
+
 2016-10-11  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -50 +50 @@
 #include <io.h>
 #include <math.h>
-#include <shlobj.h>
 #include <shlwapi.h>
 #include <tchar.h>
@@ -861 +860 @@
 }
 
-static String applicationId()
-{
-    DWORD processId = ::GetCurrentProcessId();
-    return String::format("com.apple.DumpRenderTree.%d", processId);
-}
-
-static void setApplicationId()
-{
-    COMPtr<IWebPreferences> preferences;
-    if (SUCCEEDED(WebKitCreateInstance(CLSID_WebPreferences, 0, IID_IWebPreferences, (void**)&preferences))) {
-        COMPtr<IWebPreferencesPrivate4> prefsPrivate4(Query, preferences);
-        ASSERT(prefsPrivate4);
-        _bstr_t fileName = applicationId().charactersWithNullTermination().data();
-        prefsPrivate4->setApplicationId(fileName);
-    }
-}
-
-static void setCacheFolder()
-{
-    String libraryPath = libraryPathForDumpRenderTree();
-
-    COMPtr<IWebCache> webCache;
-    if (SUCCEEDED(WebKitCreateInstance(CLSID_WebCache, 0, IID_IWebCache, (void**)&webCache))) {
-        _bstr_t cacheFolder = WebCore::pathByAppendingComponent(libraryPath, "LocalCache").utf8().data();
-        webCache->setCacheFolder(cacheFolder);
-    }
-}
-
 // Called once on DumpRenderTree startup.
 static void setDefaultsToConsistentValuesForTesting()
 {
 #if USE(CF)
-    // Create separate preferences for each DRT instance
-    setApplicationId();
-
-    RetainPtr<CFStringRef> appId = applicationId().createCFString();
-
     String libraryPath = libraryPathForDumpRenderTree();
 
     // Set up these values before creating the WebView so that the various initializations will see these preferred values.
-    CFPreferencesSetAppValue(WebDatabaseDirectoryDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "Databases").createCFString().get(), appId.get());
-    CFPreferencesSetAppValue(WebStorageDirectoryDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "LocalStorage").createCFString().get(), appId.get());
-    CFPreferencesSetAppValue(WebKitLocalCacheDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "LocalCache").createCFString().get(), appId.get());
-
-    // Create separate cache for each DRT instance
-    setCacheFolder();
+    CFPreferencesSetAppValue(WebDatabaseDirectoryDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "Databases").createCFString().get(), kCFPreferencesCurrentApplication);
+    CFPreferencesSetAppValue(WebStorageDirectoryDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "LocalStorage").createCFString().get(), kCFPreferencesCurrentApplication);
+    CFPreferencesSetAppValue(WebKitLocalCacheDefaultsKey, WebCore::pathByAppendingComponent(libraryPath, "LocalCache").createCFString().get(), kCFPreferencesCurrentApplication);
 #endif
 }

trunk/Tools/Scripts/webkitpy/port/win.py

@@ -29 +29 @@
 
 import atexit
-import glob
+import os
 import logging
-import os
 import re
 import sys
@@ -353 +352 @@
         self.prevent_error_dialogs()
         self.delete_sem_locks()
-
-        preferences_files = self._filesystem.join(os.environ['APPDATA'], "Apple Computer/Preferences", "com.apple.DumpRenderTree*")
-        filelist = glob.glob(preferences_files)
-        for file in filelist:
-            self._filesystem.remove(file)
-
         super(WinPort, self).setup_test_run(device_class)