diff --git a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc index 6911f2abc05109a6a97c6a664215d96bc171a2c2..77c0be10cacccd324ae20ff1282807b966324c5e 100644 --- a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc +++ b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.cc @@ -454,7 +454,6 @@ CefRefPtr NWebHandlerDelegate::Create( return handler_delegate; } -int32_t NWebHandlerDelegate::popIndex_ = 0; NWebHandlerDelegate::NWebHandlerDelegate( std::shared_ptr preference_delegate, CefRefPtr render_handler, @@ -1064,19 +1063,17 @@ bool NWebHandlerDelegate::OnPreBeforePopup( switch (target_disposition) { case WOD_NEW_WINDOW: case WOD_NEW_POPUP: { - popIndex_++; popupWindowCallback_ = callback; std::shared_ptr handler = - std::make_shared(popIndex_, true); + std::make_shared(nweb_id_, true); nweb_handler_->OnWindowNewByJS(target_url, true, user_gesture, handler); return false; } case WOD_NEW_BACKGROUND_TAB: case WOD_NEW_FOREGROUND_TAB: { - popIndex_++; popupWindowCallback_ = callback; std::shared_ptr handler = - std::make_shared(popIndex_, true); + std::make_shared(nweb_id_, true); nweb_handler_->OnWindowNewByJS(target_url, false, user_gesture, handler); return false; } @@ -1119,7 +1116,7 @@ bool NWebHandlerDelegate::OnBeforePopup( return true; } std::shared_ptr handler = - std::make_shared(popIndex_, false); + std::make_shared(nweb_id_, false); nweb_handler_->OnWindowNewByJS(target_url, true, user_gesture, handler); if (extra_info) { extra_info->SetInt("nweb_id", handler->GetNWebHandlerId()); diff --git a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h index 1a8cea71b1e788dde401ef7dd0f93a8ef9ec9531..85d3b5ea85a5edb3ed9814fd901d82b9ecc4cebd 100644 --- a/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h +++ b/ohos_nweb/src/cef_delegate/nweb_handler_delegate.h @@ -859,7 +859,6 @@ void OnTouchIconUrlWithSizesReceived( #endif uint32_t window_id_ = 0; bool focusState_ = false; - static int32_t popIndex_; CefRefPtr popupWindowCallback_ = nullptr; #if defined(OHOS_NWEB_EX)