Update to CEF version 3.3239.1716.g735b746

magreenblatt · magreenblatt · commit f92d4063509d · 2017-12-29T13:09:12.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -120,7 +120,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 #
 
 # Specify the CEF distribution version.
-set(CEF_VERSION "3.3202.1686.gd665578")
+set(CEF_VERSION "3.3239.1716.g735b746")
 
 # Determine the platform.
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
diff --git a/native/client_app.cpp b/native/client_app.cpp
@@ -18,8 +18,10 @@ std::set<std::string>& GetTempFilesSet() {
 
 }  // namespace
 
-ClientApp::ClientApp(const std::string& module_dir, const jobject app_handler)
-    : module_dir_(module_dir), app_handler_(NULL) {
+ClientApp::ClientApp(const std::string& module_dir,
+                     const std::string& cache_path,
+                     const jobject app_handler)
+    : module_dir_(module_dir), cache_path_(cache_path), app_handler_(NULL) {
   JNIEnv* env = GetJNIEnv();
   if (env)
     app_handler_ = env->NewGlobalRef(app_handler);
@@ -71,11 +73,18 @@ void ClientApp::OnBeforeCommandLineProcessing(
     // due Java7 is CALayer based instead of NSLayer based.
     command_line->AppendSwitch("use-core-animation");
 #endif  // defined(OS_MACOSX)
+
 #if defined(OS_WIN)
     // To avoid shutdown issues extensions should not be used in combination
     // with multi-threaded-message-loop.
     command_line->AppendSwitch("disable-extensions");
 #endif
+
+    if (cache_path_.empty() &&
+        !command_line->HasSwitch("disable-gpu-shader-disk-cache")) {
+      // Don't create a "GPUCache" directory when cache_path is unspecified.
+      command_line->AppendSwitch("disable-gpu-shader-disk-cache");
+    }
   }
 }
 
diff --git a/native/client_app.h b/native/client_app.h
@@ -13,7 +13,9 @@
 // ClientApp implementation.
 class ClientApp : public CefApp {
  public:
-  explicit ClientApp(const std::string& module_dir, const jobject app_handler);
+  ClientApp(const std::string& module_dir,
+            const std::string& cache_path,
+            const jobject app_handler);
   virtual ~ClientApp();
 
   // CefApp methods
@@ -37,7 +39,8 @@ class ClientApp : public CefApp {
   static void eraseTempFiles();
 
  protected:
-  std::string module_dir_;
+  const std::string module_dir_;
+  const std::string cache_path_;
   jobject app_handler_;
   CefRefPtr<BrowserProcessHandler> process_handler_;
 
diff --git a/native/context.cpp b/native/context.cpp
@@ -101,7 +101,8 @@ bool Context::Initialize(JNIEnv* env,
   // DoMessageLoopWork.
   settings.external_message_pump = external_message_pump_;
 
-  CefRefPtr<ClientApp> client_app(new ClientApp(module_dir, appHandler));
+  CefRefPtr<ClientApp> client_app(
+      new ClientApp(module_dir, CefString(&settings.cache_path), appHandler));
   bool res = false;
 
 #if defined(OS_POSIX)
diff --git a/tools/make_distrib.sh b/tools/make_distrib.sh
@@ -103,10 +103,14 @@ else
     cp -f $OUT_BINARY_PATH/jcef_helper $DISTRIB_LIB_PATH
     cp -f $OUT_BINARY_PATH/icudtl.dat $DISTRIB_LIB_PATH
     cp -f $OUT_BINARY_PATH/libcef.so $DISTRIB_LIB_PATH
+    cp -f $OUT_BINARY_PATH/libEGL.so $DISTRIB_LIB_PATH
+    cp -f $OUT_BINARY_PATH/libGLESv2.so $DISTRIB_LIB_PATH
     cp -f $OUT_BINARY_PATH/natives_blob.bin $DISTRIB_LIB_PATH
     cp -f $OUT_BINARY_PATH/snapshot_blob.bin $DISTRIB_LIB_PATH
+    cp -f $OUT_BINARY_PATH/v8_context_snapshot.bin $DISTRIB_LIB_PATH
     cp -f $OUT_BINARY_PATH/*.pak $DISTRIB_LIB_PATH
     cp -rf $OUT_BINARY_PATH/locales/ $DISTRIB_LIB_PATH
+    cp -rf $OUT_BINARY_PATH/swiftshader/ $DISTRIB_LIB_PATH
   fi
 
   cd tools

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)`
`120`	`120`	`#`
`121`	`121`
`122`	`122`	`# Specify the CEF distribution version.`
`123`		`-set(CEF_VERSION "3.3202.1686.gd665578")`
	`123`	`+set(CEF_VERSION "3.3239.1716.g735b746")`
`124`	`124`
`125`	`125`	`# Determine the platform.`
`126`	`126`	`if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")`