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

Unified Diff: Source/core/html/HTMLFrameElementBase.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/frame/LocalFrame.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLFrameElementBase.cpp
===================================================================
--- Source/core/html/HTMLFrameElementBase.cpp (revision 170478)
+++ Source/core/html/HTMLFrameElementBase.cpp (working copy)
@@ -91,9 +91,9 @@
if (!loadOrRedirectSubframe(url, m_frameName, lockBackForwardList))
return;
- if (!contentFrame() || scriptURL.isEmpty() || !contentFrame()->isLocalFrame())
+ if (!contentFrame() || scriptURL.isEmpty())
return;
- toLocalFrame(contentFrame())->script().executeScriptIfJavaScriptURL(scriptURL);
+ contentFrame()->script().executeScriptIfJavaScriptURL(scriptURL);
}
void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomicString& value)
@@ -159,10 +159,8 @@
HTMLFrameOwnerElement::attach(context);
if (RenderPart* part = renderPart()) {
- if (Frame* frame = contentFrame()) {
- if (frame->isLocalFrame())
- part->setWidget(toLocalFrame(frame)->view());
- }
+ if (LocalFrame* frame = contentFrame())
+ part->setWidget(frame->view());
}
}
« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698