Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 11 insertions, 11 deletions

diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
index f2811ea..5177c4c 100644
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
@@ -26,9 +26,9 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "CString.h"
 #include "HistoryItem.h"
 #include "PlatformString.h"
+#include <wtf/text/CString.h>
 
 /**
  * SECTION:webkitwebhistoryitem
@@ -37,7 +37,7 @@
  *
  * A history item consists out of a title and a uri. It can be part of the
  * #WebKitWebBackForwardList and the global history. The global history is used
- * for coloring the links of visited sites.  #WebKitHistoryItem's constructed with
+ * for coloring the links of visited sites.  #WebKitWebHistoryItem's constructed with
  * #webkit_web_history_item_new and #webkit_web_history_item_new_with_data are
  * automatically added to the global history.
  *
@@ -54,10 +54,10 @@ using namespace WebKit;
 struct _WebKitWebHistoryItemPrivate {
     WebCore::HistoryItem* historyItem;
 
-    WebCore::CString title;
-    WebCore::CString alternateTitle;
-    WebCore::CString uri;
-    WebCore::CString originalUri;
+    WTF::CString title;
+    WTF::CString alternateTitle;
+    WTF::CString uri;
+    WTF::CString originalUri;
 
     gboolean disposed;
 };
@@ -113,10 +113,10 @@ static void webkit_web_history_item_finalize(GObject* object)
     WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(object);
     WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv;
 
-    priv->title = WebCore::CString();
-    priv->alternateTitle = WebCore::CString();
-    priv->uri = WebCore::CString();
-    priv->originalUri = WebCore::CString();
+    priv->title = WTF::CString();
+    priv->alternateTitle = WTF::CString();
+    priv->uri = WTF::CString();
+    priv->originalUri = WTF::CString();
 
     G_OBJECT_CLASS(webkit_web_history_item_parent_class)->finalize(object);
 }
@@ -469,7 +469,7 @@ G_CONST_RETURN gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem* w
 
     g_return_val_if_fail(item, NULL);
 
-    WebCore::CString t = item->target().utf8();
+    WTF::CString t = item->target().utf8();
     return g_strdup(t.data());
 }