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

Side by Side Diff: mojo/edk/js/handle.cc

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « mojo/edk/js/handle.h ('k') | mojo/edk/js/handle_close_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/bindings/js/handle.h" 5 #include "mojo/edk/js/handle.h"
6 6
7 #include "mojo/bindings/js/handle_close_observer.h" 7 #include <sstream>
8 #include "mojo/edk/js/handle_close_observer.h"
8 9
9 namespace mojo { 10 namespace mojo {
10 namespace js { 11 namespace js {
11 12
12 gin::WrapperInfo HandleWrapper::kWrapperInfo = { gin::kEmbedderNativeGin }; 13 gin::WrapperInfo HandleWrapper::kWrapperInfo = { gin::kEmbedderNativeGin };
13 14
14 HandleWrapper::HandleWrapper(MojoHandle handle) 15 HandleWrapper::HandleWrapper(MojoHandle handle)
15 : handle_(mojo::Handle(handle)) { 16 : handle_(mojo::Handle(handle)) {
16 } 17 }
17 18
18 HandleWrapper::~HandleWrapper() { 19 HandleWrapper::~HandleWrapper() {
19 NotifyCloseObservers(); 20 NotifyCloseObservers();
20 } 21 }
21 22
23 std::string HandleWrapper::ToString() {
24 std::ostringstream oss;
25 oss << "[mojo::Handle ";
26 if (handle_.is_valid())
27 oss << handle_.get().value();
28 else
29 oss << "null";
30 oss << "]";
31 return oss.str();
32 }
33
34 gin::ObjectTemplateBuilder HandleWrapper::GetObjectTemplateBuilder(
35 v8::Isolate* isolate) {
36 return Wrappable<HandleWrapper>::GetObjectTemplateBuilder(isolate)
37 .SetMethod("toString", &HandleWrapper::ToString);
38 }
39
22 void HandleWrapper::Close() { 40 void HandleWrapper::Close() {
23 NotifyCloseObservers(); 41 NotifyCloseObservers();
24 handle_.reset(); 42 handle_.reset();
25 } 43 }
26 44
27 void HandleWrapper::AddCloseObserver(HandleCloseObserver* observer) { 45 void HandleWrapper::AddCloseObserver(HandleCloseObserver* observer) {
28 close_observers_.AddObserver(observer); 46 close_observers_.AddObserver(observer);
29 } 47 }
30 48
31 void HandleWrapper::RemoveCloseObserver(HandleCloseObserver* observer) { 49 void HandleWrapper::RemoveCloseObserver(HandleCloseObserver* observer) {
(...skipping 29 matching lines...) Expand all
61 79
62 gin::Handle<mojo::js::HandleWrapper> handle; 80 gin::Handle<mojo::js::HandleWrapper> handle;
63 if (!Converter<gin::Handle<mojo::js::HandleWrapper> >::FromV8( 81 if (!Converter<gin::Handle<mojo::js::HandleWrapper> >::FromV8(
64 isolate, val, &handle)) 82 isolate, val, &handle))
65 return false; 83 return false;
66 84
67 *out = handle->get(); 85 *out = handle->get();
68 return true; 86 return true;
69 } 87 }
70 88
89 v8::Handle<v8::Value> Converter<mojo::MessagePipeHandle>::ToV8(
90 v8::Isolate* isolate, mojo::MessagePipeHandle val) {
91 return Converter<mojo::Handle>::ToV8(isolate, val);
92 }
93
94 bool Converter<mojo::MessagePipeHandle>::FromV8(v8::Isolate* isolate,
95 v8::Handle<v8::Value> val,
96 mojo::MessagePipeHandle* out) {
97 return Converter<mojo::Handle>::FromV8(isolate, val, out);
98 }
99
100
71 } // namespace gin 101 } // namespace gin
OLDNEW
« no previous file with comments | « mojo/edk/js/handle.h ('k') | mojo/edk/js/handle_close_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698