Diff
Modified: trunk/Source/WebKit2/ChangeLog (125977 => 125978)
--- trunk/Source/WebKit2/ChangeLog 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-19 18:34:24 UTC (rev 125978)
@@ -1,3 +1,26 @@
+2012-08-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r125972.
+ http://trac.webkit.org/changeset/125972
+ https://bugs.webkit.org/show_bug.cgi?id=94431
+
+ Breaks AppleMac builds (Requested by pfeldman on #webkit).
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ * UIProcess/API/gtk/WebKitWebContext.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+ * UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:
+ (beforeAll):
+ (afterAll):
+ * UIProcess/API/gtk/tests/WebViewTest.cpp:
+ (WebViewTest::WebViewTest):
+ * UIProcess/API/gtk/tests/WebViewTest.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::userPreferredLanguagesChanged):
+ * WebProcess/gtk/WebProcessGtk.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ (WebKit::WebProcess::platformTerminate):
+
2012-08-19 Christophe Dumez <[email protected]>
[EFL][WK2] Add API unit tests for Web Intents
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2012-08-19 18:34:24 UTC (rev 125978)
@@ -32,7 +32,6 @@
#include "WebKitURISchemeRequestPrivate.h"
#include "WebKitWebContextPrivate.h"
#include <WebCore/FileSystem.h>
-#include <WebCore/Language.h>
#include <wtf/HashMap.h>
#include <wtf/OwnPtr.h>
#include <wtf/gobject/GOwnPtr.h>
@@ -519,31 +518,6 @@
#endif
}
-/**
- * webkit_web_context_set_preferred_languages:
- * @context: a #WebKitWebContext
- * @languages: (element-type utf8): a #GList of language identifiers
- *
- * Set the list of preferred languages, sorted from most desirable
- * to least desirable. The list will be used to build the "Accept-Language"
- * header that will be included in the network requests started by
- * the #WebKitWebContext.
- */
-void webkit_web_context_set_preferred_languages(WebKitWebContext* context, GList* languageList)
-{
- g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
-
- if (!languageList)
- return;
-
- Vector<String> languages;
- for (GList* iter = languageList; iter; iter = g_list_next(iter))
- languages.append(String::fromUTF8(static_cast<char*>(iter->data)).lower().replace("_", "-"));
-
- WebCore::overrideUserPreferredLanguages(languages);
- WebCore::languageDidChange();
-}
-
WebKitDownload* webkitWebContextGetOrCreateDownload(WKDownloadRef wkDownload)
{
GRefPtr<WebKitDownload> download = downloadsMap().get(wkDownload);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h 2012-08-19 18:34:24 UTC (rev 125978)
@@ -146,10 +146,6 @@
webkit_web_context_set_spell_checking_languages (WebKitWebContext *context,
const gchar *languages);
-WEBKIT_API void
-webkit_web_context_set_preferred_languages (WebKitWebContext *context,
- GList *languages);
-
G_END_DECLS
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2012-08-19 18:34:24 UTC (rev 125978)
@@ -37,7 +37,6 @@
webkit_web_context_set_spell_checking_enabled
webkit_web_context_get_spell_checking_languages
webkit_web_context_set_spell_checking_languages
-webkit_web_context_set_preferred_languages
<SUBSECTION URI Scheme>
WebKitURISchemeRequestCallback
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp 2012-08-19 18:34:24 UTC (rev 125978)
@@ -20,7 +20,6 @@
#include "config.h"
#include "LoadTrackingTest.h"
-#include "WebKitTestServer.h"
#include <gtk/gtk.h>
#include <webkit2/webkit2.h>
#include <wtf/HashMap.h>
@@ -28,8 +27,6 @@
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/StringHash.h>
-static WebKitTestServer* kServer;
-
static void testWebContextDefault(Test* test, gconstpointer)
{
// Check there's a single instance of the default web context.
@@ -168,6 +165,35 @@
webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this);
}
+ static void resourceGetDataCallback(GObject* object, GAsyncResult* result, gpointer userData)
+ {
+ size_t dataSize;
+ GOwnPtr<GError> error;
+ unsigned char* data = "" result, &dataSize, &error.outPtr());
+ g_assert(data);
+
+ URISchemeTest* test = static_cast<URISchemeTest*>(userData);
+ test->m_resourceData.set(reinterpret_cast<char*>(data));
+ test->m_resourceDataSize = dataSize;
+ g_main_loop_quit(test->m_mainLoop);
+ }
+
+ const char* mainResourceData(size_t& mainResourceDataSize)
+ {
+ m_resourceDataSize = 0;
+ m_resourceData.clear();
+ WebKitWebResource* resource = webkit_web_view_get_main_resource(m_webView);
+ g_assert(resource);
+
+ webkit_web_resource_get_data(resource, 0, resourceGetDataCallback, this);
+ g_main_loop_run(m_mainLoop);
+
+ mainResourceDataSize = m_resourceDataSize;
+ return m_resourceData.get();
+ }
+
+ GOwnPtr<char> m_resourceData;
+ size_t m_resourceDataSize;
GRefPtr<WebKitURISchemeRequest> m_uriSchemeRequest;
HashMap<String, URISchemeHandler> m_handlersMap;
};
@@ -240,57 +266,14 @@
g_assert(webkit_web_context_get_spell_checking_enabled(webContext));
}
-static void testWebContextLanguages(WebViewTest* test, gconstpointer)
-{
- static const char* expectedDefaultLanguage = "en";
- test->loadURI(kServer->getURIForPath("/").data());
- test->waitUntilLoadFinished();
- size_t mainResourceDataSize = 0;
- const char* mainResourceData = test->mainResourceData(mainResourceDataSize);
- g_assert_cmpuint(mainResourceDataSize, ==, strlen(expectedDefaultLanguage));
- g_assert(!strncmp(mainResourceData, expectedDefaultLanguage, mainResourceDataSize));
-
- GList* languages = g_list_prepend(0, const_cast<gpointer>(static_cast<const void*>("dE")));
- languages = g_list_prepend(languages, const_cast<gpointer>(static_cast<const void*>("ES_es")));
- languages = g_list_prepend(languages, const_cast<gpointer>(static_cast<const void*>("en")));
- webkit_web_context_set_preferred_languages(webkit_web_context_get_default(), languages);
- g_list_free(languages);
-
- static const char* expectedLanguages = "en, es-es;q=0.90, de;q=0.80";
- test->loadURI(kServer->getURIForPath("/").data());
- test->waitUntilLoadFinished();
- mainResourceDataSize = 0;
- mainResourceData = test->mainResourceData(mainResourceDataSize);
- g_assert_cmpuint(mainResourceDataSize, ==, strlen(expectedLanguages));
- g_assert(!strncmp(mainResourceData, expectedLanguages, mainResourceDataSize));
-}
-
-static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
-{
- if (message->method != SOUP_METHOD_GET) {
- soup_message_set_status(message, SOUP_STATUS_NOT_IMPLEMENTED);
- return;
- }
-
- soup_message_set_status(message, SOUP_STATUS_OK);
- const char* acceptLanguage = soup_message_headers_get_one(message->request_headers, "Accept-Language");
- soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, acceptLanguage, strlen(acceptLanguage));
- soup_message_body_complete(message->response_body);
-}
-
void beforeAll()
{
- kServer = new WebKitTestServer();
- kServer->run(serverCallback);
-
Test::add("WebKitWebContext", "default-context", testWebContextDefault);
PluginsTest::add("WebKitWebContext", "get-plugins", testWebContextGetPlugins);
URISchemeTest::add("WebKitWebContext", "uri-scheme", testWebContextURIScheme);
Test::add("WebKitWebContext", "spell-checker", testWebContextSpellChecker);
- WebViewTest::add("WebKitWebContext", "languages", testWebContextLanguages);
}
void afterAll()
{
- delete kServer;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.cpp 2012-08-19 18:34:24 UTC (rev 125978)
@@ -29,7 +29,6 @@
, m_mainLoop(g_main_loop_new(0, TRUE))
, m_parentWindow(0)
, m_javascriptResult(0)
- , m_resourceDataSize(0)
{
assertObjectIsDeletedWhenTestFinishes(G_OBJECT(m_webView));
}
@@ -198,33 +197,6 @@
gtk_widget_size_allocate(GTK_WIDGET(m_webView), &allocation);
}
-static void resourceGetDataCallback(GObject* object, GAsyncResult* result, gpointer userData)
-{
- size_t dataSize;
- GOwnPtr<GError> error;
- unsigned char* data = "" result, &dataSize, &error.outPtr());
- g_assert(data);
-
- WebViewTest* test = static_cast<WebViewTest*>(userData);
- test->m_resourceData.set(reinterpret_cast<char*>(data));
- test->m_resourceDataSize = dataSize;
- g_main_loop_quit(test->m_mainLoop);
-}
-
-const char* WebViewTest::mainResourceData(size_t& mainResourceDataSize)
-{
- m_resourceDataSize = 0;
- m_resourceData.clear();
- WebKitWebResource* resource = webkit_web_view_get_main_resource(m_webView);
- g_assert(resource);
-
- webkit_web_resource_get_data(resource, 0, resourceGetDataCallback, this);
- g_main_loop_run(m_mainLoop);
-
- mainResourceDataSize = m_resourceDataSize;
- return m_resourceData.get();
-}
-
void WebViewTest::mouseMoveTo(int x, int y, unsigned int mouseModifiers)
{
g_assert(m_parentWindow);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h (125977 => 125978)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h 2012-08-19 18:34:24 UTC (rev 125978)
@@ -48,7 +48,6 @@
void waitUntilTitleChanged();
void showInWindowAndWaitUntilMapped(GtkWindowType = GTK_WINDOW_POPUP);
void resizeView(int width, int height);
- const char* mainResourceData(size_t& mainResourceDataSize);
void mouseMoveTo(int x, int y, unsigned int mouseModifiers = 0);
void clickMouseButton(int x, int y, unsigned int button = 1, unsigned int mouseModifiers = 0);
@@ -70,8 +69,6 @@
CString m_expectedTitle;
WebKitJavascriptResult* m_javascriptResult;
GError** m_javascriptError;
- GOwnPtr<char> m_resourceData;
- size_t m_resourceDataSize;
private:
void doMouseButtonEvent(GdkEventType, int, int, unsigned int, unsigned int);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (125977 => 125978)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-08-19 18:34:24 UTC (rev 125978)
@@ -315,7 +315,6 @@
void WebProcess::userPreferredLanguagesChanged(const Vector<String>& languages) const
{
overrideUserPreferredLanguages(languages);
- languageDidChange();
}
void WebProcess::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp (125977 => 125978)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp 2012-08-19 18:30:41 UTC (rev 125977)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessGtk.cpp 2012-08-19 18:34:24 UTC (rev 125978)
@@ -31,7 +31,6 @@
#include "WebProcessCreationParameters.h"
#include <WebCore/FileSystem.h>
-#include <WebCore/Language.h>
#include <WebCore/MemoryCache.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/PageCache.h>
@@ -39,8 +38,6 @@
#include <libsoup/soup-cache.h>
#include <wtf/gobject/GOwnPtr.h>
#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/StringBuilder.h>
#if !OS(WINDOWS)
#include <unistd.h>
@@ -116,72 +113,17 @@
soup_cache_clear(SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE)));
}
-// This function is based on Epiphany code in ephy-embed-prefs.c.
-static CString buildAcceptLanguages(Vector<String> languages)
+void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*)
{
- // Ignore "C" locale.
- size_t position = languages.find("c");
- if (position != notFound)
- languages.remove(position);
-
- // Fallback to "en" if the list is empty.
- if (languages.isEmpty())
- return "en";
-
- // Calculate deltas for the quality values.
- int delta;
- if (languages.size() < 10)
- delta = 10;
- else if (languages.size() < 20)
- delta = 5;
- else
- delta = 1;
-
- // Set quality values for each language.
- StringBuilder builder;
- for (size_t i = 0; i < languages.size(); ++i) {
- if (i)
- builder.append(", ");
-
- builder.append(languages[i]);
-
- int quality = 100 - i * delta;
- if (quality > 0 && quality < 100) {
- char buffer[8];
- g_ascii_formatd(buffer, 8, "%.2f", quality / 100.0);
- builder.append(String::format(";q=%s", buffer));
- }
- }
-
- return builder.toString().utf8();
+ notImplemented();
}
-static void setSoupSessionAcceptLanguage(Vector<String> languages)
-{
- g_object_set(WebCore::ResourceHandle::defaultSession(), "accept-language", buildAcceptLanguages(languages).data(), NULL);
-}
-
-static void languageChanged(void*)
-{
- setSoupSessionAcceptLanguage(WebCore::userPreferredLanguages());
-}
-
-void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::ArgumentDecoder*)
-{
- if (!parameters.languages.isEmpty())
- setSoupSessionAcceptLanguage(parameters.languages);
-
- WebCore::addLanguageChangeObserver(this, languageChanged);
-}
-
void WebProcess::platformTerminate()
{
SoupSession* session = WebCore::ResourceHandle::defaultSession();
SoupCache* cache = SOUP_CACHE(soup_session_get_feature(session, SOUP_TYPE_CACHE));
soup_cache_flush(cache);
soup_cache_dump(cache);
-
- WebCore::removeLanguageChangeObserver(this);
}
} // namespace WebKit
