From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 7 Dec 2010 17:22:45 -0800 Subject: Merge WebKit at r73109: Initial merge by git. Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8 --- .../WebKit2/DocumentStartUserScriptAlertCrash.cpp | 6 +- .../DocumentStartUserScriptAlertCrash_Bundle.cpp | 14 +++- .../TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp | 98 ++++++++++++++++++++++ 3 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (limited to 'WebKitTools/TestWebKitAPI/Tests') diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp index 5e0655e..b935b6f 100644 --- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp @@ -45,9 +45,11 @@ static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef TEST(WebKit2, DocumentStartUserScriptAlertCrashTest) { - WKRetainPtr context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest")); + WKRetainPtr pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(WKStringCreateWithUTF8CString("DocumentStartUserScriptAlertCrashTestPageGroup"))); + + WKRetainPtr context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest", pageGroup.get())); WKRetainPtr pageNamespace(AdoptWK, WKPageNamespaceCreate(context.get())); - PlatformWebView webView(pageNamespace.get()); + PlatformWebView webView(pageNamespace.get(), pageGroup.get()); WKPageUIClient uiClient; memset(&uiClient, 0, sizeof(uiClient)); diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp index a96bef2..dbd5d21 100644 --- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash_Bundle.cpp @@ -24,10 +24,12 @@ */ #include "InjectedBundleTest.h" -#include +#include #include #include #include +#include +#include namespace TestWebKitAPI { @@ -38,11 +40,17 @@ public: { } - virtual void initialize(WKBundleRef bundle) + virtual void initialize(WKBundleRef bundle, WKTypeRef userData) { + assert(WKGetTypeID(userData) == WKBundlePageGroupGetTypeID()); + WKBundlePageGroupRef pageGroup = static_cast(userData); + WKRetainPtr source(AdoptWK, WKStringCreateWithUTF8CString("alert('an alert');")); - WKBundleAddUserScript(bundle, WKBundleScriptWorldNormalWorld(), source.get(), 0, 0, 0, kWKInjectAtDocumentStart, kWKInjectInAllFrames); + WKBundleAddUserScript(bundle, pageGroup, WKBundleScriptWorldNormalWorld(), source.get(), 0, 0, 0, kWKInjectAtDocumentStart, kWKInjectInAllFrames); } + +private: + WKBundlePageGroupRef m_pageGroup; }; static InjectedBundleTest::Register registrar("DocumentStartUserScriptAlertCrashTest"); diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp new file mode 100644 index 0000000..d4cd4b7 --- /dev/null +++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2010 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "Test.h" + +#include +#include +#include +#include +#include + +namespace TestWebKitAPI { + +TEST(WebKit2, WKPreferencesBasic) +{ + WKPreferencesRef preference = WKPreferencesCreate(); + + TEST_ASSERT(WKGetTypeID(preference) == WKPreferencesGetTypeID()); + + WKRelease(preference); +} + +TEST(WebKit2, WKPreferencesDefaults) +{ +#if PLATFORM(WIN) + static const char* expectedStandardFontFamily = "Times New Roman"; + static const char* expectedFixedFontFamily = "Courier New"; + static const char* expectedSerifFontFamily = "Times New Roman"; + static const char* expectedSansSerifFontFamily = "Arial"; + static const char* expectedCursiveFontFamily = "Comic Sans MS"; + static const char* expectedFantasyFontFamily = "Comic Sans MS"; +#elif PLATFORM(MAC) + static const char* expectedStandardFontFamily = "Times"; + static const char* expectedFixedFontFamily = "Courier"; + static const char* expectedSerifFontFamily = "Times"; + static const char* expectedSansSerifFontFamily = "Helvetica"; + static const char* expectedCursiveFontFamily = "Apple Chancery"; + static const char* expectedFantasyFontFamily = "Papyrus"; +#endif + + WKPreferencesRef preference = WKPreferencesCreate(); + + TEST_ASSERT(WKPreferencesGetJavaScriptEnabled(preference) == true); + TEST_ASSERT(WKPreferencesGetLoadsImagesAutomatically(preference) == true); + TEST_ASSERT(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference) == false); + TEST_ASSERT(WKPreferencesGetLocalStorageEnabled(preference) == true); + TEST_ASSERT(WKPreferencesGetXSSAuditorEnabled(preference) == true); + TEST_ASSERT(WKPreferencesGetFrameFlatteningEnabled(preference) == false); + TEST_ASSERT(WKPreferencesGetPluginsEnabled(preference) == true); + TEST_ASSERT(WKPreferencesGetJavaEnabled(preference) == true); + WKRetainPtr standardFontFamily(AdoptWK, WKPreferencesCopyStandardFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(standardFontFamily.get(), expectedStandardFontFamily)); + WKRetainPtr fixedFontFamily(AdoptWK, WKPreferencesCopyFixedFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(fixedFontFamily.get(), expectedFixedFontFamily)); + WKRetainPtr serifFontFamily(AdoptWK, WKPreferencesCopySerifFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(serifFontFamily.get(), expectedSerifFontFamily)); + WKRetainPtr sansSerifFontFamily(AdoptWK, WKPreferencesCopySansSerifFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(sansSerifFontFamily.get(), expectedSansSerifFontFamily)); + WKRetainPtr cursiveFontFamily(AdoptWK, WKPreferencesCopyCursiveFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(cursiveFontFamily.get(), expectedCursiveFontFamily)); + WKRetainPtr fantasyFontFamily(AdoptWK, WKPreferencesCopyFantasyFontFamily(preference)); + TEST_ASSERT(WKStringIsEqualToUTF8CString(fantasyFontFamily.get(), expectedFantasyFontFamily)); + TEST_ASSERT(WKPreferencesGetMinimumFontSize(preference) == 0); + TEST_ASSERT(WKPreferencesGetPrivateBrowsingEnabled(preference) == false); + TEST_ASSERT(WKPreferencesGetDeveloperExtrasEnabled(preference) == false); + TEST_ASSERT(WKPreferencesGetTextAreasAreResizable(preference) == true); + TEST_ASSERT(WKPreferencesGetFontSmoothingLevel(preference) == kWKFontSmoothingLevelMedium); + TEST_ASSERT(WKPreferencesGetAcceleratedCompositingEnabled(preference) == true); + TEST_ASSERT(WKPreferencesGetCompositingBordersVisible(preference) == false); + TEST_ASSERT(WKPreferencesGetCompositingRepaintCountersVisible(preference) == false); + TEST_ASSERT(WKPreferencesGetNeedsSiteSpecificQuirks(preference) == false); + + WKRelease(preference); +} + +} // namespace TestWebKitAPI -- cgit v1.1