summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp')
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp
index 8519a2cb6..7af2aee10 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp
@@ -20,11 +20,11 @@
#include "config.h"
#include "WebKitFormSubmissionRequest.h"
+#include "APIDictionary.h"
#include "APIString.h"
-#include "ImmutableDictionary.h"
#include "WebFormSubmissionListenerProxy.h"
#include "WebKitFormSubmissionRequestPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
#include <wtf/text/CString.h>
using namespace WebKit;
@@ -45,7 +45,7 @@ using namespace WebKit;
*/
struct _WebKitFormSubmissionRequestPrivate {
- RefPtr<ImmutableDictionary> webValues;
+ RefPtr<API::Dictionary> webValues;
RefPtr<WebFormSubmissionListenerProxy> listener;
GRefPtr<GHashTable> values;
bool handledRequest;
@@ -70,7 +70,7 @@ static void webkit_form_submission_request_class_init(WebKitFormSubmissionReques
objectClass->dispose = webkitFormSubmissionRequestDispose;
}
-WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(ImmutableDictionary* values, WebFormSubmissionListenerProxy* listener)
+WebKitFormSubmissionRequest* webkitFormSubmissionRequestCreate(API::Dictionary* values, WebFormSubmissionListenerProxy* listener)
{
WebKitFormSubmissionRequest* request = WEBKIT_FORM_SUBMISSION_REQUEST(g_object_new(WEBKIT_TYPE_FORM_SUBMISSION_REQUEST, NULL));
request->priv->webValues = values;
@@ -96,18 +96,18 @@ GHashTable* webkit_form_submission_request_get_text_fields(WebKitFormSubmissionR
return request->priv->values.get();
if (!request->priv->webValues->size())
- return 0;
+ return nullptr;
request->priv->values = adoptGRef(g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free));
- const ImmutableDictionary::MapType& map = request->priv->webValues->map();
- ImmutableDictionary::MapType::const_iterator end = map.end();
- for (ImmutableDictionary::MapType::const_iterator it = map.begin(); it != end; ++it) {
+ const API::Dictionary::MapType& map = request->priv->webValues->map();
+ API::Dictionary::MapType::const_iterator end = map.end();
+ for (API::Dictionary::MapType::const_iterator it = map.begin(); it != end; ++it) {
API::String* value = static_cast<API::String*>(it->value.get());
g_hash_table_insert(request->priv->values.get(), g_strdup(it->key.utf8().data()), g_strdup(value->string().utf8().data()));
}
- request->priv->webValues = 0;
+ request->priv->webValues = nullptr;
return request->priv->values.get();
}