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

Unified Diff: Source/core/page/PageSerializer.cpp

Issue 219903002: Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1917/
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/FocusController.cpp ('k') | Source/core/testing/MockPagePopupDriver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/PageSerializer.cpp
===================================================================
--- Source/core/page/PageSerializer.cpp (revision 170478)
+++ Source/core/page/PageSerializer.cpp (working copy)
@@ -153,17 +153,16 @@
return;
const HTMLFrameOwnerElement& frameOwner = toHTMLFrameOwnerElement(element);
- Frame* frame = frameOwner.contentFrame();
- // FIXME: RemoteFrames not currently supported here.
- if (!frame || !frame->isLocalFrame())
+ LocalFrame* frame = frameOwner.contentFrame();
+ if (!frame)
return;
- KURL url = toLocalFrame(frame)->document()->url();
+ KURL url = frame->document()->url();
if (url.isValid() && !url.isBlankURL())
return;
// We need to give a fake location to blank frames so they can be referenced by the serialized frame.
- url = m_serializer->urlForBlankFrame(toLocalFrame(frame));
+ url = m_serializer->urlForBlankFrame(frame);
appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwner), AtomicString(url.string())), namespaces);
}
« no previous file with comments | « Source/core/page/FocusController.cpp ('k') | Source/core/testing/MockPagePopupDriver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698