Quellcode durchsuchen

!2 upload new cefclient and modify params

chenliangyu vor 1 Jahr
Ursprung
Commit
f0653f1862
2 geänderte Dateien mit 12 neuen und 35 gelöschten Zeilen
  1. 10 33
      Module/mod_chromium/CModTools.cpp
  2. 2 2
      addin/cmake/DependencyConanFiles.cmake

+ 10 - 33
Module/mod_chromium/CModTools.cpp

@@ -258,14 +258,11 @@ namespace Chromium {
         this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(errType._to_string());
 		errPageUrl.Append(" --cache-path=").Append(cachePath);
-        if (g_useMagic)
-			errPageUrl.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			errPageUrl.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
 			errPageUrl.Append(" --with-console");
-		errPageUrl.Append(" --no-sandbox").Append(" --hide-controls").Append(" --hide-tabs");
-		errPageUrl.Append(" --top=-1");
+		errPageUrl.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame").Append(" --always-on-top");
 
         switch (errType) {
         case ERR_PAGE_REASON::TerminalManagerKickOut:
@@ -477,17 +474,12 @@ namespace Chromium {
         this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append((+ERR_PAGE_REASON::Ad)._to_string());
         strCmdLine.Append(" --cache-path=").Append(cachePath);
-        if (g_useMagic)
-            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
 			strCmdLine.Append(" --with-console");
-        strCmdLine.Append(" --no-sandbox");
-        strCmdLine.Append(" --hide-controls");
-        strCmdLine.Append(" --hide-tabs");
+        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame");
         strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::Ad)._to_string());
-        strCmdLine.Append(" --top=-1");
         strCmdLine.Append(" --run-extend");
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
         return strCmdLine.GetData();
@@ -509,19 +501,14 @@ namespace Chromium {
             .Append(isExtend ? (+ERR_PAGE_REASON::extend)._to_string() : (+ERR_PAGE_REASON::main)._to_string());
         //strCmdLine.Append(" --hide-controls=true")
         strCmdLine.Append(" --cache-path=").Append(cachePath);
-        strCmdLine.Append(" --no-sandbox");
-        strCmdLine.Append(" --hide-controls");
-        if (g_useMagic)
-            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
+        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame");
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
 			strCmdLine.Append(" --with-console");
-        strCmdLine.Append(" --hide-tabs");
         if (m_withDebugMode)
             strCmdLine.Append(" --remote-debugging-port=9222");
         if (isExtend) {
-            strCmdLine.Append(" --with-tab");
             strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::extend)._to_string());
         } else
             strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::slv)._to_string());
@@ -551,10 +538,8 @@ namespace Chromium {
 		this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
 		cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append((+ERR_PAGE_REASON::Ad)._to_string());
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
-		strCmdLine.Append(" --no-sandbox");
-		strCmdLine.Append(" --hide-controls");
+		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame");
 		strCmdLine.Append(" --lang=zh-CN");//install page need language chinese
-		strCmdLine.Append(" --hide-tabs");
 		strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::Install)._to_string());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
 		return strCmdLine.GetData();
