| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 102 |
| 103 return element->document().completeURL(value); | 103 return element->document().completeURL(value); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void retrieveResourcesForElement(Element* element, | 106 void retrieveResourcesForElement(Element* element, |
| 107 Vector<LocalFrame*>* visitedFrames, | 107 Vector<LocalFrame*>* visitedFrames, |
| 108 Vector<LocalFrame*>* framesToVisit, | 108 Vector<LocalFrame*>* framesToVisit, |
| 109 Vector<KURL>* frameURLs, | 109 Vector<KURL>* frameURLs, |
| 110 Vector<KURL>* resourceURLs) | 110 Vector<KURL>* resourceURLs) |
| 111 { | 111 { |
| 112 ASSERT(element); |
| 112 // If the node is a frame, we'll process it later in retrieveResourcesForFra
me. | 113 // If the node is a frame, we'll process it later in retrieveResourcesForFra
me. |
| 113 if ((element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNa
mes::frameTag) | 114 if ((isHTMLIFrameElement(*element) || isHTMLFrameElement(*element) |
| 114 || element->hasTagName(HTMLNames::objectTag) || element->hasTagName(HTML
Names::embedTag)) | 115 || isHTMLObjectElement(*element) || isHTMLEmbedElement(*element)) |
| 115 && element->isFrameOwnerElement()) { | 116 && element->isFrameOwnerElement()) { |
| 116 if (LocalFrame* frame = toHTMLFrameOwnerElement(element)->contentFrame()
) { | 117 if (LocalFrame* frame = toHTMLFrameOwnerElement(element)->contentFrame()
) { |
| 117 if (!visitedFrames->contains(frame)) | 118 if (!visitedFrames->contains(frame)) |
| 118 framesToVisit->append(frame); | 119 framesToVisit->append(frame); |
| 119 return; | 120 return; |
| 120 } | 121 } |
| 121 } | 122 } |
| 122 | 123 |
| 123 KURL url = getSubResourceURLFromElement(element); | 124 KURL url = getSubResourceURLFromElement(element); |
| 124 if (url.isEmpty() || !url.isValid()) | 125 if (url.isEmpty() || !url.isValid()) |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 | 290 |
| 290 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTar
get) | 291 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTar
get) |
| 291 { | 292 { |
| 292 if (baseTarget.isEmpty()) | 293 if (baseTarget.isEmpty()) |
| 293 return String("<base href=\".\">"); | 294 return String("<base href=\".\">"); |
| 294 String baseString = "<base href=\".\" target=\"" + static_cast<const String&
>(baseTarget) + "\">"; | 295 String baseString = "<base href=\".\" target=\"" + static_cast<const String&
>(baseTarget) + "\">"; |
| 295 return baseString; | 296 return baseString; |
| 296 } | 297 } |
| 297 | 298 |
| 298 } // namespace blink | 299 } // namespace blink |
| OLD | NEW |