Drop Element::isHTMLFrameElementBase() virtual function

Source/web/WebPageSerializer.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "WebFrame.h"
 #include "WebFrameImpl.h"
 #include "WebPageSerializerClient.h"
 #include "WebPageSerializerImpl.h"
 #include "WebView.h"
 #include "WebViewImpl.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLAllCollection.h"
+#include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLTableElement.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/PageSerializer.h"
 #include "platform/SerializedResource.h"
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebCString.h"
 #include "public/platform/WebString.h"
@@ skipping 49 matching lines @@
 }
 
 void retrieveResourcesForElement(Element* element,
                                  Vector<LocalFrame*>* visitedFrames,
                                  Vector<LocalFrame*>* framesToVisit,
                                  Vector<KURL>* frameURLs,
                                  Vector<KURL>* resourceURLs)
 {
     ASSERT(element);
     // If the node is a frame, we'll process it later in retrieveResourcesForFrame.
-    if ((isHTMLIFrameElement(*element) || isHTMLFrameElement(*element)
-        || isHTMLObjectElement(*element) || isHTMLEmbedElement(*element))
+    if ((isHTMLFrameElementBase(*element) || isHTMLObjectElement(*element) || isHTMLEmbedElement(*element))
             && element->isFrameOwnerElement()) {

[tkent, 2014/03/17 22:30:25]

element->isFrameOwnerElement() is unnecessary.

[Inactive, 2014/03/17 23:36:59]

Done.

         if (LocalFrame* frame = toHTMLFrameOwnerElement(element)->contentFrame()) {
             if (!visitedFrames->contains(frame))
                 framesToVisit->append(frame);
             return;
         }
     }
 
     KURL url = getSubResourceURLFromElement(element);
     if (url.isEmpty() || !url.isValid())
         return; // No subresource for this node.
@@ skipping 163 matching lines @@
 
 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTarget)
 {
     if (baseTarget.isEmpty())
         return String("<base href=\".\">");
     String baseString = "<base href=\".\" target=\"" + static_cast<const String&>(baseTarget) + "\">";
     return baseString;
 }
 
 } // namespace blink