summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk')
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp2
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am4
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp34
3 files changed, 22 insertions, 18 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
index b7ffc98b8..f65fa97ed 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
@@ -188,7 +188,7 @@ static void webkitWebViewBaseContainerAdd(GtkContainer* container, GtkWidget* wi
if (WEBKIT_IS_WEB_VIEW_BASE(widget)
&& WebInspectorProxy::isInspectorPage(WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy.get())) {
- ASSERT(priv->inspectorView);
+ ASSERT(!priv->inspectorView);
priv->inspectorView = widget;
priv->inspectorViewHeight = gMinimumAttachedInspectorHeight;
} else {
diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
index 919202522..3fadf40b4 100644
--- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
@@ -67,6 +67,10 @@ Libraries_libWebKit2APITestCore_la_SOURCES = \
Source/WebKit2/UIProcess/API/gtk/tests/WebViewTest.h
Libraries_libWebKit2APITestCore_la_CPPFLAGS = $(webkit2_tests_cppflags)
+EXTRA_DIST += \
+ Source/WebKit2/UIProcess/API/gtk/tests/resources/test-cert.pem \
+ Source/WebKit2/UIProcess/API/gtk/tests/resources/test-key.pem
+
Programs_WebKit2APITests_TestWebKitWebContext_SOURCES = \
Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp
Programs_WebKit2APITests_TestWebKitWebContext_CPPFLAGS = \
diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp
index 7de95e0f0..43f59e1e7 100644
--- a/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp
@@ -293,16 +293,16 @@ public:
m_loadEvents.append(Failed);
}
- void waitUntilResourceLoadFinsihed()
+ void waitUntilResourceLoadFinished()
{
m_resource = 0;
m_resourcesLoaded = 0;
g_main_loop_run(m_mainLoop);
}
- WebKitURIResponse* waitUntilResourceLoadFinsihedAndReturnURIResponse()
+ WebKitURIResponse* waitUntilResourceLoadFinishedAndReturnURIResponse()
{
- waitUntilResourceLoadFinsihed();
+ waitUntilResourceLoadFinished();
g_assert(m_resource);
return webkit_web_resource_get_response(m_resource.get());
}
@@ -315,7 +315,7 @@ public:
static void testWebResourceLoading(SingleResourceLoadTest* test, gconstpointer)
{
test->loadURI(kServer->getURIForPath("/javascript.html").data());
- test->waitUntilResourceLoadFinsihed();
+ test->waitUntilResourceLoadFinished();
g_assert(test->m_resource);
Vector<SingleResourceLoadTest::LoadEvents>& events = test->m_loadEvents;
g_assert_cmpint(events.size(), ==, 5);
@@ -327,7 +327,7 @@ static void testWebResourceLoading(SingleResourceLoadTest* test, gconstpointer)
events.clear();
test->loadURI(kServer->getURIForPath("/redirected-css.html").data());
- test->waitUntilResourceLoadFinsihed();
+ test->waitUntilResourceLoadFinished();
g_assert(test->m_resource);
g_assert_cmpint(events.size(), ==, 6);
g_assert_cmpint(events[0], ==, SingleResourceLoadTest::Started);
@@ -339,7 +339,7 @@ static void testWebResourceLoading(SingleResourceLoadTest* test, gconstpointer)
events.clear();
test->loadURI(kServer->getURIForPath("/invalid-css.html").data());
- test->waitUntilResourceLoadFinsihed();
+ test->waitUntilResourceLoadFinished();
g_assert(test->m_resource);
g_assert_cmpint(events.size(), ==, 4);
g_assert_cmpint(events[0], ==, SingleResourceLoadTest::Started);
@@ -353,47 +353,47 @@ static void testWebResourceResponse(SingleResourceLoadTest* test, gconstpointer)
{
// No cached resource: First load.
test->loadURI(kServer->getURIForPath("/javascript.html").data());
- WebKitURIResponse* response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ WebKitURIResponse* response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_OK);
// No cached resource: Second load.
test->loadURI(kServer->getURIForPath("/javascript.html").data());
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_OK);
// No cached resource: Reload.
webkit_web_view_reload(test->m_webView);
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_OK);
// Cached resource: First load.
test->loadURI(kServer->getURIForPath("/image.html").data());
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_OK);
// Cached resource: Second load.
test->loadURI(kServer->getURIForPath("/image.html").data());
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_OK);
// Cached resource: Reload.
webkit_web_view_reload(test->m_webView);
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpint(webkit_uri_response_get_status_code(response), ==, SOUP_STATUS_NOT_MODIFIED);
}
static void testWebResourceMimeType(SingleResourceLoadTest* test, gconstpointer)
{
test->loadURI(kServer->getURIForPath("/javascript.html").data());
- WebKitURIResponse* response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ WebKitURIResponse* response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "text/javascript");
test->loadURI(kServer->getURIForPath("/image.html").data());
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "image/vnd.microsoft.icon");
test->loadURI(kServer->getURIForPath("/redirected-css.html").data());
- response = test->waitUntilResourceLoadFinsihedAndReturnURIResponse();
+ response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "text/css");
}
@@ -475,7 +475,7 @@ private:
static void testWebResourceActiveURI(ResourceURITrackingTest* test, gconstpointer)
{
test->loadURI(kServer->getURIForPath("/redirected-css.html").data());
- test->waitUntilResourceLoadFinsihed();
+ test->waitUntilResourceLoadFinished();
}
static void testWebResourceGetData(ResourcesTest* test, gconstpointer)
@@ -543,7 +543,7 @@ static void serverCallback(SoupServer* server, SoupMessage* message, const char*
soup_message_set_status(message, SOUP_STATUS_OK);
- if (soup_message_headers_get(message->request_headers, "If-Modified-Since")) {
+ if (soup_message_headers_get_one(message->request_headers, "If-Modified-Since")) {
soup_message_set_status(message, SOUP_STATUS_NOT_MODIFIED);
soup_message_body_complete(message->response_body);
return;
View Lorry Controller Status