Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebPageSerializerImpl.cpp

diff --git a/src/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp b/src/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
index 8a4aa90..a2b7705 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
+++ b/src/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp
@@ -92,14 +92,12 @@
 #include "core/html/HTMLMetaElement.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
-#include "public/platform/WebURL.h"
 #include "public/platform/WebVector.h"
-#include "weborigin/KURL.h"
 #include "wtf/text/TextEncoding.h"
 
 using namespace WebCore;
 
-namespace WebKit {
+namespace blink {
 
 // Maximum length of data buffer which is used to temporary save generated
 // html content data. This is a soft limit which might be passed if a very large
@@ -147,7 +145,7 @@ String WebPageSerializerImpl::preActionBeforeSerializeOpenTag(
                     *needSkip = true;
                 }
             }
-        } else if (isHTMLHtmlElement(element)) {
+        } else if (element->hasTagName(HTMLNames::htmlTag)) {
             // Check something before processing the open tag of HEAD element.
             // First we add doc type declaration if original document has it.
             if (!param->haveSeenDocType) {
@@ -479,10 +477,9 @@ void WebPageSerializerImpl::collectTargetFrames()
         // Go through sub-frames.
         RefPtr<HTMLCollection> all = currentDoc->all();
 
-        for (unsigned i = 0; Node* node = all->item(i); i++) {
-            if (!node->isHTMLElement())
+        for (unsigned i = 0; Element* element = all->item(i); i++) {
+            if (!element->isHTMLElement())
                 continue;
-            Element* element = toElement(node);
             WebFrameImpl* webFrame =
                 WebFrameImpl::fromFrameOwnerElement(element);
             if (webFrame)
@@ -526,4 +523,4 @@ bool WebPageSerializerImpl::serialize()
     return didSerialization;
 }
 
-}  // namespace WebKit
+}  // namespace blink