Fix DRT assertion about mock scrollbars, which doesn't apply to iOS.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 21:48:36 +0000 (21:48 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Apr 2014 21:48:36 +0000 (21:48 +0000)
Reviewed by Tim Horton.

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
(prepareConsistentTestingEnvironment):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168044 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index 497bea9..653c4f4 100644 (file)
@@ -1,3 +1,13 @@
+2014-04-30  Simon Fraser  <simon.fraser@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  <andersca@apple.com>
 
         check-for-inappropriate-macros-in-external-headers should get the product name, not the project name
index 3b90944..d0ca47e 100644 (file)
@@ -880,7 +880,9 @@ static void resetWebPreferencesToConsistentValues()
     [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 @@ static void prepareConsistentTestingEnvironment()
     [[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];