diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc index f183266df3d6c7fc6abb543ffe3f2fcec87f0b1f..132430d6504c0148ce08ea925c924ccbd10232e7 100644 --- a/content/browser/media/media_web_contents_observer.cc +++ b/content/browser/media/media_web_contents_observer.cc @@ -789,4 +789,11 @@ void MediaWebContentsObserver::RequestExitFullscreen(const MediaPlayerId& player } #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) +void MediaWebContentsObserver::EnableVideoAssistant(bool enable) {} + +void MediaWebContentsObserver::ExecuteVideoAssistantFunction( + const std::string& cmdId) {} +#endif // defined(OHOS_VIDEO_ASSISTANT) + } // namespace content diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h index 8f047e43de0312bf7017e657e9c6a7180f0457ed..c3d053ca932b711a52ed11a3e73dc206ebdfb8d0 100644 --- a/content/browser/media/media_web_contents_observer.h +++ b/content/browser/media/media_web_contents_observer.h @@ -156,6 +156,11 @@ class CONTENT_EXPORT MediaWebContentsObserver void RequestExitFullscreen(const MediaPlayerId& player_id); #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) + void EnableVideoAssistant(bool enable); + void ExecuteVideoAssistantFunction(const std::string& cmdId); +#endif // defined(OHOS_VIDEO_ASSISTANT) + protected: MediaSessionControllersManager* session_controllers_manager() { return session_controllers_manager_.get(); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 4f2e21df64e8788833fc78d76416264d1ab5295e..3fb3b76acf007ddbb541c221b7f8b57d202eb9ff 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -10579,6 +10579,35 @@ void WebContentsImpl::RequestExitFullscreen(const MediaPlayerId& player_id) { } #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) +void WebContentsImpl::EnableVideoAssistant(bool enable) { + media_web_contents_observer()->EnableVideoAssistant(enable); +} + +void WebContentsImpl::ExecuteVideoAssistantFunction(const std::string& cmdId) { + media_web_contents_observer()->ExecuteVideoAssistantFunction(cmdId); +} + +void WebContentsImpl::OnShowToast(double duration, const std::string& toast) { + if (!delegate_) { + LOG(ERROR) << "delegate is nullptr when notify to show toast"; + return; + } + + delegate_->OnShowToast(duration, toast); +} + +void WebContentsImpl::OnShowVideoAssistant( + const std::string& videoAssistantItems) { + if (!delegate_) { + LOG(ERROR) << "delegate is nullptr when notify to show video assistant"; + return; + } + + delegate_->OnShowVideoAssistant(videoAssistantItems); +} +#endif // defined(OHOS_VIDEO_ASSISTANT) + #ifdef OHOS_I18N void WebContentsImpl::UpdateRenderAcceptLanguageIfNeed( const std::string& old_accept_language) { diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 38647d3f284a59e677411f15f38841de5b78d179..51fa8be9275a513e0c97b2103212517120d0f9f0 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -1559,6 +1559,14 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, void RequestEnterFullscreen(const MediaPlayerId& player_id); void RequestExitFullscreen(const MediaPlayerId& player_id); #endif // OHOS_CUSTOM_VIDEO_PLAYER + +#if defined(OHOS_VIDEO_ASSISTANT) + void EnableVideoAssistant(bool enable) override; + void ExecuteVideoAssistantFunction(const std::string& cmdId) override; + void OnShowToast(double duration, const std::string& toast); + void OnShowVideoAssistant(const std::string& videoAssistantItems); +#endif // defined(OHOS_VIDEO_ASSISTANT) + #if defined(OHOS_RENDER_PROCESS_SHARE) const std::string& SharedRenderProcessToken() override; #endif diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index ae9617932e933572c880b478e9343ac2806bbddf..f19018edf32cf7ffe1e4b8aa5cda75acbeb22633 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h @@ -832,6 +832,11 @@ class WebContents : public PageNavigator, virtual bool IsAudioMuted() = 0; virtual void SetAudioMuted(bool mute) = 0; +#if defined(OHOS_VIDEO_ASSISTANT) + virtual void EnableVideoAssistant(bool enable) = 0; + virtual void ExecuteVideoAssistantFunction(const std::string& cmdId) = 0; +#endif // defined(OHOS_VIDEO_ASSISTANT) + #if defined(OHOS_MEDIA_POLICY) //Set whether to the HTML play can be used to control media virtual void SetHtmlPlayEnabled(bool enabled) = 0; diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc index d90ef1361f1bd3241c135ee114a661e652cf617a..1589720a52f0c5fc43c52408d7e7ac6792733ad1 100644 --- a/content/public/browser/web_contents_delegate.cc +++ b/content/public/browser/web_contents_delegate.cc @@ -410,4 +410,12 @@ std::unique_ptr WebContentsDelegate::CreateCustomMediaPlayer( } #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) +void WebContentsDelegate::OnShowToast(double duration, + const std::string& toast) {} + +void WebContentsDelegate::OnShowVideoAssistant( + const std::string& videoAssistantItems) {} +#endif // defined(OHOS_VIDEO_ASSISTANT) + } // namespace content diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index b95a383e11341747a762d93f5194fb83b8116861..bcbe05d6269e4b256bde44aa466acf27198b8200 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -839,6 +839,11 @@ class CONTENT_EXPORT WebContentsDelegate { const MediaInfo& media_info); #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) + virtual void OnShowToast(double duration, const std::string& toast); + virtual void OnShowVideoAssistant(const std::string& videoAssistantItems); +#endif // defined(OHOS_VIDEO_ASSISTANT) + protected: virtual ~WebContentsDelegate(); diff --git a/ohos_build/build/config/ohos.json b/ohos_build/build/config/ohos.json index 05ed4822ca28648b9b62dba756a231325bc2c6ea..7ec779d0adfebb63b6f967a79ec9165c504851eb 100644 --- a/ohos_build/build/config/ohos.json +++ b/ohos_build/build/config/ohos.json @@ -1,873 +1,990 @@ -{ "name": "OHOS_AI", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_API_INIT_WEB_ENGINE", -"owner": "gaolei", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_API_PER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{"name": "OHOS_ARKWEB_ADBLOCK", -"owner": "jianglinyang", -"desc": "ad block", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ARKWEB_EXTENSIONS", -"owner": "", -"desc": "Support extensions in cef", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ASAN", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_AUTOFILL", -"owner": "", -"desc": "enable ohos autofill manager", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "OHOS_DATALIST", -"default": "true" -}, -{ "name": "OHOS_BACKGROUND_COLOR", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_BFCACHE", -"owner": "gaojianhao", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_BUGFIX_CRASH", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CA", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CACHE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CLIPBOARD", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CLOSE_STEPS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_COMPOSITE_RENDER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_COOKIE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_COOKIE_NDK", -"owner": "gaojianhao", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CORS", -"owner": "wanghui", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CRASHPAD", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CSS_FONT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CSS_INPUT_TIME", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CUSTOM_DNS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_CUSTOM_VIDEO_PLAYER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DARKMODE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DATALIST", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DEVTOOLS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DFX_DUMP", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DFX_LOGGING", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DISPLAY_CUTOUT", - "owner": "", - "desc": "", - "effect":"main gn blink_core other", +{ + "name": "OHOS_AI", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_API_INIT_WEB_ENGINE", + "owner": "gaolei", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_API_PER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ARKWEB_ADBLOCK", + "owner": "jianglinyang", + "desc": "ad block", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ARKWEB_EXTENSIONS", + "owner": "luliang zengqiang", + "desc": "Support extensions in cef", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "OHOS_FILE_UPLOAD", + "default": "true" +}, +{ + "name": "OHOS_ASAN", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_AUTOFILL", + "owner": "", + "desc": "enable ohos autofill manager", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "OHOS_DATALIST", + "default": "true" +}, +{ + "name": "OHOS_BACKGROUND_COLOR", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_BFCACHE", + "owner": "gaojianhao", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_BUGFIX_CRASH", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CA", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CACHE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CLIPBOARD", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CLOSE_STEPS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_COMPOSITE_RENDER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_COOKIE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_COOKIE_NDK", + "owner": "gaojianhao", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CORS", + "owner": "wanghui", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CRASHPAD", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CSS_FONT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CSS_INPUT_TIME", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CUSTOM_DNS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_CUSTOM_VIDEO_PLAYER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DARKMODE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DATALIST", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DEVTOOLS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DFX_DUMP", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DFX_LOGGING", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DISPLAY_CUTOUT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", "genCommandline": "", "dependence": "", "default": "true" }, -{ "name": "OHOS_DOWNLOAD", -"owner": "wanghui wanghao wangjing", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DRAG_DROP", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_DRDC", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_EDM_POLICY", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ENABLE_POINTER_HARDENED", -"owner": "", -"desc": "pointer hardened", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ENABLE_RANDOM", -"owner": "", -"desc": "alloc random", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ENCRYPT", -"owner": "", -"desc": "encrypt for cookie", -"effect":"main gn", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_EX_DOWNLOAD", -"owner": "", -"desc": "download feature", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_EX_NETWORK_CONNECTION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_FAVICON", -"owner": "wanghui", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_FCP", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_FILE_UPLOAD", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_FOCUS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_FULLSCREEN", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_GEOLOCATION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_GET_SCROLL_OFFSET", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_HAP_DECOMPRESSED", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_HTML_SELECT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_HTTP_DNS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_I18N", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_INCOGNITO_MODE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_INIT_CALLBACK", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_INPUT_EVENTS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ITP", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_JSPROXY", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_LOAD_PER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_LOG_MESSAGE", -"owner": "gaojianhao", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEDIA", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEDIA_AVSESSION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEDIA_MUTE_AUDIO", -"owner": "gaolei", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEDIA_PER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEDIA_POLICY", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MEM", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MIXED_CONTENT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MSGPORT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_MULTI_WINDOW", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NAVIGATION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NDK", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NETWORK_CONNINFO", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NETWORK_LOAD", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NETWORK_PROXY", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_NO_STATE_PREFETCH", -"owner": "wanghui wangjing", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PAGE_UP_DOWN", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PASSWORD_AUTOFILL", -"owner": "", -"desc": "Support saving and autofill password though ohos autofill manager", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "OHOS_AUTOFILL", -"default": "true" -}, -{ "name": "OHOS_PDF", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PERFORMANCE_DISCARD_BG_WEBPAGE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PERFORMANCE_INC_FREQ", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PERFORMANCE_JITTER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PERFORMANCE_MEMORY_THRESHOLD", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PERFORMANCE_PERSISTENT_TASK", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PER_DFX", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_POST_URL", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_PRINT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_RENDERER_ANR_DUMP", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_RENDER_PROCESS_MODE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ -"name": "OHOS_RENDER_PROCESS_SHARE", -"owner": "", -"desc": "", -"effect": "main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SCHEME_HANDLER", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SCREEN_LOCK", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SCREEN_ROTATION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SCROLLBAR", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SCROLL_PERFORMANCE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SECURE_JAVASCRIPT_PROXY", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SECURITY_STATE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SENSOR", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SITE_ISOLATION", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SLIDE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SOFTWARE_COMPOSITOR", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SSL_AUTH_ALGO", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_SUSPEND_ALL_TIMERS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_UNITTESTS", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_URL_TRUST_LIST", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_USERAGENT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_VIEWPORT", -"owner": "", -"desc": "adapt viewport", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_WARMUP_SERVICEWORKER", -"owner": "gaojianhao", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_WEBRTC", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_WEBSTORAGE", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_WEB_LTPO", -"owner": "", -"desc": "", -"effect":"web ltpo vsync", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_WPT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "OHOS_ZOOM", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" -}, -{ "name": "REPORT_SYS_EVENT", -"owner": "", -"desc": "", -"effect":"main gn blink_core other", -"genCommandline": "default", -"dependence": "", -"default": "true" +{ + "name": "OHOS_DOWNLOAD", + "owner": "wanghui wanghao wangjing", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DRAG_DROP", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_DRDC", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_EDM_POLICY", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ENABLE_POINTER_HARDENED", + "owner": "", + "desc": "pointer hardened", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ENABLE_RANDOM", + "owner": "", + "desc": "alloc random", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ENCRYPT", + "owner": "", + "desc": "encrypt for cookie", + "effect": "main gn", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_EX_DOWNLOAD", + "owner": "", + "desc": "download feature", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_EX_NETWORK_CONNECTION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_FAVICON", + "owner": "wanghui", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_FCP", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_FILE_UPLOAD", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_FOCUS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_FULLSCREEN", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_GEOLOCATION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_GET_SCROLL_OFFSET", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" }, +{ + "name": "OHOS_HAP_DECOMPRESSED", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_HTML_SELECT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_HTTP_DNS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_I18N", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_INCOGNITO_MODE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_INIT_CALLBACK", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_INPUT_EVENTS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ITP", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_JSPROXY", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_LOAD_PER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_LOG_MESSAGE", + "owner": "gaojianhao", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEDIA", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEDIA_AVSESSION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEDIA_MUTE_AUDIO", + "owner": "gaolei", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEDIA_PER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEDIA_POLICY", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MEM", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MIXED_CONTENT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MSGPORT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_MULTI_WINDOW", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NAVIGATION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NDK", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NETWORK_CONNINFO", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NETWORK_LOAD", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NETWORK_PROXY", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_NO_STATE_PREFETCH", + "owner": "wanghui wangjing", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PAGE_UP_DOWN", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PASSWORD_AUTOFILL", + "owner": "", + "desc": "Support saving and autofill password though ohos autofill manager", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "OHOS_AUTOFILL", + "default": "true" +}, +{ + "name": "OHOS_PDF", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PERFORMANCE_DISCARD_BG_WEBPAGE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PERFORMANCE_INC_FREQ", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PERFORMANCE_JITTER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PERFORMANCE_MEMORY_THRESHOLD", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PERFORMANCE_PERSISTENT_TASK", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PER_DFX", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_POST_URL", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_PRINT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_RENDERER_ANR_DUMP", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_RENDER_PROCESS_MODE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_RENDER_PROCESS_SHARE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SCHEME_HANDLER", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SCREEN_LOCK", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SCREEN_ROTATION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SCROLLBAR", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SCROLL_PERFORMANCE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SECURE_JAVASCRIPT_PROXY", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SECURITY_STATE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SENSOR", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SITE_ISOLATION", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SLIDE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SOFTWARE_COMPOSITOR", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SSL_AUTH_ALGO", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_SUSPEND_ALL_TIMERS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_UNITTESTS", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_URL_TRUST_LIST", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_USERAGENT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_VIDEO_ASSISTANT", + "owner": "", + "desc": "video assistant", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_VIEWPORT", + "owner": "", + "desc": "adapt viewport", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_WARMUP_SERVICEWORKER", + "owner": "gaojianhao", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_WEBRTC", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_WEBSTORAGE", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_WEB_LTPO", + "owner": "", + "desc": "", + "effect": "web ltpo vsync", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_WPT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "OHOS_ZOOM", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +}, +{ + "name": "REPORT_SYS_EVENT", + "owner": "", + "desc": "", + "effect": "main gn blink_core other", + "genCommandline": "default", + "dependence": "", + "default": "true" +} diff --git a/ohos_nweb/src/capi/nweb_app_client_extension_callback.h b/ohos_nweb/src/capi/nweb_app_client_extension_callback.h index 73de18a1427f47b8988df49444fdbd25ec0ea95c..93722f1042db54f25743d07a40cd77d48565a7cd 100644 --- a/ohos_nweb/src/capi/nweb_app_client_extension_callback.h +++ b/ohos_nweb/src/capi/nweb_app_client_extension_callback.h @@ -60,6 +60,11 @@ struct NWebAppClientExtensionCallback { #endif void (*OnRequestOpenDevTools)(int32_t nweb_id); + + void (*OnShowToast)(int32_t nweb_id, double duration, const char* toast); + + void (*OnShowVideoAssistant)(int32_t nweb_id, + const char* video_assistant_items); }; #endif // OHOS_NWEB_SRC_NWEB_APP_CLIENT_EXTENSION_CALLBACK_H_ diff --git a/ohos_nweb/src/cef_delegate/nweb_delegate.cc b/ohos_nweb/src/cef_delegate/nweb_delegate.cc index 7f1e4054a79ef983fab1229a7c37d206c5795610..6fe51eaca70df5d3b1723b3d6312d6f77029e835 100644 --- a/ohos_nweb/src/cef_delegate/nweb_delegate.cc +++ b/ohos_nweb/src/cef_delegate/nweb_delegate.cc @@ -4170,6 +4170,26 @@ void NWebDelegate::RegisterOnCreateNativeMediaPlayerListener( } #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) +void NWebDelegate::EnableVideoAssistant(bool enable) { + if (GetBrowser() == nullptr || GetBrowser()->GetHost() == nullptr) { + LOG(ERROR) << "failed to get host when enable video assistant"; + return; + } + + GetBrowser()->GetHost()->EnableVideoAssistant(enable); +} + +void NWebDelegate::ExecuteVideoAssistantFunction(const std::string& cmd_id) { + if (GetBrowser() == nullptr || GetBrowser()->GetHost() == nullptr) { + LOG(ERROR) << "failed to get host when execute video assistant function"; + return; + } + + GetBrowser()->GetHost()->ExecuteVideoAssistantFunction(cmd_id); +} +#endif // defined(OHOS_VIDEO_ASSISTANT) + #if defined(OHOS_CLIPBOARD) void NWebDelegate::SetIsRichText(bool is_rich_text) { if (!handler_delegate_) { diff --git a/ohos_nweb/src/cef_delegate/nweb_delegate.h b/ohos_nweb/src/cef_delegate/nweb_delegate.h index 1b2e6a7413b92cd581f2b35ea1bbe9c483d34e16..55b161c4de6df56591c910077f4e63c667fa1cf2 100644 --- a/ohos_nweb/src/cef_delegate/nweb_delegate.h +++ b/ohos_nweb/src/cef_delegate/nweb_delegate.h @@ -620,6 +620,11 @@ void NotifyForNextTouchEvent() override; std::shared_ptr callback) override; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) + void EnableVideoAssistant(bool enable) override; + void ExecuteVideoAssistantFunction(const std::string& cmd_id) override; +#endif // defined(OHOS_VIDEO_ASSISTANT) + std::shared_ptr GetCustomKeyboardHandler() const override { if (render_handler_) { return render_handler_->GetCustomKeyboardHandler(); diff --git a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc index 9a0dd8749e7e873a449201e000d2a9f4b5001b14..7d1fb2d7533fe715091ca20b96c4534b65b9b44e 100644 --- a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc +++ b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc @@ -3767,6 +3767,43 @@ NWebHandlerDelegate::OnCreateCustomMediaPlayer( } #endif // OHOS_CUSTOM_VIDEO_PLAYER +void NWebHandlerDelegate::OnShowToast(double duration, const CefString& toast) { +#if defined(OHOS_VIDEO_ASSISTANT) + if (!web_app_client_extension_listener_) { + LOG(WARNING) << "application extension listener is nullptr"; + return; + } + + if (!web_app_client_extension_listener_->OnShowToast) { + LOG(WARNING) << "show toast callback is nullptr"; + return; + } + + web_app_client_extension_listener_->OnShowToast( + web_app_client_extension_listener_->nweb_id, duration, + toast.ToString().c_str()); +#endif // defined(OHOS_VIDEO_ASSISTANT) +} + +void NWebHandlerDelegate::OnShowVideoAssistant( + const CefString& videoAssistantItems) { +#if defined(OHOS_VIDEO_ASSISTANT) + if (!web_app_client_extension_listener_) { + LOG(WARNING) << "application extension listener is nullptr"; + return; + } + + if (!web_app_client_extension_listener_->OnShowVideoAssistant) { + LOG(WARNING) << "show video assistant callback is nullptr"; + return; + } + + web_app_client_extension_listener_->OnShowVideoAssistant( + web_app_client_extension_listener_->nweb_id, + videoAssistantItems.ToString().c_str()); +#endif // defined(OHOS_VIDEO_ASSISTANT) +} + #if defined(OHOS_RENDERER_ANR_DUMP) void NWebHandlerDelegate::OnRenderProcessNotResponding( CefRefPtr browser, diff --git a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h index ef8b2f63718625690b68a6f0ccae7a5579be0714..d50a7b39fa9bbec77ca819e7b5f0a03671653194 100644 --- a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h +++ b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h @@ -743,6 +743,9 @@ class NWebHandlerDelegate : public CefClient, const CefCustomMediaInfo& media_info) override; #endif // OHOS_CUSTOM_VIDEO_PLAYER + void OnShowToast(double duration, const CefString& toast) override; + void OnShowVideoAssistant(const CefString& videoAssistantItems) override; + #if defined(OHOS_CLIPBOARD) void SetIsRichText(bool is_rich_text) { is_rich_text_ = is_rich_text; } #endif diff --git a/ohos_nweb/src/nweb_delegate_interface.h b/ohos_nweb/src/nweb_delegate_interface.h index 5e1662ffd7d8e4c9e2368329faa34f611b909de2..e32322137399415000637b51913614581b39c105 100644 --- a/ohos_nweb/src/nweb_delegate_interface.h +++ b/ohos_nweb/src/nweb_delegate_interface.h @@ -511,6 +511,11 @@ class NWebDelegateInterface std::shared_ptr callback) = 0; #endif // OHOS_CUSTOM_VIDEO_PLAYER +#if defined(OHOS_VIDEO_ASSISTANT) + virtual void EnableVideoAssistant(bool enable) = 0; + virtual void ExecuteVideoAssistantFunction(const std::string& cmd_id) = 0; +#endif // defined(OHOS_VIDEO_ASSISTANT) + #ifdef OHOS_EX_DOWNLOAD virtual NWebDownloadItemState GetDownloadItemState(long item_id) = 0; #endif diff --git a/ohos_nweb/src/nweb_impl.cc b/ohos_nweb/src/nweb_impl.cc index 8bd65a3991dad52300e7e8e731ca912f9db33368..a4aeb65b555094e5e589881419d2bae3064b72c9 100644 --- a/ohos_nweb/src/nweb_impl.cc +++ b/ohos_nweb/src/nweb_impl.cc @@ -2526,6 +2526,25 @@ void NWebImpl::CloseDevtools() { } #endif // defined(OHOS_NWEB_EX) +#if defined(OHOS_VIDEO_ASSISTANT) +void NWebImpl::EnableVideoAssistant(bool enable) { + if (nweb_delegate_ == nullptr) { + LOG(WARNING) << "nweb delegate is nullptr when enable video assistant"; + return; + } + nweb_delegate_->EnableVideoAssistant(enable); +} + +void NWebImpl::ExecuteVideoAssistantFunction(const std::string& cmd_id) { + if (nweb_delegate_ == nullptr) { + LOG(WARNING) + << "nweb delegate is nullptr when execute video assistant function"; + return; + } + nweb_delegate_->ExecuteVideoAssistantFunction(cmd_id); +} +#endif // defined(OHOS_VIDEO_ASSISTANT) + #ifdef OHOS_EX_NETWORK_CONNECTION // static void NWebImpl::SetConnectTimeout(int32_t seconds) { diff --git a/ohos_nweb/src/nweb_impl.h b/ohos_nweb/src/nweb_impl.h index 759415d5743a877f960478292c62ca410d030be0..55a070c2b937e5d8d286edc59c62a48119a3ad2f 100644 --- a/ohos_nweb/src/nweb_impl.h +++ b/ohos_nweb/src/nweb_impl.h @@ -415,6 +415,11 @@ class NWebImpl : public NWeb { void CloseDevtools(); #endif // defined(OHOS_NWEB_EX) +#if defined(OHOS_VIDEO_ASSISTANT) + void EnableVideoAssistant(bool enable); + void ExecuteVideoAssistantFunction(const std::string& cmd_id); +#endif // defined(OHOS_VIDEO_ASSISTANT) + #ifdef OHOS_EX_NETWORK_CONNECTION static void SetConnectTimeout(int32_t seconds); #endif