You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/09 10:52:51 UTC
[1/2] incubator-weex git commit: fix WXWebView weak reference with
delegate when WXWebView dealloc,
fix hit reply too quickly cause view render crash
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev fd8a964a6 -> 53d2073fa
fix WXWebView weak reference with delegate when WXWebView dealloc, fix hit reply too quickly cause view render crash
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56c0f951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56c0f951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56c0f951
Branch: refs/heads/0.11-dev
Commit: 56c0f951e624a94b7a2f5c14c1f3a29015918ff2
Parents: 6e71437
Author: JZTech-Wangll <Lo...@Louis-MacBook-Pro.local>
Authored: Mon Mar 6 17:50:56 2017 +0800
Committer: JZTech-Wangll <Lo...@Louis-MacBook-Pro.local>
Committed: Mon Mar 6 17:50:56 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Layout/Layout.c | 3 +++
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56c0f951/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
index eb525df..80bd556 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m
@@ -23,7 +23,7 @@
- (void)dealloc
{
if (self) {
- self.delegate = nil;
+// self.delegate = nil;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56c0f951/ios/sdk/WeexSDK/Sources/Layout/Layout.c
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Layout/Layout.c b/ios/sdk/WeexSDK/Sources/Layout/Layout.c
index 87349eb..07b25cc 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/Layout.c
+++ b/ios/sdk/WeexSDK/Sources/Layout/Layout.c
@@ -700,6 +700,9 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, float parentM
float maxHeight = CSS_UNDEFINED;
for (i = startLine; i < childCount; ++i) {
child = node->get_child(node->context, i);
+ if (child == NULL) {
+ return;
+ }
child->line_index = linesCount;
child->next_absolute_child = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56c0f951/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index 8878763..d597225 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -185,7 +185,7 @@ static css_node_t * rootNodeGetChild(void *context, int i)
WXComponentManager *manager = (__bridge WXComponentManager *)(context);
if (i == 0) {
return manager->_rootComponent.cssNode;
- } else if(manager->_fixedComponents.count > 0) {
+ } else if(manager->_fixedComponents.count >= i) {
return ((WXComponent *)((manager->_fixedComponents)[i-1])).cssNode;
}
[2/2] incubator-weex git commit: Merge branch 'master' of
https://github.com/LouisLWang/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch 'master' of https://github.com/LouisLWang/incubator-weex into 0.11-dev
This closes #38
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/53d2073f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/53d2073f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/53d2073f
Branch: refs/heads/0.11-dev
Commit: 53d2073fa6c126b04688362fea973a873bbd3d13
Parents: fd8a964 56c0f95
Author: cxfeng <cx...@apache.org>
Authored: Thu Mar 9 18:52:21 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Thu Mar 9 18:52:21 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXWebComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Layout/Layout.c | 3 +++
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/53d2073f/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------