Title: [176917] trunk/Tools
- Revision
- 176917
- Author
- [email protected]
- Date
- 2014-12-06 15:52:33 -0800 (Sat, 06 Dec 2014)
Log Message
[Mac] DumpRenderTree sets storage directory incorrectly
https://bugs.webkit.org/show_bug.cgi?id=139347
Reviewed by Dan Bernstein.
* DumpRenderTree/mac/DumpRenderTree.mm: (setDefaultsToConsistentValuesForTesting):
Don't use user defaults to pass per-instance paths, as user defaults are shared
across all instances.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (176916 => 176917)
--- trunk/Tools/ChangeLog 2014-12-06 23:35:06 UTC (rev 176916)
+++ trunk/Tools/ChangeLog 2014-12-06 23:52:33 UTC (rev 176917)
@@ -1,3 +1,14 @@
+2014-12-06 Alexey Proskuryakov <[email protected]>
+
+ [Mac] DumpRenderTree sets storage directory incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=139347
+
+ Reviewed by Dan Bernstein.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm: (setDefaultsToConsistentValuesForTesting):
+ Don't use user defaults to pass per-instance paths, as user defaults are shared
+ across all instances.
+
2014-12-05 Chris Fleizach <[email protected]>
AX: I cannot activate links on the mobile version of news.google.com
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (176916 => 176917)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-12-06 23:35:06 UTC (rev 176916)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-12-06 23:52:33 UTC (rev 176917)
@@ -792,9 +792,6 @@
static NSString *libraryPathForDumpRenderTree()
{
- //FIXME: This may not be sufficient to prevent interactions/crashes
- //when running more than one copy of DumpRenderTree.
- //See https://bugs.webkit.org/show_bug.cgi?id=10906
char* dumpRenderTreeTemp = getenv("DUMPRENDERTREE_TEMP");
if (dumpRenderTreeTemp)
return [[NSFileManager defaultManager] stringWithFileSystemRepresentation:dumpRenderTreeTemp length:strlen(dumpRenderTreeTemp)];
@@ -944,12 +941,17 @@
@"NSOverlayScrollersEnabled": @NO,
@"AppleShowScrollBars": @"Always",
@"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
+ };
+
+ [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
+
+ NSDictionary *processInstanceDefaults = @{
WebDatabaseDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"Databases"],
WebStorageDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"]
};
- [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
+ [[NSUserDefaults standardUserDefaults] setVolatileDomain:processInstanceDefaults forName:NSArgumentDomain];
}
static void runThread(void* arg)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
