| Index: Source/core/html/HTMLFrameElementBase.cpp
|
| diff --git a/Source/core/html/HTMLFrameElementBase.cpp b/Source/core/html/HTMLFrameElementBase.cpp
|
| index f63b30b664d1bb23f11636bd2666f42a885f838d..3cfbab76a0caf2771c08212a00d51d874113873e 100644
|
| --- a/Source/core/html/HTMLFrameElementBase.cpp
|
| +++ b/Source/core/html/HTMLFrameElementBase.cpp
|
| @@ -91,9 +91,9 @@ void HTMLFrameElementBase::openURL(bool lockBackForwardList)
|
|
|
| if (!loadOrRedirectSubframe(url, m_frameName, lockBackForwardList))
|
| return;
|
| - if (!contentFrame() || scriptURL.isEmpty())
|
| + if (!contentFrame() || scriptURL.isEmpty() || !contentFrame()->isLocalFrame())
|
| return;
|
| - contentFrame()->script().executeScriptIfJavaScriptURL(scriptURL);
|
| + toLocalFrame(contentFrame())->script().executeScriptIfJavaScriptURL(scriptURL);
|
| }
|
|
|
| void HTMLFrameElementBase::parseAttribute(const QualifiedName& name, const AtomicString& value)
|
| @@ -159,8 +159,10 @@ void HTMLFrameElementBase::attach(const AttachContext& context)
|
| HTMLFrameOwnerElement::attach(context);
|
|
|
| if (RenderPart* part = renderPart()) {
|
| - if (LocalFrame* frame = contentFrame())
|
| - part->setWidget(frame->view());
|
| + if (Frame* frame = contentFrame()) {
|
| + if (frame->isLocalFrame())
|
| + part->setWidget(toLocalFrame(frame)->view());
|
| + }
|
| }
|
| }
|
|
|
|
|