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

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

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/html/HTMLIFrameElement.h ('k') | 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 42db220209674c27587ca76794cc8a1765f83d88..57eff5476d9c769c4a25edcf7a2c5273a33db62d 100644
--- a/sky/engine/core/html/HTMLIFrameElement.cpp
+++ b/sky/engine/core/html/HTMLIFrameElement.cpp
@@ -70,23 +70,24 @@ void HTMLIFrameElement::OnViewDestroyed(mojo::View* view)
m_contentView = nullptr;
}
-ScriptValue HTMLIFrameElement::takeServicesHandle(ScriptState* scriptState)
+PassRefPtr<DartValue> HTMLIFrameElement::takeServicesHandle(DartState*)
{
- return ScriptValue(scriptState, gin::ConvertToV8(scriptState->isolate(), m_services.PassMessagePipe().release()));
+ return DartValue::Create();
}
-ScriptValue HTMLIFrameElement::takeExposedServicesHandle(ScriptState* scriptState)
+PassRefPtr<DartValue> HTMLIFrameElement::takeExposedServicesHandle(DartState*)
{
- return ScriptValue(scriptState, gin::ConvertToV8(scriptState->isolate(), m_exposedServices.release()));
+ return DartValue::Create();
}
-void HTMLIFrameElement::embedViewManagerClient(const ScriptValue& client) {
+void HTMLIFrameElement::embedViewManagerClient(DartValue* client) {
if (!m_contentView)
return;
- mojo::MessagePipeHandle handle;
- if (gin::ConvertFromV8(client.isolate(), client.v8Value(), &handle))
- m_contentView->Embed(mojo::MakeProxy<mojo::ViewManagerClient>(mojo::MakeScopedHandle(handle)));
+ // TODO(dart)
+ // mojo::MessagePipeHandle handle;
+ // if (gin::ConvertFromV8(client.isolate(), client.v8Value(), &handle))
+ // m_contentView->Embed(mojo::MakeProxy<mojo::ViewManagerClient>(mojo::MakeScopedHandle(handle)));
}
void HTMLIFrameElement::navigateView()
« no previous file with comments | « sky/engine/core/html/HTMLIFrameElement.h ('k') | sky/engine/core/html/HTMLIFrameElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698