Changeset 177908 in webkit

Timestamp:

Jan 5, 2015, 5:07:59 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][GTK] WKPreferencesDefaults test failed after r177506
​https://bugs.webkit.org/show_bug.cgi?id=140077

Patch by Hunseop Jeong <Hunseop Jeong> on 2015-01-05
Reviewed by Csaba Osztrogonác.

WebKit C SPI is available on EFL,GTK.
Changed the define order to pass the API test.

• TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:

(TestWebKitAPI::TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-01-05  Hunseop Jeong  <hs85.jeong@samsung.com>
+
+        [EFL][GTK] WKPreferencesDefaults test failed after r177506 
+        https://bugs.webkit.org/show_bug.cgi?id=140077
+
+        Reviewed by Csaba Osztrogonác.
+
+        WebKit C SPI is available on EFL,GTK.
+        Changed the define order to pass the API test.
+
+        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+        (TestWebKitAPI::TEST):
+
 2015-01-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp

@@ -45 +45 @@
 TEST(WebKit2, WKPreferencesDefaults)
 {
-#if WK_HAVE_C_SPI
+#if PLATFORM(GTK) || PLATFORM(EFL)
+    static const char* expectedStandardFontFamily = "Times";
+    static const char* expectedFixedFontFamily = "Courier New";
+    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";
+#elif WK_HAVE_C_SPI
     static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier";
@@ -61 +69 @@
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "AppleColorEmoji";
-#elif PLATFORM(GTK) || PLATFORM(EFL)
-    static const char* expectedStandardFontFamily = "Times";
-    static const char* expectedFixedFontFamily = "Courier New";
-    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";
 #endif