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

Unified Diff: sky/engine/core/html/HTMLIFrameElement.cpp

Issue 885783002: Fixes crash in HTMLIFrameElement and exposes HTMLIFrameElement::src (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 5 years, 11 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 | « no previous file | sky/engine/core/html/HTMLIFrameElement.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/HTMLIFrameElement.cpp
diff --git a/sky/engine/core/html/HTMLIFrameElement.cpp b/sky/engine/core/html/HTMLIFrameElement.cpp
index d47b2f5048e71194a2ffda88e55da98ff1d30377..90cb6736f57358dd1fe885f96848cec0e621206e 100644
--- a/sky/engine/core/html/HTMLIFrameElement.cpp
+++ b/sky/engine/core/html/HTMLIFrameElement.cpp
@@ -35,8 +35,10 @@ void HTMLIFrameElement::insertedInto(ContainerNode* insertionPoint)
{
HTMLElement::insertedInto(insertionPoint);
if (insertionPoint->inDocument()) {
- if (LocalFrame* frame = document().frame())
+ if (LocalFrame* frame = document().frame()) {
m_contentView = frame->loaderClient()->createChildFrame();
+ m_contentView->AddObserver(this);
+ }
navigateView();
}
}
@@ -95,7 +97,6 @@ void HTMLIFrameElement::navigateView()
m_contentView->Embed(mojo::String::From(url.string().utf8().data()),
mojo::GetProxy(&m_services),
mojo::MakeProxy<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass()));
- m_contentView->AddObserver(this);
}
}
« no previous file with comments | « no previous file | sky/engine/core/html/HTMLIFrameElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698