Upgrade CEF to 3.3029.1611.g44e39a8 / Chromium 58.0.3029.81.

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

diff --git a/dependencies64/cef/include/wrapper/cef_stream_resource_handler.h b/dependencies64/cef/linux/include/wrapper/cef_stream_resource_handler.h
similarity index 94%
rename from dependencies64/cef/include/wrapper/cef_stream_resource_handler.h
rename to dependencies64/cef/linux/include/wrapper/cef_stream_resource_handler.h
index e6d09c074cd74ad97d45ed7aaaa648b79f5fd58f..af7fe4af8e6c2af9393d54d1adf63416494ca059 100644 (file)
--- a/dependencies64/cef/include/wrapper/cef_stream_resource_handler.h
+++ b/dependencies64/cef/linux/include/wrapper/cef_stream_resource_handler.h
@@ -37,6 +37,9 @@
 #define CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_
 #pragma once
 
+#include "include/base/cef_logging.h"
+#include "include/base/cef_macros.h"
+#include "include/base/cef_scoped_ptr.h"
 #include "include/cef_base.h"
 #include "include/cef_resource_handler.h"
 #include "include/cef_response.h"
@@ -88,14 +91,15 @@ class CefStreamResourceHandler : public CefResourceHandler {
   bool read_on_file_thread_;
 
   class Buffer;
-  Buffer* buffer_;
-#ifndef NDEBUG
+  scoped_ptr<Buffer> buffer_;
+#if DCHECK_IS_ON()
   // Used in debug builds to verify that |buffer_| isn't being accessed on
   // multiple threads at the same time.
   bool buffer_owned_by_file_thread_;
 #endif
 
   IMPLEMENT_REFCOUNTING(CefStreamResourceHandler);
+  DISALLOW_COPY_AND_ASSIGN(CefStreamResourceHandler);
 };
 
 #endif  // CEF_INCLUDE_WRAPPER_CEF_STREAM_RESOURCE_HANDLER_H_