From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 .../TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp  | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp')

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
index 976e7041b..7f8616f5d 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp
@@ -24,9 +24,12 @@
  */
 
 #include "config.h"
+
+#if WK_HAVE_C_SPI
+
 #include "PlatformUtilities.h"
-#include <WebKit2/WKPreferencesPrivate.h>
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKPreferencesRefPrivate.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
@@ -41,15 +44,15 @@ TEST(WebKit2, WKPreferencesBasic)
 
 TEST(WebKit2, WKPreferencesDefaults)
 {
-#if PLATFORM(WIN)
-    static const char* expectedStandardFontFamily = "Times New Roman";
+#if PLATFORM(GTK) || PLATFORM(EFL)
+    static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier New";
-    static const char* expectedSerifFontFamily = "Times New Roman";
-    static const char* expectedSansSerifFontFamily = "Arial";
+    static const char* expectedSerifFontFamily = "Times";
+    static const char* expectedSansSerifFontFamily = "Helvetica";
     static const char* expectedCursiveFontFamily = "Comic Sans MS";
-    static const char* expectedFantasyFontFamily = "Comic Sans MS";
-    static const char* expectedPictographFontFamily = "Times New Roman";
-#elif PLATFORM(MAC)
+    static const char* expectedFantasyFontFamily = "Impact";
+    static const char* expectedPictographFontFamily = "Times";
+#elif WK_HAVE_C_SPI
     static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier";
     static const char* expectedSerifFontFamily = "Times";
@@ -57,21 +60,21 @@ TEST(WebKit2, WKPreferencesDefaults)
     static const char* expectedCursiveFontFamily = "Apple Chancery";
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "Apple Color Emoji";
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(IOS)
     static const char* expectedStandardFontFamily = "Times";
-    static const char* expectedFixedFontFamily = "Courier New";
+    static const char* expectedFixedFontFamily = "Courier";
     static const char* expectedSerifFontFamily = "Times";
     static const char* expectedSansSerifFontFamily = "Helvetica";
-    static const char* expectedCursiveFontFamily = "Comic Sans MS";
-    static const char* expectedFantasyFontFamily = "Impact";
-    static const char* expectedPictographFontFamily = "Times";
+    static const char* expectedCursiveFontFamily = "Snell Roundhand";
+    static const char* expectedFantasyFontFamily = "Papyrus";
+    static const char* expectedPictographFontFamily = "AppleColorEmoji";
 #endif
 
     WKPreferencesRef preference = WKPreferencesCreate();
 
     EXPECT_TRUE(WKPreferencesGetJavaScriptEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLoadsImagesAutomatically(preference));
-    EXPECT_FALSE(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
+    EXPECT_TRUE(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLocalStorageEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetXSSAuditorEnabled(preference));
     EXPECT_FALSE(WKPreferencesGetFrameFlatteningEnabled(preference));
@@ -91,11 +94,7 @@ TEST(WebKit2, WKPreferencesDefaults)
     EXPECT_FALSE(WKPreferencesGetDeveloperExtrasEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetTextAreasAreResizable(preference));
 
-#if PLATFORM(WIN)
-    EXPECT_EQ(kWKFontSmoothingLevelWindows, WKPreferencesGetFontSmoothingLevel(preference));
-#else
     EXPECT_EQ(kWKFontSmoothingLevelMedium, WKPreferencesGetFontSmoothingLevel(preference));
-#endif
 
     EXPECT_TRUE(WKPreferencesGetAcceleratedCompositingEnabled(preference));
     EXPECT_FALSE(WKPreferencesGetCompositingBordersVisible(preference));
@@ -122,3 +121,5 @@ TEST(WebKit2, WKPreferencesCopying)
 }
 
 } // namespace TestWebKitAPI
+
+#endif
-- 
cgit v1.2.1