Merge remote-tracking branch 'remotes/upstream/0.16-dev' into android-feature-boxshadow
# Conflicts: # test/screenshot/border-android.png Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/467386dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/467386dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/467386dd Branch: refs/heads/0.16-dev Commit: 467386dd226c3cb2a8067e831479dbad12cecebe Parents: 2e4d799 c95944b Author: misakuo <misa...@apache.org> Authored: Mon Sep 11 12:02:54 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Mon Sep 11 12:02:54 2017 +0800 ---------------------------------------------------------------------- android/gradle.properties | 5 +- android/jacoco.gradle | 43 +++++++++ .../playground/app/src/main/AndroidManifest.xml | 8 ++ .../alibaba/weex/util/CoverageDataDumper.java | 36 +++++++ .../alibaba/weex/util/JacocoCodeCoverage.java | 93 +++++++++++++++++++ .../weex/appfram/pickers/DatePickerImpl.java | 3 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +- .../Sources/Component/WXComponent_internal.h | 1 + .../WeexSDK/Sources/Component/WXListComponent.m | 4 + .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 +- .../Sources/Manager/WXComponentManager.m | 5 +- .../WeexSDK/Sources/Manager/WXTracingManager.h | 5 + .../WeexSDK/Sources/Manager/WXTracingManager.m | 11 +++ ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 14 ++- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 + .../WeexSDK/Sources/Module/WXPrerenderManager.m | 50 +++++++--- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h | 1 + ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 1 + .../Sources/Protocol/WXAppMonitorProtocol.h | 1 + ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 15 +-- test/pages/modules/modal-event.vue | 2 +- test/pages/modules/picker-event.vue | 6 +- test/run.sh | 25 ++++- test/screenshot/border-ios.png | Bin 126185 -> 128088 bytes test/screenshot/compositing-ios.png | Bin 228306 -> 229534 bytes test/screenshot/image-resize-android.png | Bin 214440 -> 218804 bytes test/screenshot/image-resize-ios.png | Bin 138033 -> 138103 bytes test/scripts/modules/picker-event.test.js | 4 +- 28 files changed, 302 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
