Index: ppapi/cpp/completion_callback.h |
diff --git a/ppapi/cpp/completion_callback.h b/ppapi/cpp/completion_callback.h |
index 2391a3a5e1b506e61ba69d3a4ff801ff545cf267..ec892f6f650b981b1a6a22b1dbb8b0cf131b6324 100644 |
--- a/ppapi/cpp/completion_callback.h |
+++ b/ppapi/cpp/completion_callback.h |
@@ -99,7 +99,7 @@ class CompletionCallback { |
/// On synchronous method completion, the completion result will be returned |
/// by the method itself. Otherwise, the method will return |
/// PP_OK_COMPLETIONPENDING, and the callback will be invoked asynchronously |
- /// on the main thread of Pepper execution. |
+ /// on the same thread where the PPB method was invoked. |
/// |
/// @return true if this callback is optional, otherwise false. |
bool IsOptional() const { |
@@ -150,6 +150,7 @@ class CompletionCallback { |
int32_t MayForce(int32_t result) const { |
if (result == PP_OK_COMPLETIONPENDING || IsOptional()) |
return result; |
+ // FIXME(dmichael): Use pp::MessageLoop here once it's out of Dev. |
Module::Get()->core()->CallOnMainThread(0, *this, result); |
return PP_OK_COMPLETIONPENDING; |
} |