@@ -659,21 +644,18 @@ namespace Chromium {
 		CSimpleStringA strChromiumPath = GetCefHead(this->m_pEntity), strCmdLine = "";
 		strCmdLine.Append(strChromiumPath).Append(" --url=").Append(url.c_str());
 		if (width > 0 && height > 0)
-			strCmdLine.Append(" --center-size=").Append(std::to_string(width).c_str()).Append("*").Append(std::to_string(height).c_str());
+			strCmdLine.Append(" --window-size=").Append(std::to_string(width).c_str()).Append(",").Append(std::to_string(height).c_str());
 		if (point_x != -1 && point_y != -1)
 		{
-			strCmdLine.Append(" --src-pos=").Append(std::to_string(point_x).c_str()).Append("*").Append(std::to_string(point_y).c_str());
+			strCmdLine.Append(" --window-position=").Append(std::to_string(point_x).c_str()).Append(",").Append(std::to_string(point_y).c_str());
 		}
 		CSimpleStringA cachePath;
 		this->m_pEntity->GetFunction()->GetPath("Temp", cachePath);
 		cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(name.c_str());
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
-		strCmdLine.Append(" --no-sandbox");
-		strCmdLine.Append(" --hide-controls");
+		strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame");
 		strCmdLine.Append(" --lang=zh-CN");//install page need language chinese
-		strCmdLine.Append(" --hide-tabs");
 		strCmdLine.Append(" --logextend=").Append(name.c_str());
-		strCmdLine.Append(" --top=").Append(std::to_string(top).c_str());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s cmdline : %s", name.c_str(), strCmdLine.GetData());
 		return strCmdLine.GetData();
 #endif
@@ -690,21 +672,16 @@ namespace Chromium {
         cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(m_strCacheHead.length() > 0 ? m_strCacheHead.c_str() : "").Append(m_specialPage_temp_name.c_str());
         //strCmdLine.Append(" --hide-controls=true")
         strCmdLine.Append(" --cache-path=").Append(cachePath);
-        strCmdLine.Append(" --no-sandbox");//don't use single-process, it will affect the cef log
-        strCmdLine.Append(" --hide-controls");
-        if (g_useMagic)
-            strCmdLine.Append(" --magic-str=").Append(m_magicStr.c_str());
+        strCmdLine.Append(" --no-sandbox").Append(" --hide-controls --hide-overlays --hide-frame");;//don't use single-process, it will affect the cef log
 		if (g_withMedia)
 			strCmdLine.Append(" --enable-media-stream=1 --enable-speech-input=1");
 		if (g_withConsole)
 			strCmdLine.Append(" --with-console");
-        strCmdLine.Append(" --hide-tabs");
         strCmdLine.Append(" --logextend=").Append(m_specialPage_temp_name.c_str());
         if (m_specialPage_temp_size.length() > 0)
-            strCmdLine.Append(" --center-size=").Append(m_specialPage_temp_size.c_str());
+            strCmdLine.Append(" --window-size=").Append(m_specialPage_temp_size.c_str());
         if (m_specialPage_temp_point.length() > 0)
-            strCmdLine.Append(" --src-pos=").Append(m_specialPage_temp_point.c_str());
-        strCmdLine.Append(" --top=").Append(std::to_string((unsigned long long)m_specialPage_temp_top).c_str());
+            strCmdLine.Append(" --window-positio=").Append(m_specialPage_temp_point.c_str());
         strCmdLine.Append(" --errurl=file:\/\/\/").Append(getErrUrl(ERR_PAGE_REASON::main).second.c_str());
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("cmdline : %s", strCmdLine.GetData());
         return strCmdLine.GetData();

+ 2 - 2
addin/cmake/DependencyConanFiles.cmake

@@ -69,7 +69,7 @@ if(MSVC)
 			#mod_chromium
 			CEFControl/1.0@LR04.02_ThirdParty/testing
 			#mod_chromium
-			cefclient_mutable/2.0.37@LR04.02_ThirdParty/testing
+			cefclient_mutable/3.0.13@LR04.02_ThirdParty/testing
 			#libaudiorender
 			speex/1.2.1@LR04.02_ThirdParty/testing
 			#libvideoframework
@@ -80,7 +80,7 @@ if(MSVC)
 			Misc/2024.0313.1@LR04.02_ThirdParty/msvc
 			)
 			
-	list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.1@LR04.02_ThirdParty/testing)
+	list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/3.0.12@LR04.02_ThirdParty/testing)
 	list(APPEND CONAN_CURPLATFORM_LIB_NAMES RuntimeBase/2024.0401.02@LR04.02_ThirdParty/testing)
 else()
 	set(CONAN_CURPLATFORM_LIB_NAMES