Change V8VarConverter::FromV8Value to complete synchronously if possible

content/renderer/pepper/v8_var_converter.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/v8_var_converter.h"
 
 #include <map>
 #include <stack>
 #include <string>
 
@@ skipping 377 matching lines @@
           return false;
         }
       }
     }
   }
 
   *result = handle_scope.Escape(root);
   return true;
 }
 
-void V8VarConverter::FromV8Value(
+V8VarConverter::VarResult V8VarConverter::FromV8Value(
     v8::Handle<v8::Value> val,
     v8::Handle<v8::Context> context,
     const base::Callback<void(const ScopedPPVar&, bool)>& callback) {
-  ScopedPPVar result_var;
-  if (FromV8ValueInternal(val, context, &result_var)) {
-    resource_converter_->Flush(base::Bind(callback, result_var));
-  } else {
-    message_loop_proxy_->PostTask(
-        FROM_HERE,
-        base::Bind(callback, result_var, false));
-  }
+  VarResult result;
+  result.success = FromV8ValueInternal(val, context, &result.var);
+  if (!result.success)
+    resource_converter_->Reset();
+  result.completed_synchronously = !resource_converter_->NeedsFlush();
+  if (!result.completed_synchronously)
+    resource_converter_->Flush(base::Bind(callback, result.var));
+
+  return result;
 }
 
 bool V8VarConverter::FromV8ValueInternal(
     v8::Handle<v8::Value> val,
     v8::Handle<v8::Context> context,
     ppapi::ScopedPPVar* result_var) {
   v8::Context::Scope context_scope(context);
   v8::HandleScope handle_scope(context->GetIsolate());
 
   HandleVarMap visited_handles;
@@ skipping 121 matching lines @@
             std::string(*name_utf8, name_utf8.length()), child_var);
         DCHECK(success);
       }
     }
   }
   *result_var = root;
   return true;
 }
 
 }  // namespace content