Title: [91794] trunk/Tools
- Revision
- 91794
- Author
- [email protected]
- Date
- 2011-07-26 15:23:16 -0700 (Tue, 26 Jul 2011)
Log Message
Rubber-stamped by Anders Carlsson.
Update DumpRenderTree and API tests for the pictograph font family preference.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
(TestWebKitAPI::TEST):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91793 => 91794)
--- trunk/Tools/ChangeLog 2011-07-26 22:08:28 UTC (rev 91793)
+++ trunk/Tools/ChangeLog 2011-07-26 22:23:16 UTC (rev 91794)
@@ -1,3 +1,18 @@
+2011-07-26 Dan Bernstein <[email protected]>
+
+ Rubber-stamped by Anders Carlsson.
+
+ Update DumpRenderTree and API tests for the pictograph font family preference.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+ (TestWebKitAPI::TEST):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+
2011-07-26 Dimitri Glazkov <[email protected]>
Replace SpecificityCalculator with TestConfiguration-driven logic.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (91793 => 91794)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-07-26 22:08:28 UTC (rev 91793)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-07-26 22:23:16 UTC (rev 91794)
@@ -434,6 +434,7 @@
[preferences setSansSerifFontFamily:@"Helvetica"];
[preferences setCursiveFontFamily:@"Apple Chancery"];
[preferences setFantasyFontFamily:@"Papyrus"];
+ [preferences setPictographFontFamily:@"Apple Color Emoji"];
[preferences setDefaultFontSize:16];
[preferences setDefaultFixedFontSize:13];
[preferences setMinimumFontSize:0];
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (91793 => 91794)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2011-07-26 22:08:28 UTC (rev 91793)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2011-07-26 22:23:16 UTC (rev 91794)
@@ -821,12 +821,14 @@
static BSTR sansSerifFamily = SysAllocString(TEXT("Helvetica"));
static BSTR cursiveFamily = SysAllocString(TEXT("Apple Chancery"));
static BSTR fantasyFamily = SysAllocString(TEXT("Papyrus"));
+ static BSTR pictographFamily = SysAllocString(TEXT("Apple Color Emoji"));
#else
static BSTR standardFamily = SysAllocString(TEXT("Times New Roman"));
static BSTR fixedFamily = SysAllocString(TEXT("Courier New"));
static BSTR sansSerifFamily = SysAllocString(TEXT("Arial"));
static BSTR cursiveFamily = SysAllocString(TEXT("Comic Sans MS")); // Not actually cursive, but it's what IE and Firefox use.
static BSTR fantasyFamily = SysAllocString(TEXT("Times New Roman"));
+ static BSTR pictographFamily = SysAllocString(TEXT("Times New Roman"));
#endif
preferences->setStandardFontFamily(standardFamily);
@@ -835,6 +837,7 @@
preferences->setSansSerifFontFamily(sansSerifFamily);
preferences->setCursiveFontFamily(cursiveFamily);
preferences->setFantasyFontFamily(fantasyFamily);
+ preferences->setPictographFontFamily(pictographFamily);
preferences->setAutosaves(FALSE);
preferences->setDefaultFontSize(16);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (91793 => 91794)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2011-07-26 22:08:28 UTC (rev 91793)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp 2011-07-26 22:23:16 UTC (rev 91794)
@@ -52,6 +52,7 @@
static const char* expectedSansSerifFontFamily = "Arial";
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* expectedStandardFontFamily = "Times";
static const char* expectedFixedFontFamily = "Courier";
@@ -59,6 +60,7 @@
static const char* expectedSansSerifFontFamily = "Helvetica";
static const char* expectedCursiveFontFamily = "Apple Chancery";
static const char* expectedFantasyFontFamily = "Papyrus";
+ static const char* expectedPictographFontFamily = "Apple Color Emoji";
#endif
WKPreferencesRef preference = WKPreferencesCreate();
@@ -79,6 +81,7 @@
EXPECT_WK_STREQ(expectedSansSerifFontFamily, adoptWK(WKPreferencesCopySansSerifFontFamily(preference)));
EXPECT_WK_STREQ(expectedCursiveFontFamily, adoptWK(WKPreferencesCopyCursiveFontFamily(preference)));
EXPECT_WK_STREQ(expectedFantasyFontFamily, adoptWK(WKPreferencesCopyFantasyFontFamily(preference)));
+ EXPECT_WK_STREQ(expectedPictographFontFamily, adoptWK(WKPreferencesCopyPictographFontFamily(preference)));
EXPECT_EQ(0u, WKPreferencesGetMinimumFontSize(preference));
EXPECT_FALSE(WKPreferencesGetPrivateBrowsingEnabled(preference));
EXPECT_FALSE(WKPreferencesGetDeveloperExtrasEnabled(preference));
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (91793 => 91794)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2011-07-26 22:08:28 UTC (rev 91793)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2011-07-26 22:23:16 UTC (rev 91794)
@@ -390,6 +390,7 @@
static WKStringRef cursiveFontFamily = WKStringCreateWithUTF8CString("Apple Chancery");
static WKStringRef fantasyFontFamily = WKStringCreateWithUTF8CString("Papyrus");
static WKStringRef fixedFontFamily = WKStringCreateWithUTF8CString("Courier");
+ static WKStringRef pictographFontFamily = WKStringCreateWithUTF8CString("Apple Color Emoji");
static WKStringRef sansSerifFontFamily = WKStringCreateWithUTF8CString("Helvetica");
static WKStringRef serifFontFamily = WKStringCreateWithUTF8CString("Times");
@@ -397,6 +398,7 @@
WKPreferencesSetCursiveFontFamily(preferences, cursiveFontFamily);
WKPreferencesSetFantasyFontFamily(preferences, fantasyFontFamily);
WKPreferencesSetFixedFontFamily(preferences, fixedFontFamily);
+ WKPreferencesSetPictographFontFamily(preferences, pictographFontFamily);
WKPreferencesSetSansSerifFontFamily(preferences, sansSerifFontFamily);
WKPreferencesSetSerifFontFamily(preferences, serifFontFamily);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
