| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/plugins/ppapi/message_channel.h" | 5 #include "webkit/plugins/ppapi/message_channel.h" |
| 6 | 6 |
| 7 #include <cstdlib> | 7 #include <cstdlib> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 &MessageChannelHasProperty, | 264 &MessageChannelHasProperty, |
| 265 &MessageChannelGetProperty, | 265 &MessageChannelGetProperty, |
| 266 &MessageChannelSetProperty, | 266 &MessageChannelSetProperty, |
| 267 NULL, | 267 NULL, |
| 268 &MessageChannelEnumerate, | 268 &MessageChannelEnumerate, |
| 269 }; | 269 }; |
| 270 | 270 |
| 271 } // namespace | 271 } // namespace |
| 272 | 272 |
| 273 // MessageChannel -------------------------------------------------------------- | 273 // MessageChannel -------------------------------------------------------------- |
| 274 MessageChannel::MessageChannelNPObject::MessageChannelNPObject() {} | 274 MessageChannel::MessageChannelNPObject::MessageChannelNPObject() |
| 275 : message_channel(NULL) { |
| 276 } |
| 275 | 277 |
| 276 MessageChannel::MessageChannelNPObject::~MessageChannelNPObject() {} | 278 MessageChannel::MessageChannelNPObject::~MessageChannelNPObject() {} |
| 277 | 279 |
| 278 MessageChannel::MessageChannel(PluginInstance* instance) | 280 MessageChannel::MessageChannel(PluginInstance* instance) |
| 279 : instance_(instance), | 281 : instance_(instance), |
| 280 passthrough_object_(NULL), | 282 passthrough_object_(NULL), |
| 281 np_object_(NULL), | 283 np_object_(NULL), |
| 282 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { | 284 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { |
| 283 VOID_TO_NPVARIANT(onmessage_invoker_); | 285 VOID_TO_NPVARIANT(onmessage_invoker_); |
| 284 | 286 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 // SetPassthroughObject(passthrough_object()); | 420 // SetPassthroughObject(passthrough_object()); |
| 419 if (passthrough_object_) | 421 if (passthrough_object_) |
| 420 WebBindings::releaseObject(passthrough_object_); | 422 WebBindings::releaseObject(passthrough_object_); |
| 421 | 423 |
| 422 passthrough_object_ = passthrough; | 424 passthrough_object_ = passthrough; |
| 423 } | 425 } |
| 424 | 426 |
| 425 } // namespace ppapi | 427 } // namespace ppapi |
| 426 } // namespace webkit | 428 } // namespace webkit |
| 427 | 429 |
| OLD | NEW |