Upgrade CEF to 3.3029.1611.g44e39a8 / Chromium 58.0.3029.81.

[casparcg] / dependencies64 / cef / linux / include / wrapper / cef_byte_read_handler.h

diff --git a/dependencies64/cef/include/wrapper/cef_byte_read_handler.h b/dependencies64/cef/linux/include/wrapper/cef_byte_read_handler.h
similarity index 92%
rename from dependencies64/cef/include/wrapper/cef_byte_read_handler.h
rename to dependencies64/cef/linux/include/wrapper/cef_byte_read_handler.h
index 2954264d8f0fb0058eefb90a8cb642e3655cc120..bf593d0ab283cd8ac40ad27d25d8cf8eb7b56d89 100644 (file)
--- a/dependencies64/cef/include/wrapper/cef_byte_read_handler.h
+++ b/dependencies64/cef/linux/include/wrapper/cef_byte_read_handler.h
@@ -37,6 +37,8 @@
 #define CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_
 #pragma once
 
+#include "include/base/cef_lock.h"
+#include "include/base/cef_macros.h"
 #include "include/cef_base.h"
 #include "include/cef_stream.h"
 
@@ -53,7 +55,7 @@ class CefByteReadHandler : public CefReadHandler {
   ///
   CefByteReadHandler(const unsigned char* bytes,
                      size_t size,
-                     CefRefPtr<CefBase> source);
+                     CefRefPtr<CefBaseRefCounted> source);
 
   // CefReadHandler methods.
   virtual size_t Read(void* ptr, size_t size, size_t n) OVERRIDE;
@@ -66,10 +68,12 @@ class CefByteReadHandler : public CefReadHandler {
   const unsigned char* bytes_;
   int64 size_;
   int64 offset_;
-  CefRefPtr<CefBase> source_;
+  CefRefPtr<CefBaseRefCounted> source_;
+
+  base::Lock lock_;
 
   IMPLEMENT_REFCOUNTING(CefByteReadHandler);
-  IMPLEMENT_LOCKING(CefByteReadHandler);
+  DISALLOW_COPY_AND_ASSIGN(CefByteReadHandler);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_BYTE_READ_HANDLER_H_