Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585

1 files changed, 11 insertions, 11 deletions

diff --git a/WebKit/chromium/src/WebPageSerializerImpl.h b/WebKit/chromium/src/WebPageSerializerImpl.h
index 8f6a99f..03f0a3b 100644
--- a/WebKit/chromium/src/WebPageSerializerImpl.h
+++ b/WebKit/chromium/src/WebPageSerializerImpl.h
@@ -32,10 +32,11 @@
 #define WebPageSerializerImpl_h
 
 #include "PlatformString.h"
-#include "StringBuilder.h"
 #include "StringHash.h"
+#include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
+#include "StringBuilder.h"
 
 #include "WebEntities.h"
 #include "WebPageSerializer.h"
@@ -47,7 +48,6 @@ namespace WebCore {
 class Document;
 class Element;
 class Node;
-class String;
 class TextEncoding;
 }
 
@@ -93,7 +93,7 @@ private:
     WebPageSerializerClient* m_client;
     // This hash map is used to map resource URL of original link to its local
     // file path.
-    typedef HashMap<WebCore::String, WebCore::String> LinkLocalPathMap;
+    typedef HashMap<WTF::String, WTF::String> LinkLocalPathMap;
     // local_links_ include all pair of local resource path and corresponding
     // original link.
     LinkLocalPathMap m_localLinks;
@@ -107,7 +107,7 @@ private:
     // serialized or not;
     bool m_framesCollected;
     // Local directory name of all local resource files.
-    WebCore::String m_localDirectoryName;
+    WTF::String m_localDirectoryName;
     // Vector for saving all frames which need to be serialized.
     Vector<WebFrameImpl*> m_frames;
 
@@ -124,7 +124,7 @@ private:
         // Document object of current frame.
         WebCore::Document* doc;
         // Local directory name of all local resource files.
-        const WebCore::String& directoryName;
+        const WTF::String& directoryName;
 
         // Flag indicates current doc is html document or not. It's a cache value
         // of Document.isHTMLDocument().
@@ -151,31 +151,31 @@ private:
         SerializeDomParam(const WebCore::KURL& currentFrameURL,
                           const WebCore::TextEncoding& textEncoding,
                           WebCore::Document* doc,
-                          const WebCore::String& directoryName);
+                          const WTF::String& directoryName);
     };
 
     // Collect all target frames which need to be serialized.
     void collectTargetFrames();
     // Before we begin serializing open tag of a element, we give the target
     // element a chance to do some work prior to add some additional data.
-    WebCore::String preActionBeforeSerializeOpenTag(const WebCore::Element* element,
+    WTF::String preActionBeforeSerializeOpenTag(const WebCore::Element* element,
                                                     SerializeDomParam* param,
                                                     bool* needSkip);
     // After we finish serializing open tag of a element, we give the target
     // element a chance to do some post work to add some additional data.
-    WebCore::String postActionAfterSerializeOpenTag(const WebCore::Element* element,
+    WTF::String postActionAfterSerializeOpenTag(const WebCore::Element* element,
                                                     SerializeDomParam* param);
     // Before we begin serializing end tag of a element, we give the target
     // element a chance to do some work prior to add some additional data.
-    WebCore::String preActionBeforeSerializeEndTag(const WebCore::Element* element,
+    WTF::String preActionBeforeSerializeEndTag(const WebCore::Element* element,
                                                    SerializeDomParam* param,
                                                    bool* needSkip);
     // After we finish serializing end tag of a element, we give the target
     // element a chance to do some post work to add some additional data.
-    WebCore::String postActionAfterSerializeEndTag(const WebCore::Element* element,
+    WTF::String postActionAfterSerializeEndTag(const WebCore::Element* element,
                                                    SerializeDomParam* param);
     // Save generated html content to data buffer.
-    void saveHTMLContentToBuffer(const WebCore::String& content,
+    void saveHTMLContentToBuffer(const WTF::String& content,
                                  SerializeDomParam* param);
     // Flushes the content buffer by encoding and sending the content to the
     // WebPageSerializerClient. Content is not flushed if the buffer is not full