From 4147b27e3bfe8d0dc0ca97cb3f8bf13ea93aa0ed Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 29 Aug 2017 17:19:28 +0800 Subject: [PATCH] fix WebView bug for fireball/issues/6328 --- .../java/src/org/cocos2dx/lib/Cocos2dxWebViewHelper.java | 2 ++ native/cocos/ui/UIWebView-inl.h | 8 +++++++- native/cocos/ui/UIWebView.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxWebViewHelper.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxWebViewHelper.java index 012d4b62bb..d18e4e88f4 100755 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxWebViewHelper.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxWebViewHelper.java @@ -101,6 +101,8 @@ public class Cocos2dxWebViewHelper { if (webView != null) { webViews.remove(index); sLayout.removeView(webView); + webView.destroy(); + webView = null; } } }); diff --git a/native/cocos/ui/UIWebView-inl.h b/native/cocos/ui/UIWebView-inl.h index 0557d09a20..586922f4de 100644 --- a/native/cocos/ui/UIWebView-inl.h +++ b/native/cocos/ui/UIWebView-inl.h @@ -156,7 +156,13 @@ namespace experimental{ Widget::onExit(); _impl->setVisible(false); } - + + void WebView::cleanup() + { + ProtectedNode::cleanup(); + _impl->loadURL("about:blank"); + } + void WebView::setBounces(bool bounces) { _impl->setBounces(bounces); diff --git a/native/cocos/ui/UIWebView.h b/native/cocos/ui/UIWebView.h index 1b879521b0..c2fe51b702 100644 --- a/native/cocos/ui/UIWebView.h +++ b/native/cocos/ui/UIWebView.h @@ -211,6 +211,7 @@ public: virtual void setVisible(bool visible) override; virtual void onEnter() override; virtual void onExit() override; + virtual void cleanup() override; protected: virtual cocos2d::ui::Widget* createCloneInstance() override;