Support asynchronous continuation of custom scheme handler responses (issue #269).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@278 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/cpptoc/scheme_handler_callback_cpptoc.cc

@@ -0,0 +1,65 @@
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// A portion of this file was generated by the CEF translator tool.  When
+// making changes by hand only do so within the body of existing function
+// implementations. See the translator.README.txt file in the tools directory
+// for more information.
+//
+
+#include "libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h"
+
+
+// MEMBER FUNCTIONS - Body may be edited by hand.
+
+void CEF_CALLBACK scheme_handler_callback_headers_available(
+    struct _cef_scheme_handler_callback_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return;
+
+  CefSchemeHandlerCallbackCppToC::Get(self)->HeadersAvailable();
+}
+
+void CEF_CALLBACK scheme_handler_callback_bytes_available(
+    struct _cef_scheme_handler_callback_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return;
+
+  CefSchemeHandlerCallbackCppToC::Get(self)->BytesAvailable();
+}
+
+void CEF_CALLBACK scheme_handler_callback_cancel(
+    struct _cef_scheme_handler_callback_t* self)
+{
+  DCHECK(self);
+  if (!self)
+    return;
+
+  CefSchemeHandlerCallbackCppToC::Get(self)->Cancel();
+}
+
+
+// CONSTRUCTOR - Do not edit by hand.
+
+CefSchemeHandlerCallbackCppToC::CefSchemeHandlerCallbackCppToC(
+    CefSchemeHandlerCallback* cls)
+    : CefCppToC<CefSchemeHandlerCallbackCppToC, CefSchemeHandlerCallback,
+        cef_scheme_handler_callback_t>(cls)
+{
+  struct_.struct_.headers_available = scheme_handler_callback_headers_available;
+  struct_.struct_.bytes_available = scheme_handler_callback_bytes_available;
+  struct_.struct_.cancel = scheme_handler_callback_cancel;
+}
+
+#ifndef NDEBUG
+template<> long CefCppToC<CefSchemeHandlerCallbackCppToC,
+    CefSchemeHandlerCallback, cef_scheme_handler_callback_t>::DebugObjCt = 0;
+#endif
+

libcef_dll/cpptoc/scheme_handler_callback_cpptoc.h

@@ -0,0 +1,35 @@
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+//
+// ---------------------------------------------------------------------------
+//
+// This file was generated by the CEF translator tool and should not edited
+// by hand. See the translator.README.txt file in the tools directory for
+// more information.
+//
+#ifndef _SCHEMEHANDLERCALLBACK_CPPTOC_H
+#define _SCHEMEHANDLERCALLBACK_CPPTOC_H
+
+#ifndef BUILDING_CEF_SHARED
+#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
+#else // BUILDING_CEF_SHARED
+
+#include "include/cef.h"
+#include "include/cef_capi.h"
+#include "libcef_dll/cpptoc/cpptoc.h"
+
+// Wrap a C++ class with a C structure.
+// This class may be instantiated and accessed DLL-side only.
+class CefSchemeHandlerCallbackCppToC
+    : public CefCppToC<CefSchemeHandlerCallbackCppToC, CefSchemeHandlerCallback,
+        cef_scheme_handler_callback_t>
+{
+public:
+  CefSchemeHandlerCallbackCppToC(CefSchemeHandlerCallback* cls);
+  virtual ~CefSchemeHandlerCallbackCppToC() {}
+};
+
+#endif // BUILDING_CEF_SHARED
+#endif // _SCHEMEHANDLERCALLBACK_CPPTOC_H
+

libcef_dll/cpptoc/scheme_handler_cpptoc.cc

@@ -13,26 +13,54 @@
 #include "libcef_dll/cpptoc/scheme_handler_cpptoc.h"
 #include "libcef_dll/ctocpp/request_ctocpp.h"
 #include "libcef_dll/ctocpp/response_ctocpp.h"
+#include "libcef_dll/ctocpp/scheme_handler_callback_ctocpp.h"
 
 
 // MEMBER FUNCTIONS - Body may be edited by hand.
 
 int CEF_CALLBACK scheme_handler_process_request(
     struct _cef_scheme_handler_t* self, cef_request_t* request,
-    cef_string_t* redirectUrl, cef_response_t* response, int* response_length)
+    cef_string_t* redirectUrl, cef_scheme_handler_callback_t* callback)
 {
   DCHECK(self);
   DCHECK(request);
   DCHECK(redirectUrl);
-  DCHECK(response);
-  DCHECK(response_length);
-  if(!self || !request || !redirectUrl || !response || !response_length)
+  if(!self || !request || !redirectUrl)
     return 0;
 
   CefString redirectUrlStr(redirectUrl);
   return CefSchemeHandlerCppToC::Get(self)->ProcessRequest(
       CefRequestCToCpp::Wrap(request), redirectUrlStr,
-      CefResponseCToCpp::Wrap(response), response_length);
+      CefSchemeHandlerCallbackCToCpp::Wrap(callback));
+}
+
+void CEF_CALLBACK scheme_handler_get_response_headers(
+    struct _cef_scheme_handler_t* self, cef_response_t* response,
+    int64* response_length)
+{
+  DCHECK(self);
+  DCHECK(response);
+  DCHECK(response_length);
+  if (!self || !response || !response_length)
+    return;
+
+  CefSchemeHandlerCppToC::Get(self)->GetResponseHeaders(
+      CefResponseCToCpp::Wrap(response), *response_length);
+}
+
+int CEF_CALLBACK scheme_handler_read_response(
+    struct _cef_scheme_handler_t* self, void* data_out, int bytes_to_read,
+    int* bytes_read, cef_scheme_handler_callback_t* callback)
+{
+  DCHECK(self);
+  DCHECK(data_out);
+  DCHECK(bytes_read);
+  if(!self || !data_out || !bytes_read)
+    return 0;
+
+  return CefSchemeHandlerCppToC::Get(self)->ReadResponse(
+      data_out, bytes_to_read, *bytes_read,
+      CefSchemeHandlerCallbackCToCpp::Wrap(callback)) ? 1 : 0;
 }
 
 void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self)
@@ -44,22 +72,6 @@ void CEF_CALLBACK scheme_handler_cancel(struct _cef_scheme_handler_t* self)
   CefSchemeHandlerCppToC::Get(self)->Cancel();
 }
 
-int CEF_CALLBACK scheme_handler_read_response(
-    struct _cef_scheme_handler_t* self, void* data_out, int bytes_to_read,
-    int* bytes_read)
-{
-  DCHECK(self);
-  DCHECK(data_out);
-  DCHECK(bytes_read);
-  if(!self || !data_out || !bytes_read)
-    return 0;
-
-  bool rv = CefSchemeHandlerCppToC::Get(self)->ReadResponse(
-      data_out, bytes_to_read, bytes_read);
-
-  return rv?1:0;
-}
-
 
 // CONSTRUCTOR - Do not edit by hand.
 
@@ -68,8 +80,9 @@ CefSchemeHandlerCppToC::CefSchemeHandlerCppToC(CefSchemeHandler* cls)
         cls)
 {
   struct_.struct_.process_request = scheme_handler_process_request;
-  struct_.struct_.cancel = scheme_handler_cancel;
+  struct_.struct_.get_response_headers = scheme_handler_get_response_headers;
   struct_.struct_.read_response = scheme_handler_read_response;
+  struct_.struct_.cancel = scheme_handler_cancel;
 }
 
 #ifndef NDEBUG