Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: Source/core/page/PageSerializer.cpp

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Improved downcast checking. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 // FIXME: For object (plugins) tags and video tag we could replace them by a n image of their current contents. 148 // FIXME: For object (plugins) tags and video tag we could replace them by a n image of their current contents.
149 } 149 }
150 150
151 void SerializerMarkupAccumulator::appendCustomAttributes(StringBuilder& out, con st Element& element, Namespaces* namespaces) 151 void SerializerMarkupAccumulator::appendCustomAttributes(StringBuilder& out, con st Element& element, Namespaces* namespaces)
152 { 152 {
153 if (!element.isFrameOwnerElement()) 153 if (!element.isFrameOwnerElement())
154 return; 154 return;
155 155
156 const HTMLFrameOwnerElement& frameOwner = toHTMLFrameOwnerElement(element); 156 const HTMLFrameOwnerElement& frameOwner = toHTMLFrameOwnerElement(element);
157 LocalFrame* frame = frameOwner.contentFrame(); 157 Frame* frame = frameOwner.contentFrame();
158 if (!frame) 158 // RemoteFrames not currently supported here.
dcheng 2014/03/17 18:17:44 But eventually, right? Maybe tag with a FIXME? An
kenrb 2014/03/18 20:01:19 I've added a FIXME, but I don't know this area of
159 if (!frame || !frame->isLocalFrame())
159 return; 160 return;
160 161
161 KURL url = frame->document()->url(); 162 KURL url = toLocalFrame(frame)->document()->url();
162 if (url.isValid() && !url.isBlankURL()) 163 if (url.isValid() && !url.isBlankURL())
163 return; 164 return;
164 165
165 // We need to give a fake location to blank frames so they can be referenced by the serialized frame. 166 // We need to give a fake location to blank frames so they can be referenced by the serialized frame.
166 url = m_serializer->urlForBlankFrame(frame); 167 url = m_serializer->urlForBlankFrame(toLocalFrame(frame));
167 appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwne r), AtomicString(url.string())), namespaces); 168 appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwne r), AtomicString(url.string())), namespaces);
168 } 169 }
169 170
170 void SerializerMarkupAccumulator::appendEndTag(const Node& node) 171 void SerializerMarkupAccumulator::appendEndTag(const Node& node)
171 { 172 {
172 if (node.isElementNode() && !shouldIgnoreElement(toElement(node))) 173 if (node.isElementNode() && !shouldIgnoreElement(toElement(node)))
173 MarkupAccumulator::appendEndTag(node); 174 MarkupAccumulator::appendEndTag(node);
174 } 175 }
175 176
176 PageSerializer::PageSerializer(Vector<SerializedResource>* resources) 177 PageSerializer::PageSerializer(Vector<SerializedResource>* resources)
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 if (iter != m_blankFrameURLs.end()) 381 if (iter != m_blankFrameURLs.end())
381 return iter->value; 382 return iter->value;
382 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++); 383 String url = "wyciwyg://frame/" + String::number(m_blankFrameCounter++);
383 KURL fakeURL(ParsedURLString, url); 384 KURL fakeURL(ParsedURLString, url);
384 m_blankFrameURLs.add(frame, fakeURL); 385 m_blankFrameURLs.add(frame, fakeURL);
385 386
386 return fakeURL; 387 return fakeURL;
387 } 388 }
388 389
389 } 390 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698