[WEEX-433] [core] Move MeasureFuncAdapter to WeexCoreManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ad6977e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ad6977e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ad6977e Branch: refs/heads/master Commit: 5ad6977e8f0e207a1dd7ae265c4f421b5e4f654a Parents: 379bbdc Author: miomin <[email protected]> Authored: Mon Jun 4 18:02:40 2018 +0800 Committer: YorkShen <[email protected]> Committed: Mon Jun 4 19:44:56 2018 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi-v7a/libweexcore.so | Bin 636788 -> 636788 bytes android/sdk/libs/armeabi/libweexcore.so | Bin 644980 -> 649076 bytes android/sdk/libs/x86/libweexcore.so | Bin 1202076 -> 1206172 bytes .../android/jsengine/multiprocess/WeexProxy.cpp | 2 +- .../Source/core/manager/weex_core_manager.cpp | 10 +++++++--- .../Source/core/manager/weex_core_manager.h | 9 ++++++++- .../Source/core/render/manager/render_manager.h | 9 --------- .../Source/core/render/node/render_object.cpp | 16 +++++++--------- 8 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/android/sdk/libs/armeabi-v7a/libweexcore.so ---------------------------------------------------------------------- diff --git a/android/sdk/libs/armeabi-v7a/libweexcore.so b/android/sdk/libs/armeabi-v7a/libweexcore.so index 3be2444..056c63b 100644 Binary files a/android/sdk/libs/armeabi-v7a/libweexcore.so and b/android/sdk/libs/armeabi-v7a/libweexcore.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/android/sdk/libs/armeabi/libweexcore.so ---------------------------------------------------------------------- diff --git a/android/sdk/libs/armeabi/libweexcore.so b/android/sdk/libs/armeabi/libweexcore.so index 5afdbbc..02b43c6 100644 Binary files a/android/sdk/libs/armeabi/libweexcore.so and b/android/sdk/libs/armeabi/libweexcore.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/android/sdk/libs/x86/libweexcore.so ---------------------------------------------------------------------- diff --git a/android/sdk/libs/x86/libweexcore.so b/android/sdk/libs/x86/libweexcore.so index 0c7b5d8..df17b2e 100644 Binary files a/android/sdk/libs/x86/libweexcore.so and b/android/sdk/libs/x86/libweexcore.so differ http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp b/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp index dbb7d58..f523ea2 100644 --- a/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp +++ b/weex_core/Source/android/jsengine/multiprocess/WeexProxy.cpp @@ -268,7 +268,7 @@ namespace WeexCore { Bridge_Impl_Android::getInstance()->setGlobalRef(jThis); WeexCoreManager::getInstance()->setPlatformBridge(Bridge_Impl_Android::getInstance()); WeexCoreManager::getInstance()->setJSBridge(new JSBridge()); - RenderManager::GetInstance()->SetMeasureFunctionAdapter(new MeasureFunctionAdapterImplAndroid()); + WeexCoreManager::getInstance()->SetMeasureFunctionAdapter(new MeasureFunctionAdapterImplAndroid()); std::unique_ptr<IPCSerializer> serializer(createIPCSerializer()); const std::vector<INIT_FRAMEWORK_PARAMS *> &initFrameworkParams = initFromParam(env, script, http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/weex_core/Source/core/manager/weex_core_manager.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/manager/weex_core_manager.cpp b/weex_core/Source/core/manager/weex_core_manager.cpp index 2b49367..05a736c 100644 --- a/weex_core/Source/core/manager/weex_core_manager.cpp +++ b/weex_core/Source/core/manager/weex_core_manager.cpp @@ -16,9 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -// -// Created by é佩翰 on 2018/5/31. -// #include "weex_core_manager.h" @@ -42,4 +39,11 @@ namespace WeexCore { return this->jsBridge; } + void WeexCoreManager::SetMeasureFunctionAdapter(MeasureFunctionAdapter *measureFunctionAdapter) { + this->m_pMeasureFunctionAdapter = measureFunctionAdapter; + } + + MeasureFunctionAdapter * WeexCoreManager::GetMeasureFunctionAdapter() { + return this->m_pMeasureFunctionAdapter; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/weex_core/Source/core/manager/weex_core_manager.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/manager/weex_core_manager.h b/weex_core/Source/core/manager/weex_core_manager.h index 3d1fd6d..b392d7c 100644 --- a/weex_core/Source/core/manager/weex_core_manager.h +++ b/weex_core/Source/core/manager/weex_core_manager.h @@ -22,12 +22,14 @@ #include <core/bridge/bridge.h> #include <core/bridge/js_bridge.h> +#include <core/layout/measure_func_adapter.h> namespace WeexCore { class WeexCoreManager { private: - Bridge *platformBridge = nullptr; static WeexCoreManager *m_pInstance; + Bridge *platformBridge = nullptr; + MeasureFunctionAdapter *m_pMeasureFunctionAdapter = nullptr; JSBridge* jsBridge = nullptr; private: @@ -65,8 +67,13 @@ namespace WeexCore { WeexCoreManager *setPlatformBridge(Bridge *pBridge); JSBridge* getJSBridge(); + WeexCoreManager *setJSBridge(JSBridge *jsBridge); + void SetMeasureFunctionAdapter(MeasureFunctionAdapter *measureFunctionAdapter); + + MeasureFunctionAdapter *GetMeasureFunctionAdapter(); + }; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/weex_core/Source/core/render/manager/render_manager.h ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/manager/render_manager.h b/weex_core/Source/core/render/manager/render_manager.h index a1bf04b..78206e9 100644 --- a/weex_core/Source/core/render/manager/render_manager.h +++ b/weex_core/Source/core/render/manager/render_manager.h @@ -84,17 +84,8 @@ namespace WeexCore { return m_pInstance; } - void SetMeasureFunctionAdapter(MeasureFunctionAdapter *measureFunctionAdapter) { - this->m_pMeasureFunctionAdapter = measureFunctionAdapter; - } - - MeasureFunctionAdapter *GetMeasureFunctionAdapter() { - return this->m_pMeasureFunctionAdapter; - } - private: static RenderManager *m_pInstance; - MeasureFunctionAdapter *m_pMeasureFunctionAdapter; std::map<std::string, RenderPage *> mPages; }; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ad6977e/weex_core/Source/core/render/node/render_object.cpp ---------------------------------------------------------------------- diff --git a/weex_core/Source/core/render/node/render_object.cpp b/weex_core/Source/core/render/node/render_object.cpp index 7f3140b..4811ebc 100644 --- a/weex_core/Source/core/render/node/render_object.cpp +++ b/weex_core/Source/core/render/node/render_object.cpp @@ -17,7 +17,7 @@ * under the License. */ #include <core/render/node/render_object.h> -#include <core/layout/measure_func_adapter.h> +#include <core/manager/weex_core_manager.h> using namespace std; namespace WeexCore { @@ -92,10 +92,10 @@ namespace WeexCore { size.height = 0; size.width = 0; - if (RenderManager::GetInstance()->GetMeasureFunctionAdapter() == nullptr) + if (WeexCoreManager::getInstance()->GetMeasureFunctionAdapter() == nullptr) return size; - return RenderManager::GetInstance()->GetMeasureFunctionAdapter()->Measure(node, width, widthMeasureMode, height, heightMeasureMode); + return WeexCoreManager::getInstance()->GetMeasureFunctionAdapter()->Measure(node, width, widthMeasureMode, height, heightMeasureMode); } void RenderObject::BindMeasureFunc() { @@ -103,16 +103,14 @@ namespace WeexCore { } void RenderObject::onLayoutBefore() { - if (RenderManager::GetInstance()->GetMeasureFunctionAdapter() == nullptr) + if (WeexCoreManager::getInstance()->GetMeasureFunctionAdapter() == nullptr) return; - - RenderManager::GetInstance()->GetMeasureFunctionAdapter()->LayoutBefore(this); + WeexCoreManager::getInstance()->GetMeasureFunctionAdapter()->LayoutBefore(this); } void RenderObject::onLayoutAfter(float width, float height) { - if (RenderManager::GetInstance()->GetMeasureFunctionAdapter() == nullptr) + if (WeexCoreManager::getInstance()->GetMeasureFunctionAdapter() == nullptr) return; - - RenderManager::GetInstance()->GetMeasureFunctionAdapter()->LayoutAfter(this, width, height); + WeexCoreManager::getInstance()->GetMeasureFunctionAdapter()->LayoutAfter(this, width, height); } } //end WeexCore
