Update core to support customization of CEF helper process (CEFVIEW_W…

…ING_NAME)
CefView · Nov 23, 2023 · ba58bed · ba58bed
1 parent e2c901a
commit ba58bed
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/CefViewCore b/CefViewCore
diff --git a/include/QCefView.h b/include/QCefView.h
@@ -398,15 +398,15 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
 
 protected:
   /// <summary>
-  ///
+  /// Gets called before a new browser created (only for browser created by non-JavaScript)
   /// </summary>
-  /// <param name="sourceFrameId"></param>
-  /// <param name="url"></param>
-  /// <param name="name"></param>
-  /// <param name="targetDisposition"></param>
-  /// <param name="rect"></param>
-  /// <param name="settings"></param>
-  /// <param name="disableJavascriptAccess"></param>
+  /// <param name="frameId">The source frame id</param>
+  /// <param name="url">The target URL</param>
+  /// <param name="name">The target name</param>
+  /// <param name="targetDisposition">Target window open method</param>
+  /// <param name="rect">Rect to be used for the popup</param>
+  /// <param name="settings">Settings to be used for the popup</param>
+  /// <returns>True to cancel the popup; false to allow</returns>
   /// <returns></returns>
   virtual QCefView* onNewBrowser(qint64 sourceFrameId,
                                  const QString& url,
@@ -416,7 +416,7 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
                                  QCefSetting& settings);
 
   /// <summary>
-  /// Gets called before the popup browser created
+  /// Gets called before the popup browser created (only for browser created by JavaScript)
   /// </summary>
   /// <param name="frameId">The source frame id</param>
   /// <param name="targetUrl">The target URL</param>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -69,7 +69,7 @@ if(OS_WINDOWS)
     # copy binary files of CefViewCore
     COMMAND ${CMAKE_COMMAND}
     -E copy_directory
-    "$<TARGET_FILE_DIR:CefViewWing>"
+    "$<TARGET_FILE_DIR:${CEFVIEW_WING_NAME}>"
     "$<TARGET_FILE_DIR:QCefView>"
 
     # gnerate a file contains timestamp

diff --git a/src/details/QCefConfigPrivate.cpp b/src/details/QCefConfigPrivate.cpp
@@ -7,6 +7,7 @@
 #pragma endregion qt_headers
 
 #include <CefViewCoreProtocol.h>
+#include <CefViewWingProcessName.h>
 
 QCefConfigPrivate::QCefConfigPrivate()
 {

diff --git a/src/mac/details/QCefContextPrivate_mac.mm b/src/mac/details/QCefContextPrivate_mac.mm
@@ -9,12 +9,15 @@
 #include <include/wrapper/cef_library_loader.h>
 #pragma endregion cef_headers
 
+#include <CefViewCoreProtocol.h>
+#include <CefViewWingProcessName.h>
+
 #include "../../details/QCefConfigPrivate.h"
 
 #define CEF_BINARY_NAME "Chromium Embedded Framework"
 #define CEF_FRAMEWORK_NAME "Chromium Embedded Framework.framework"
-#define HELPER_BUNDLE_NAME "CefViewWing.app"
-#define HELPER_BINARY_NAME "CefViewWing"
+#define HELPER_BINARY_NAME kCefViewRenderProcessName
+#define HELPER_BUNDLE_NAME HELPER_BINARY_NAME ".app"
 #define PLUGINS_NAME "PlugIns"
 
 @interface PathFactory : NSObject
+19 −3		CMakeLists.txt
+0 −5		include/CefViewCoreProtocol.h
+12 −0		include/CefViewWingProcessName.h
+19 −0		include/CefViewWingProcessName.h.in
+125 −126		src/CMakeLists.txt