| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 146 |
| 147 // FIXME: For object (plugins) tags and video tag we could replace them by a
n image of their current contents. | 147 // FIXME: For object (plugins) tags and video tag we could replace them by a
n image of their current contents. |
| 148 } | 148 } |
| 149 | 149 |
| 150 void SerializerMarkupAccumulator::appendCustomAttributes(StringBuilder& out, con
st Element& element, Namespaces* namespaces) | 150 void SerializerMarkupAccumulator::appendCustomAttributes(StringBuilder& out, con
st Element& element, Namespaces* namespaces) |
| 151 { | 151 { |
| 152 if (!element.isFrameOwnerElement()) | 152 if (!element.isFrameOwnerElement()) |
| 153 return; | 153 return; |
| 154 | 154 |
| 155 const HTMLFrameOwnerElement& frameOwner = toHTMLFrameOwnerElement(element); | 155 const HTMLFrameOwnerElement& frameOwner = toHTMLFrameOwnerElement(element); |
| 156 LocalFrame* frame = frameOwner.contentFrame(); | 156 Frame* frame = frameOwner.contentFrame(); |
| 157 if (!frame) | 157 // FIXME: RemoteFrames not currently supported here. |
| 158 if (!frame || !frame->isLocalFrame()) |
| 158 return; | 159 return; |
| 159 | 160 |
| 160 KURL url = frame->document()->url(); | 161 KURL url = toLocalFrame(frame)->document()->url(); |
| 161 if (url.isValid() && !url.isBlankURL()) | 162 if (url.isValid() && !url.isBlankURL()) |
| 162 return; | 163 return; |
| 163 | 164 |
| 164 // We need to give a fake location to blank frames so they can be referenced
by the serialized frame. | 165 // We need to give a fake location to blank frames so they can be referenced
by the serialized frame. |
| 165 url = m_serializer->urlForBlankFrame(frame); | 166 url = m_serializer->urlForBlankFrame(toLocalFrame(frame)); |
| 166 appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwne
r), AtomicString(url.string())), namespaces); | 167 appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwne
r), AtomicString(url.string())), namespaces); |
| 167 } | 168 } |
| 168 | 169 |
| 169 void SerializerMarkupAccumulator::appendEndTag(const Node& node) | 170 void SerializerMarkupAccumulator::appendEndTag(const Node& node) |
| 170 { | 171 { |
| 171 if (node.isElementNode() && !shouldIgnoreElement(toElement(node))) | 172 if (node.isElementNode() && !shouldIgnoreElement(toElement(node))) |
| 172 MarkupAccumulator::appendEndTag(node); | 173 MarkupAccumulator::appendEndTag(node); |
| 173 } | 174 } |
| 174 | 175 |
| 175 PageSerializer::PageSerializer(Vector<SerializedResource>* resources) | 176 PageSerializer::PageSerializer(Vector<SerializedResource>* resources) |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 if (iter != m_blankFrameURLs.end()) | 380 if (iter != m_blankFrameURLs.end()) |
| 380 return iter->value; | 381 return iter->value; |
| 381 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); | 382 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); |
| 382 KURL fakeURL(ParsedURLString, url); | 383 KURL fakeURL(ParsedURLString, url); |
| 383 m_blankFrameURLs.add(frame, fakeURL); | 384 m_blankFrameURLs.add(frame, fakeURL); |
| 384 | 385 |
| 385 return fakeURL; | 386 return fakeURL; |
| 386 } | 387 } |
| 387 | 388 |
| 388 } | 389 } |
| OLD | NEW |