Title: [168044] trunk/Tools
- Revision
- 168044
- Author
- simon.fra...@apple.com
- Date
- 2014-04-30 14:48:36 -0700 (Wed, 30 Apr 2014)
Log Message
Fix DRT assertion about mock scrollbars, which doesn't apply to iOS.
Reviewed by Tim Horton.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
(prepareConsistentTestingEnvironment):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (168043 => 168044)
--- trunk/Tools/ChangeLog 2014-04-30 21:27:50 UTC (rev 168043)
+++ trunk/Tools/ChangeLog 2014-04-30 21:48:36 UTC (rev 168044)
@@ -1,3 +1,13 @@
+2014-04-30 Simon Fraser <simon.fra...@apple.com>
+
+ Fix DRT assertion about mock scrollbars, which doesn't apply to iOS.
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ (prepareConsistentTestingEnvironment):
+
2014-04-30 Anders Carlsson <ander...@apple.com>
check-for-inappropriate-macros-in-external-headers should get the product name, not the project name
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (168043 => 168044)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-04-30 21:27:50 UTC (rev 168043)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-04-30 21:48:36 UTC (rev 168044)
@@ -880,7 +880,9 @@
[preferences setCSSGridLayoutEnabled:NO];
[preferences setUsePreHTML5ParserQuirks:NO];
[preferences setAsynchronousSpellCheckingEnabled:NO];
+#if !PLATFORM(IOS)
ASSERT([preferences mockScrollbarsEnabled]);
+#endif
#if ENABLE(WEB_AUDIO)
[preferences setWebAudioEnabled:YES];
@@ -1084,7 +1086,6 @@
[[WebPreferences standardPreferences] setAutosaves:NO];
#if !PLATFORM(IOS)
-
// FIXME: We'd like to start with a clean state for every test, but this function can't be used more than once yet.
[WebPreferences _switchNetworkLoaderToNewTestingSession];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
