Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 30 insertions, 29 deletions

diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp
index 92d19e7..927b76d 100644
--- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp
+++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
-#include "webkitwebdatabase.h"
+#include "webkitsecurityorigin.h"
 
-#include "webkitprivate.h"
-
-#include "PlatformString.h"
 #include "DatabaseTracker.h"
-#include <wtf/text/CString.h>
-
+#include "PlatformString.h"
+#include "webkitprivate.h"
+#include "webkitsecurityoriginprivate.h"
 #include <glib/gi18n-lib.h>
+#include <wtf/text/CString.h>
 
 /**
  * SECTION:webkitsecurityorigin
@@ -213,7 +212,7 @@ static void webkit_security_origin_class_init(WebKitSecurityOriginClass* klass)
 
 static void webkit_security_origin_init(WebKitSecurityOrigin* securityOrigin)
 {
-    WebKitSecurityOriginPrivate* priv = WEBKIT_SECURITY_ORIGIN_GET_PRIVATE(securityOrigin);
+    WebKitSecurityOriginPrivate* priv = G_TYPE_INSTANCE_GET_PRIVATE(securityOrigin, WEBKIT_TYPE_SECURITY_ORIGIN, WebKitSecurityOriginPrivate);
     priv->webDatabases = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
     securityOrigin->priv = priv;
 }
@@ -379,46 +378,48 @@ GList* webkit_security_origin_get_all_web_databases(WebKitSecurityOrigin* securi
     return databases;
 }
 
-WebKitSecurityOrigin* WebKit::kit(WebCore::SecurityOrigin* coreOrigin)
+WebKitWebDatabase* webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const gchar* databaseName)
 {
-    ASSERT(coreOrigin);
+    g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), NULL);
 
-    GHashTable* table = webkit_security_origins();
-    WebKitSecurityOrigin* origin = (WebKitSecurityOrigin*) g_hash_table_lookup(table, coreOrigin);
+    WebKitSecurityOriginPrivate* priv = securityOrigin->priv;
+    GHashTable* databaseHash = priv->webDatabases;
+    WebKitWebDatabase* database = (WebKitWebDatabase*) g_hash_table_lookup(databaseHash, databaseName);
 
-    if (!origin) {
-        origin = WEBKIT_SECURITY_ORIGIN(g_object_new(WEBKIT_TYPE_SECURITY_ORIGIN, NULL));
-        origin->priv->coreOrigin = coreOrigin;
-        g_hash_table_insert(table, coreOrigin, origin);
+    if (!database) {
+        database =  WEBKIT_WEB_DATABASE(g_object_new(WEBKIT_TYPE_WEB_DATABASE,
+                                       "security-origin", securityOrigin,
+                                       "name", databaseName,
+                                        NULL));
+        g_hash_table_insert(databaseHash, g_strdup(databaseName), database);
     }
 
-    return origin;
+    return database;
 }
 
+namespace WebKit {
 
-WebCore::SecurityOrigin* WebKit::core(WebKitSecurityOrigin* securityOrigin)
+WebCore::SecurityOrigin* core(WebKitSecurityOrigin* securityOrigin)
 {
     ASSERT(securityOrigin);
 
     return securityOrigin->priv->coreOrigin.get();
 }
 
-WebKitWebDatabase* webkit_security_origin_get_web_database(WebKitSecurityOrigin* securityOrigin, const gchar* databaseName)
+WebKitSecurityOrigin* kit(WebCore::SecurityOrigin* coreOrigin)
 {
-    g_return_val_if_fail(WEBKIT_IS_SECURITY_ORIGIN(securityOrigin), NULL);
+    ASSERT(coreOrigin);
 
-    WebKitSecurityOriginPrivate* priv = securityOrigin->priv;
-    GHashTable* databaseHash = priv->webDatabases;
-    WebKitWebDatabase* database = (WebKitWebDatabase*) g_hash_table_lookup(databaseHash, databaseName);
+    GHashTable* table = webkit_security_origins();
+    WebKitSecurityOrigin* origin = (WebKitSecurityOrigin*) g_hash_table_lookup(table, coreOrigin);
 
-    if (!database) {
-        database =  WEBKIT_WEB_DATABASE(g_object_new(WEBKIT_TYPE_WEB_DATABASE,
-                                       "security-origin", securityOrigin,
-                                       "name", databaseName,
-                                        NULL));
-        g_hash_table_insert(databaseHash, g_strdup(databaseName), database);
+    if (!origin) {
+        origin = WEBKIT_SECURITY_ORIGIN(g_object_new(WEBKIT_TYPE_SECURITY_ORIGIN, NULL));
+        origin->priv->coreOrigin = coreOrigin;
+        g_hash_table_insert(table, coreOrigin, origin);
     }
 
-    return database;
+    return origin;
 }
 
+}