mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium revision 12bfc336 (#338390).
- The ffmpeg library is now statically linked (see https://codereview.chromium.org/1141703002). - Off-screen rendering of the PDF viewer does not work in combination with surfaces. Pass the `--disable-surfaces` command-line flag if GPU is enabled (see https://codereview.chromium.org/1169983006).
This commit is contained in:
		@@ -37,6 +37,10 @@
 | 
			
		||||
#include "include/base/cef_string16.h"
 | 
			
		||||
#include "include/internal/cef_string_types.h"
 | 
			
		||||
 | 
			
		||||
#if defined(BUILDING_CEF_SHARED)
 | 
			
		||||
#include "base/files/file_path.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
///
 | 
			
		||||
// Traits implementation for wide character strings.
 | 
			
		||||
///
 | 
			
		||||
@@ -692,6 +696,17 @@ class CefStringBase {
 | 
			
		||||
    return *this;
 | 
			
		||||
  }
 | 
			
		||||
#endif  // WCHAR_T_IS_UTF32
 | 
			
		||||
#if defined(BUILDING_CEF_SHARED)
 | 
			
		||||
  // The base::FilePath constructor is marked as explicit so provide the
 | 
			
		||||
  // conversion here for convenience.
 | 
			
		||||
  operator base::FilePath() const {
 | 
			
		||||
#if defined(OS_WIN)
 | 
			
		||||
    return base::FilePath(ToWString());
 | 
			
		||||
#else
 | 
			
		||||
    return base::FilePath(ToString());
 | 
			
		||||
#endif
 | 
			
		||||
  }
 | 
			
		||||
#endif  // BUILDING_CEF_SHARED
 | 
			
		||||
 | 
			
		||||
 private:
 | 
			
		||||
  // Allocate the string structure if it doesn't already exist.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user