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 2018/06/19 09:41:05 UTC
[18/50] [abbrv] incubator-weex git commit: [WEEX-442][Core] C++ style
format : variable declaration
[WEEX-442][Core] C++ style format : variable declaration
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2504c923
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2504c923
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2504c923
Branch: refs/heads/release
Commit: 2504c9239946b778ecc1a83407163bcfbef217cd
Parents: 9e8a3c1
Author: miomin <mi...@foxmail.com>
Authored: Mon Jun 11 15:45:00 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Tue Jun 12 12:44:03 2018 +0800
----------------------------------------------------------------------
android/playground/app/build.gradle | 2 +-
.../java/com/alibaba/weex/WXApplication.java | 4 +-
.../bridge/impl/weexcore_impl_android.cpp | 10 +-
.../render/action/render_action_add_element.cpp | 48 ++---
.../render/action/render_action_add_element.h | 28 +--
.../render/action/render_action_add_event.cpp | 13 +-
.../render/action/render_action_add_event.h | 8 +-
.../render_action_appendtree_createfinish.cpp | 11 +-
.../render_action_appendtree_createfinish.h | 6 +-
.../render/action/render_action_createbody.cpp | 36 ++--
.../render/action/render_action_createbody.h | 20 +-
.../action/render_action_createfinish.cpp | 6 +-
.../render/action/render_action_createfinish.h | 4 +-
.../core/render/action/render_action_layout.cpp | 27 +--
.../core/render/action/render_action_layout.h | 19 +-
.../action/render_action_move_element.cpp | 20 +-
.../render/action/render_action_move_element.h | 12 +-
.../action/render_action_remove_element.cpp | 10 +-
.../action/render_action_remove_element.h | 6 +-
.../action/render_action_remove_event.cpp | 14 +-
.../render/action/render_action_remove_event.h | 8 +-
.../render/action/render_action_update_attr.cpp | 15 +-
.../render/action/render_action_update_attr.h | 10 +-
.../action/render_action_update_style.cpp | 24 +--
.../render/action/render_action_update_style.h | 14 +-
.../core/render/manager/render_manager.cpp | 66 +++----
.../Source/core/render/manager/render_manager.h | 40 ++--
.../core/render/node/factory/render_creator.cpp | 2 +-
.../core/render/node/factory/render_creator.h | 12 +-
.../node/factory/render_object_interface.h | 20 +-
.../Source/core/render/node/render_appbar.cpp | 12 +-
.../Source/core/render/node/render_appbar.h | 4 +-
.../Source/core/render/node/render_list.cpp | 131 +++++++------
weex_core/Source/core/render/node/render_list.h | 22 +--
.../Source/core/render/node/render_object.cpp | 60 +++---
.../Source/core/render/node/render_object.h | 40 ++--
.../Source/core/render/node/render_scroller.cpp | 6 +-
.../Source/core/render/node/render_scroller.h | 4 +-
.../Source/core/render/page/render_page.cpp | 186 ++++++++-----------
weex_core/Source/core/render/page/render_page.h | 76 ++++----
40 files changed, 527 insertions(+), 529 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/android/playground/app/build.gradle
----------------------------------------------------------------------
diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle
index 5b93f0c..3e4954d 100755
--- a/android/playground/app/build.gradle
+++ b/android/playground/app/build.gradle
@@ -117,7 +117,7 @@ dependencies {
compile 'com.jakewharton.scalpel:scalpel:1.1.2'
compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
- compile 'com.taobao.android:weex_inspector:0.11.0'
+ compile 'com.taobao.android:weex_inspector:0.16.7'
//compile project(":weex_inspector")
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
index e7499f2..35fd36a 100644
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
@@ -63,8 +63,8 @@ public class WXApplication extends Application {
**/
// initDebugEnvironment(true, false, "DEBUG_SERVER_HOST");
WXBridgeManager.updateGlobalConfig("wson_on");
- WXEnvironment.setOpenDebugLog(false);
- WXEnvironment.setApkDebugable(false);
+ WXEnvironment.setOpenDebugLog(true);
+ WXEnvironment.setApkDebugable(true);
WXSDKEngine.addCustomOptions("appName", "WXSample");
WXSDKEngine.addCustomOptions("appGroup", "WXApp");
WXSDKEngine.initialize(this,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp b/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
index 0e5b44e..4138530 100644
--- a/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
+++ b/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
@@ -214,13 +214,13 @@ static jboolean NotifyLayout(JNIEnv* env, jobject jcaller, jstring instanceId) {
RenderPage *page = RenderManager::GetInstance()->GetPage(jString2StrFast(env, instanceId));
if (page != nullptr) {
- if (!page->needLayout.load()) {
- page->needLayout.store(true);
+ if (!page->need_layout.load()) {
+ page->need_layout.store(true);
}
- bool ret = !page->hasForeLayoutAction.load() && page->isDirty();
+ bool ret = !page->has_fore_layout_action.load() && page->isDirty();
if (ret) {
- page->hasForeLayoutAction.store(true);
+ page->has_fore_layout_action.store(true);
}
return ret ? JNI_TRUE : JNI_FALSE;
}
@@ -236,7 +236,7 @@ static void ForceLayout(JNIEnv *env, jobject jcaller, jstring instanceId) {
#endif
page->LayoutImmediately();
- page->hasForeLayoutAction.store(false);
+ page->has_fore_layout_action.store(false);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_add_element.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_add_element.cpp b/weex_core/Source/core/render/action/render_action_add_element.cpp
index 66dcbfb..46cff05 100644
--- a/weex_core/Source/core/render/action/render_action_add_element.cpp
+++ b/weex_core/Source/core/render/action/render_action_add_element.cpp
@@ -23,33 +23,35 @@
namespace WeexCore {
- RenderActionAddElement::RenderActionAddElement(const std::string &pageId,
+ RenderActionAddElement::RenderActionAddElement(const std::string &page_id,
const RenderObject *render,
const RenderObject *parent, int index,
- bool willLayout) {
- this->mAttributes = render->Attributes();
- this->mStyles = render->Styles();
- this->mEvents = render->Events();
- this->mMargins = render->GetMargins();
- this->mPaddings = render->GetPaddings();
- this->mBorders = render->GetBorders();
- this->mPageId = pageId;
- this->mComponentType = render->Type();
- this->mRef = render->Ref();
- this->mParentRef = parent->Ref();
- this->mIndex = index;
- this->mWillLayout = willLayout;
+ bool will_layout) {
+ this->attributes = render->Attributes();
+ this->styles = render->Styles();
+ this->events = render->Events();
+ this->margins = render->GetMargins();
+ this->paddings = render->GetPaddings();
+ this->borders = render->GetBorders();
+ this->page_id = page_id;
+ this->component_type = render->Type();
+ this->ref = render->Ref();
+ this->parent_ref = parent->Ref();
+ this->index = index;
+ this->will_layout = will_layout;
}
void RenderActionAddElement::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callAddElement(mPageId.c_str(),
- mComponentType.c_str(),
- mRef.c_str(),
- mIndex, mParentRef.c_str(),
- mStyles,
- mAttributes,
- mEvents, mMargins,
- mPaddings, mBorders,
- mWillLayout);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callAddElement(this->page_id.c_str(),
+ this->component_type.c_str(),
+ this->ref.c_str(),
+ this->index,
+ this->parent_ref.c_str(),
+ this->styles,
+ this->attributes,
+ this->events, this->margins,
+ this->paddings,
+ this->borders,
+ this->will_layout);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_add_element.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_add_element.h b/weex_core/Source/core/render/action/render_action_add_element.h
index 3c91754..69b9d06 100644
--- a/weex_core/Source/core/render/action/render_action_add_element.h
+++ b/weex_core/Source/core/render/action/render_action_add_element.h
@@ -33,25 +33,25 @@ namespace WeexCore {
class RenderActionAddElement : public RenderAction {
public:
- explicit RenderActionAddElement(const std::string &pageId, const RenderObject *render,
+ explicit RenderActionAddElement(const std::string &page_id, const RenderObject *render,
const RenderObject *parent,
- int index, bool willLayout = true);
+ int index, bool will_layout = true);
void ExecuteAction();
public:
- std::map<std::string, std::string> *mStyles;
- std::map<std::string, std::string> *mAttributes;
- std::set<std::string> *mEvents;
- WXCoreMargin mMargins;
- WXCorePadding mPaddings;
- WXCoreBorderWidth mBorders;
- std::string mPageId;
- std::string mComponentType;
- std::string mParentRef;
- std::string mRef;
- int mIndex;
- bool mWillLayout;
+ std::map<std::string, std::string> *styles;
+ std::map<std::string, std::string> *attributes;
+ std::set<std::string> *events;
+ WXCoreMargin margins;
+ WXCorePadding paddings;
+ WXCoreBorderWidth borders;
+ std::string page_id;
+ std::string component_type;
+ std::string parent_ref;
+ std::string ref;
+ int index;
+ bool will_layout;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_add_event.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_add_event.cpp b/weex_core/Source/core/render/action/render_action_add_event.cpp
index 8005daa..98bb6c8 100644
--- a/weex_core/Source/core/render/action/render_action_add_event.cpp
+++ b/weex_core/Source/core/render/action/render_action_add_event.cpp
@@ -22,16 +22,17 @@
namespace WeexCore {
- RenderActionAddEvent::RenderActionAddEvent(const std::string &pageId, const std::string &ref,
+ RenderActionAddEvent::RenderActionAddEvent(const std::string &page_id, const std::string &ref,
const std::string &event) {
- this->mPageId = pageId;
- this->mRef = ref;
- this->mEvent = event;
+ this->page_id = page_id;
+ this->ref = ref;
+ this->event = event;
}
void RenderActionAddEvent::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callAddEvent(mPageId.c_str(), mRef.c_str(),
- mEvent.c_str());
+ WeexCoreManager::getInstance()->getPlatformBridge()->callAddEvent(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->event.c_str());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_add_event.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_add_event.h b/weex_core/Source/core/render/action/render_action_add_event.h
index 680f87e..852549c 100644
--- a/weex_core/Source/core/render/action/render_action_add_event.h
+++ b/weex_core/Source/core/render/action/render_action_add_event.h
@@ -28,15 +28,15 @@ namespace WeexCore {
class RenderActionAddEvent : public RenderAction {
public:
- explicit RenderActionAddEvent(const std::string &pageId, const std::string &ref,
+ explicit RenderActionAddEvent(const std::string &page_id, const std::string &ref,
const std::string &event);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
- std::string mEvent;
+ std::string page_id;
+ std::string ref;
+ std::string event;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
index 045f0b6..25cdb12 100644
--- a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
+++ b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.cpp
@@ -22,14 +22,15 @@
namespace WeexCore {
- RenderActionAppendTreeCreateFinish::RenderActionAppendTreeCreateFinish(const std::string &pageId,
+ RenderActionAppendTreeCreateFinish::RenderActionAppendTreeCreateFinish(const std::string &page_id,
const std::string &ref) {
- this->mPageId = pageId;
- this->mRef = ref;
+ this->page_id = page_id;
+ this->ref = ref;
}
void RenderActionAppendTreeCreateFinish::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callAppendTreeCreateFinish(mPageId.c_str(),
- mRef.c_str());
+ WeexCoreManager::getInstance()->getPlatformBridge()->callAppendTreeCreateFinish(
+ this->page_id.c_str(),
+ this->ref.c_str());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_appendtree_createfinish.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.h b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.h
index 321073d..beb601c 100644
--- a/weex_core/Source/core/render/action/render_action_appendtree_createfinish.h
+++ b/weex_core/Source/core/render/action/render_action_appendtree_createfinish.h
@@ -28,13 +28,13 @@ namespace WeexCore {
class RenderActionAppendTreeCreateFinish : public RenderAction {
public:
- explicit RenderActionAppendTreeCreateFinish(const std::string &pageId, const std::string &ref);
+ explicit RenderActionAppendTreeCreateFinish(const std::string &page_id, const std::string &ref);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
+ std::string page_id;
+ std::string ref;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_createbody.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_createbody.cpp b/weex_core/Source/core/render/action/render_action_createbody.cpp
index 2efd6f0..9247a48 100644
--- a/weex_core/Source/core/render/action/render_action_createbody.cpp
+++ b/weex_core/Source/core/render/action/render_action_createbody.cpp
@@ -23,26 +23,28 @@
namespace WeexCore {
- RenderActionCreateBody::RenderActionCreateBody(const std::string &pageId,
+ RenderActionCreateBody::RenderActionCreateBody(const std::string &page_id,
const RenderObject *render) {
- this->mAttributes = render->Attributes();
- this->mStyles = render->Styles();
- this->mEvents = render->Events();
- this->mMargins = render->GetMargins();
- this->mPaddings = render->GetPaddings();
- this->mBorders = render->GetBorders();
- this->mPageId = pageId;
- this->mComponentType = render->Type();
- this->mRef = render->Ref();
+ this->attributes = render->Attributes();
+ this->styles = render->Styles();
+ this->events = render->Events();
+ this->margins = render->GetMargins();
+ this->paddings = render->GetPaddings();
+ this->borders = render->GetBorders();
+ this->page_id = page_id;
+ this->component_type = render->Type();
+ this->ref = render->Ref();
}
void RenderActionCreateBody::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callCreateBody(mPageId.c_str(),
- mComponentType.c_str(),
- mRef.c_str(),
- mStyles, mAttributes,
- mEvents,
- mMargins, mPaddings,
- mBorders);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callCreateBody(this->page_id.c_str(),
+ this->component_type.c_str(),
+ this->ref.c_str(),
+ this->styles,
+ this->attributes,
+ this->events,
+ this->margins,
+ this->paddings,
+ this->borders);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_createbody.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_createbody.h b/weex_core/Source/core/render/action/render_action_createbody.h
index 5d4c25f..8929138 100644
--- a/weex_core/Source/core/render/action/render_action_createbody.h
+++ b/weex_core/Source/core/render/action/render_action_createbody.h
@@ -32,20 +32,20 @@ namespace WeexCore {
class RenderActionCreateBody : public RenderAction {
public:
- explicit RenderActionCreateBody(const std::string &pageId, const RenderObject *render);
+ explicit RenderActionCreateBody(const std::string &page_id, const RenderObject *render);
void ExecuteAction();
public:
- std::map<std::string, std::string> *mStyles;
- std::map<std::string, std::string> *mAttributes;
- std::set<std::string> *mEvents;
- WXCoreMargin mMargins;
- WXCorePadding mPaddings;
- WXCoreBorderWidth mBorders;
- std::string mPageId;
- std::string mComponentType;
- std::string mRef;
+ std::map<std::string, std::string> *styles;
+ std::map<std::string, std::string> *attributes;
+ std::set<std::string> *events;
+ WXCoreMargin margins;
+ WXCorePadding paddings;
+ WXCoreBorderWidth borders;
+ std::string page_id;
+ std::string component_type;
+ std::string ref;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_createfinish.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_createfinish.cpp b/weex_core/Source/core/render/action/render_action_createfinish.cpp
index 13559c1..cb1b15a 100644
--- a/weex_core/Source/core/render/action/render_action_createfinish.cpp
+++ b/weex_core/Source/core/render/action/render_action_createfinish.cpp
@@ -22,11 +22,11 @@
namespace WeexCore {
- RenderActionCreateFinish::RenderActionCreateFinish(const std::string &pageId) {
- this->mPageId = pageId;
+ RenderActionCreateFinish::RenderActionCreateFinish(const std::string &page_id) {
+ this->page_id = page_id;
}
void RenderActionCreateFinish::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callCreateFinish(mPageId.c_str());
+ WeexCoreManager::getInstance()->getPlatformBridge()->callCreateFinish(this->page_id.c_str());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_createfinish.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_createfinish.h b/weex_core/Source/core/render/action/render_action_createfinish.h
index 1ab0c0e..8590edb 100644
--- a/weex_core/Source/core/render/action/render_action_createfinish.h
+++ b/weex_core/Source/core/render/action/render_action_createfinish.h
@@ -28,12 +28,12 @@ namespace WeexCore {
class RenderActionCreateFinish : public RenderAction {
public:
- explicit RenderActionCreateFinish(const std::string &pageId);
+ explicit RenderActionCreateFinish(const std::string &page_id);
void ExecuteAction();
public:
- std::string mPageId;
+ std::string page_id;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_layout.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_layout.cpp b/weex_core/Source/core/render/action/render_action_layout.cpp
index 366c6ba..b37a2ef 100644
--- a/weex_core/Source/core/render/action/render_action_layout.cpp
+++ b/weex_core/Source/core/render/action/render_action_layout.cpp
@@ -23,26 +23,29 @@
namespace WeexCore {
- RenderActionLayout::RenderActionLayout(const std::string &pageId, const RenderObject *render,
+ RenderActionLayout::RenderActionLayout(const std::string &page_id, const RenderObject *render,
int index) {
- this->mPageId = pageId;
- this->mRef = render->Ref();
+ this->page_id = page_id;
+ this->ref = render->Ref();
this->index = index;
GetLayoutInfo(render);
}
void RenderActionLayout::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callLayout(mPageId.c_str(), mRef.c_str(),
- mTop, mBottom, mLeft, mRight,
- mHeight, mWidth, index);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callLayout(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->top, this->bottom,
+ this->left, this->right,
+ this->height, this->width,
+ this->index);
}
void RenderActionLayout::GetLayoutInfo(const WXCoreLayoutNode *node) {
- mTop = node->getLayoutPositionTop();
- mBottom = node->getLayoutPositionBottom();
- mRight = node->getLayoutPositionRight();
- mLeft = node->getLayoutPositionLeft();
- mHeight = node->getLayoutHeight();
- mWidth = node->getLayoutWidth();
+ this->top = node->getLayoutPositionTop();
+ this->bottom = node->getLayoutPositionBottom();
+ this->right = node->getLayoutPositionRight();
+ this->left = node->getLayoutPositionLeft();
+ this->height = node->getLayoutHeight();
+ this->width = node->getLayoutWidth();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_layout.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_layout.h b/weex_core/Source/core/render/action/render_action_layout.h
index 231b3f9..5a21f08 100644
--- a/weex_core/Source/core/render/action/render_action_layout.h
+++ b/weex_core/Source/core/render/action/render_action_layout.h
@@ -33,7 +33,7 @@ namespace WeexCore {
class RenderActionLayout : public RenderAction {
public:
- explicit RenderActionLayout(const std::string &pageId, const RenderObject *render,
+ explicit RenderActionLayout(const std::string &page_id, const RenderObject *render,
const int index);
void ExecuteAction();
@@ -41,15 +41,14 @@ namespace WeexCore {
void GetLayoutInfo(const WXCoreLayoutNode *node);
public:
- std::set<std::string> *mEvents;
- std::string mPageId;
- std::string mRef;
- float mWidth;
- float mHeight;
- float mTop;
- float mLeft;
- float mBottom;
- float mRight;
+ std::string page_id;
+ std::string ref;
+ float width;
+ float height;
+ float top;
+ float left;
+ float bottom;
+ float right;
int index;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_move_element.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_move_element.cpp b/weex_core/Source/core/render/action/render_action_move_element.cpp
index ca2b88e..356c0df 100644
--- a/weex_core/Source/core/render/action/render_action_move_element.cpp
+++ b/weex_core/Source/core/render/action/render_action_move_element.cpp
@@ -22,19 +22,19 @@
namespace WeexCore {
- RenderActionMoveElement::RenderActionMoveElement(const std::string &pageId,
+ RenderActionMoveElement::RenderActionMoveElement(const std::string &page_id,
const std::string &ref,
- const std::string &parentRef, int index) {
- this->mPageId = pageId;
- this->mRef = ref;
- this->mParentRef = parentRef;
- this->mIndex = index;
+ const std::string &parent_ref, int index) {
+ this->page_id = page_id;
+ this->ref = ref;
+ this->parent_ref = parent_ref;
+ this->index = index;
}
void RenderActionMoveElement::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callMoveElement(mPageId.c_str(),
- mRef.c_str(),
- mParentRef.c_str(),
- mIndex);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callMoveElement(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->parent_ref.c_str(),
+ this->index);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_move_element.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_move_element.h b/weex_core/Source/core/render/action/render_action_move_element.h
index 6735903..2644066 100644
--- a/weex_core/Source/core/render/action/render_action_move_element.h
+++ b/weex_core/Source/core/render/action/render_action_move_element.h
@@ -28,16 +28,16 @@ namespace WeexCore {
class RenderActionMoveElement : public RenderAction {
public:
- explicit RenderActionMoveElement(const std::string &pageId, const std::string &ref,
- const std::string &parentRef, int index);
+ explicit RenderActionMoveElement(const std::string &page_id, const std::string &ref,
+ const std::string &parent_ref, int index);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
- std::string mParentRef;
- int mIndex;
+ std::string page_id;
+ std::string ref;
+ std::string parent_ref;
+ int index;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_remove_element.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_remove_element.cpp b/weex_core/Source/core/render/action/render_action_remove_element.cpp
index ba17af5..b5f1206 100644
--- a/weex_core/Source/core/render/action/render_action_remove_element.cpp
+++ b/weex_core/Source/core/render/action/render_action_remove_element.cpp
@@ -22,14 +22,14 @@
namespace WeexCore {
- RenderActionRemoveElement::RenderActionRemoveElement(const std::string &pageId,
+ RenderActionRemoveElement::RenderActionRemoveElement(const std::string &page_id,
const std::string &ref) {
- this->mPageId = pageId;
- this->mRef = ref;
+ this->page_id = page_id;
+ this->ref = ref;
}
void RenderActionRemoveElement::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveElement(mPageId.c_str(),
- mRef.c_str());
+ WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveElement(this->page_id.c_str(),
+ this->ref.c_str());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_remove_element.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_remove_element.h b/weex_core/Source/core/render/action/render_action_remove_element.h
index 58ebbe9..425c3e4 100644
--- a/weex_core/Source/core/render/action/render_action_remove_element.h
+++ b/weex_core/Source/core/render/action/render_action_remove_element.h
@@ -27,13 +27,13 @@ namespace WeexCore {
class RenderActionRemoveElement : public RenderAction {
public:
- explicit RenderActionRemoveElement(const std::string &pageId, const std::string &ref);
+ explicit RenderActionRemoveElement(const std::string &page_id, const std::string &ref);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
+ std::string page_id;
+ std::string ref;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_remove_event.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_remove_event.cpp b/weex_core/Source/core/render/action/render_action_remove_event.cpp
index 06e21d4..fc4e953 100644
--- a/weex_core/Source/core/render/action/render_action_remove_event.cpp
+++ b/weex_core/Source/core/render/action/render_action_remove_event.cpp
@@ -22,17 +22,17 @@
namespace WeexCore {
- RenderActionRemoveEvent::RenderActionRemoveEvent(const std::string &pageId,
+ RenderActionRemoveEvent::RenderActionRemoveEvent(const std::string &page_id,
const std::string &ref,
const std::string &event) {
- this->mPageId = pageId;
- this->mRef = ref;
- this->mEvent = event;
+ this->page_id = page_id;
+ this->ref = ref;
+ this->event = event;
}
void RenderActionRemoveEvent::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveEvent(mPageId.c_str(),
- mRef.c_str(),
- mEvent.c_str());
+ WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveEvent(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->event.c_str());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_remove_event.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_remove_event.h b/weex_core/Source/core/render/action/render_action_remove_event.h
index d72f31f..e331dd0 100644
--- a/weex_core/Source/core/render/action/render_action_remove_event.h
+++ b/weex_core/Source/core/render/action/render_action_remove_event.h
@@ -28,15 +28,15 @@ namespace WeexCore {
class RenderActionRemoveEvent : public RenderAction {
public:
- explicit RenderActionRemoveEvent(const std::string &pageId, const std::string &ref,
+ explicit RenderActionRemoveEvent(const std::string &page_id, const std::string &ref,
const std::string &event);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
- std::string mEvent;
+ std::string page_id;
+ std::string ref;
+ std::string event;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_update_attr.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_update_attr.cpp b/weex_core/Source/core/render/action/render_action_update_attr.cpp
index 7aa6d3f..91e75dd 100644
--- a/weex_core/Source/core/render/action/render_action_update_attr.cpp
+++ b/weex_core/Source/core/render/action/render_action_update_attr.cpp
@@ -22,15 +22,16 @@
namespace WeexCore {
- RenderActionUpdateAttr::RenderActionUpdateAttr(const std::string &pageId, const std::string &ref,
- std::vector<std::pair<std::string, std::string>> *mAttrs) {
- this->mPageId = pageId;
- this->mRef = ref;
- this->mAttrs = mAttrs;
+ RenderActionUpdateAttr::RenderActionUpdateAttr(const std::string &page_id, const std::string &ref,
+ std::vector<std::pair<std::string, std::string>> *attrs) {
+ this->page_id = page_id;
+ this->ref = ref;
+ this->attrs = attrs;
}
void RenderActionUpdateAttr::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateAttr(mPageId.c_str(),
- mRef.c_str(), mAttrs);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateAttr(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->attrs);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_update_attr.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_update_attr.h b/weex_core/Source/core/render/action/render_action_update_attr.h
index bb0e49c..b666f41 100644
--- a/weex_core/Source/core/render/action/render_action_update_attr.h
+++ b/weex_core/Source/core/render/action/render_action_update_attr.h
@@ -29,15 +29,15 @@ namespace WeexCore {
class RenderActionUpdateAttr : public RenderAction {
public:
- explicit RenderActionUpdateAttr(const std::string &pageId, const std::string &ref,
- std::vector<std::pair<std::string, std::string>> *mAttrs);
+ explicit RenderActionUpdateAttr(const std::string &page_id, const std::string &ref,
+ std::vector<std::pair<std::string, std::string>> *attrs);
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
- std::vector<std::pair<std::string, std::string>> *mAttrs;
+ std::string page_id;
+ std::string ref;
+ std::vector<std::pair<std::string, std::string>> *attrs;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_update_style.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_update_style.cpp b/weex_core/Source/core/render/action/render_action_update_style.cpp
index 9b2f6a2..21df427 100644
--- a/weex_core/Source/core/render/action/render_action_update_style.cpp
+++ b/weex_core/Source/core/render/action/render_action_update_style.cpp
@@ -22,24 +22,26 @@
namespace WeexCore {
- RenderActionUpdateStyle::RenderActionUpdateStyle(const std::string &pageId,
+ RenderActionUpdateStyle::RenderActionUpdateStyle(const std::string &page_id,
const std::string &ref,
std::vector<std::pair<std::string, std::string>> *style,
std::vector<std::pair<std::string, std::string>> *margin,
std::vector<std::pair<std::string, std::string>> *padding,
std::vector<std::pair<std::string, std::string>> *border) {
- this->mPageId = pageId;
- this->mRef = ref;
- this->mStyle = style;
- this->mMargin = margin;
- this->mPadding = padding;
- this->mBorder = border;
+ this->page_id = page_id;
+ this->ref = ref;
+ this->style = style;
+ this->margin = margin;
+ this->padding = padding;
+ this->border = border;
}
void RenderActionUpdateStyle::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateStyle(mPageId.c_str(),
- mRef.c_str(), mStyle,
- mMargin,
- mPadding, mBorder);
+ WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateStyle(this->page_id.c_str(),
+ this->ref.c_str(),
+ this->style,
+ this->margin,
+ this->padding,
+ this->border);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/action/render_action_update_style.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_update_style.h b/weex_core/Source/core/render/action/render_action_update_style.h
index 65a31a0..bef6806 100644
--- a/weex_core/Source/core/render/action/render_action_update_style.h
+++ b/weex_core/Source/core/render/action/render_action_update_style.h
@@ -30,7 +30,7 @@ namespace WeexCore {
public:
- explicit RenderActionUpdateStyle(const std::string &pageId, const std::string &ref,
+ explicit RenderActionUpdateStyle(const std::string &page_id, const std::string &ref,
std::vector<std::pair<std::string, std::string>> *style,
std::vector<std::pair<std::string, std::string>> *margin,
std::vector<std::pair<std::string, std::string>> *padding,
@@ -39,12 +39,12 @@ namespace WeexCore {
void ExecuteAction();
public:
- std::string mPageId;
- std::string mRef;
- std::vector<std::pair<std::string, std::string>> *mStyle;
- std::vector<std::pair<std::string, std::string>> *mMargin;
- std::vector<std::pair<std::string, std::string>> *mPadding;
- std::vector<std::pair<std::string, std::string>> *mBorder;
+ std::string page_id;
+ std::string ref;
+ std::vector<std::pair<std::string, std::string>> *style;
+ std::vector<std::pair<std::string, std::string>> *margin;
+ std::vector<std::pair<std::string, std::string>> *padding;
+ std::vector<std::pair<std::string, std::string>> *border;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/manager/render_manager.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/manager/render_manager.cpp b/weex_core/Source/core/render/manager/render_manager.cpp
index c25987d..8b299a9 100644
--- a/weex_core/Source/core/render/manager/render_manager.cpp
+++ b/weex_core/Source/core/render/manager/render_manager.cpp
@@ -25,30 +25,30 @@
namespace WeexCore {
- RenderManager *RenderManager::m_pInstance = nullptr;
+ RenderManager *RenderManager::g_pInstance = nullptr;
- bool RenderManager::CreatePage(std::string pageId, const char *data) {
+ bool RenderManager::CreatePage(std::string page_id, const char *data) {
#if RENDER_LOG
wson_parser parser(data);
LOGD("[RenderManager] CreatePage >>>> pageId: %s, dom data: %s", pageId.c_str(), parser.toStringUTF8().c_str());
#endif
- RenderPage *page = new RenderPage(pageId);
- mPages.insert(std::pair<std::string, RenderPage *>(pageId, page));
+ RenderPage *page = new RenderPage(page_id);
+ this->pages.insert(std::pair<std::string, RenderPage *>(page_id, page));
long long startTime = getCurrentTime();
- RenderObject *root = Wson2RenderObject(data, pageId);
+ RenderObject *root = Wson2RenderObject(data, page_id);
page->ParseJsonTime(getCurrentTime() - startTime);
page->updateDirty(true);
return page->CreateRootRender(root);
}
- bool RenderManager::AddRenderObject(const std::string &pageId, const std::string &parentRef,
+ bool RenderManager::AddRenderObject(const std::string &page_id, const std::string &parent_ref,
int index, const char *data) {
- RenderPage *page = GetPage(pageId);
+ RenderPage *page = GetPage(page_id);
if (page == nullptr)
return false;
@@ -59,19 +59,19 @@ namespace WeexCore {
#endif
long long startTime = getCurrentTime();
- RenderObject *child = Wson2RenderObject(data, pageId);
+ RenderObject *child = Wson2RenderObject(data, page_id);
page->ParseJsonTime(getCurrentTime() - startTime);
if (child == nullptr)
return false;
page->updateDirty(true);
- return page->AddRenderObject(parentRef, index, child);
+ return page->AddRenderObject(parent_ref, index, child);
}
- bool RenderManager::RemoveRenderObject(const std::string &pageId, const std::string &ref) {
+ bool RenderManager::RemoveRenderObject(const std::string &page_id, const std::string &ref) {
- RenderPage *page = this->GetPage(pageId);
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -84,9 +84,9 @@ namespace WeexCore {
return page->RemoveRenderObject(ref);
}
- bool RenderManager::MoveRenderObject(const std::string &pageId, const std::string &ref,
- const std::string &parentRef, int index) {
- RenderPage *page = this->GetPage(pageId);
+ bool RenderManager::MoveRenderObject(const std::string &page_id, const std::string &ref,
+ const std::string &parent_ref, int index) {
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -96,12 +96,12 @@ namespace WeexCore {
#endif
page->updateDirty(true);
- return page->MoveRenderObject(ref, parentRef, index);
+ return page->MoveRenderObject(ref, parent_ref, index);
}
- bool RenderManager::UpdateAttr(const std::string &pageId, const std::string &ref,
+ bool RenderManager::UpdateAttr(const std::string &page_id, const std::string &ref,
const char *data) {
- RenderPage *page = this->GetPage(pageId);
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -119,9 +119,9 @@ namespace WeexCore {
return page->UpdateAttr(ref, attrs);
}
- bool RenderManager::UpdateStyle(const std::string &pageId, const std::string &ref,
+ bool RenderManager::UpdateStyle(const std::string &page_id, const std::string &ref,
const char *data) {
- RenderPage *page = this->GetPage(pageId);
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -139,9 +139,9 @@ namespace WeexCore {
return page->UpdateStyle(ref, styles);
}
- bool RenderManager::AddEvent(const std::string &pageId, const std::string &ref,
+ bool RenderManager::AddEvent(const std::string &page_id, const std::string &ref,
const std::string &event) {
- RenderPage *page = this->GetPage(pageId);
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -154,9 +154,9 @@ namespace WeexCore {
return page->AddEvent(ref, event);
}
- bool RenderManager::RemoveEvent(const std::string &pageId, const std::string &ref,
+ bool RenderManager::RemoveEvent(const std::string &page_id, const std::string &ref,
const std::string &event) {
- RenderPage *page = this->GetPage(pageId);
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return false;
@@ -169,8 +169,8 @@ namespace WeexCore {
return page->RemoveEvent(ref, event);
}
- bool RenderManager::CreateFinish(const std::string &pageId) {
- RenderPage *page = GetPage(pageId);
+ bool RenderManager::CreateFinish(const std::string &page_id) {
+ RenderPage *page = GetPage(page_id);
if (page == nullptr)
return false;
@@ -182,17 +182,17 @@ namespace WeexCore {
return page->CreateFinish();
}
- RenderPage *RenderManager::GetPage(const std::string &id) {
- std::map<std::string, RenderPage *>::iterator iter = mPages.find(id);
- if (iter != mPages.end()) {
+ RenderPage *RenderManager::GetPage(const std::string &page_id) {
+ std::map<std::string, RenderPage *>::iterator iter = this->pages.find(page_id);
+ if (iter != this->pages.end()) {
return iter->second;
} else {
return nullptr;
}
}
- bool RenderManager::ClosePage(const std::string &pageId) {
- RenderPage *page = GetPage(pageId);
+ bool RenderManager::ClosePage(const std::string &page_id) {
+ RenderPage *page = GetPage(page_id);
if (page == nullptr)
return false;
@@ -200,13 +200,13 @@ namespace WeexCore {
LOGD("[RenderManager] ClosePage >>>> pageId: %s", pageId.c_str());
#endif
page->OnRenderPageClose();
- mPages.erase(pageId);
+ this->pages.erase(page_id);
delete page;
page = nullptr;
}
- void RenderManager::Batch(const std::string &pageId) {
- RenderPage *page = this->GetPage(pageId);
+ void RenderManager::Batch(const std::string &page_id) {
+ RenderPage *page = this->GetPage(page_id);
if (page == nullptr)
return;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/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 3ff9463..33573ff 100644
--- a/weex_core/Source/core/render/manager/render_manager.h
+++ b/weex_core/Source/core/render/manager/render_manager.h
@@ -37,8 +37,8 @@ namespace WeexCore {
class Garbo {
public:
~Garbo() {
- if (RenderManager::m_pInstance) {
- delete RenderManager::m_pInstance;
+ if (RenderManager::g_pInstance) {
+ delete RenderManager::g_pInstance;
}
}
};
@@ -47,44 +47,44 @@ namespace WeexCore {
public:
- void Batch(const std::string &pageId);
+ void Batch(const std::string &page_id);
// create root node
- bool CreatePage(std::string pageId, const char *data);
+ bool CreatePage(std::string page_id, const char *data);
/** use auto constructor is bad idea, it cann't transfer binary, use char* is better */
- bool AddRenderObject(const std::string &pageId, const std::string &parentRef, int index,
+ bool AddRenderObject(const std::string &page_id, const std::string &parent_ref, int index,
const char *data);
- bool RemoveRenderObject(const std::string &pageId, const std::string &ref);
+ bool RemoveRenderObject(const std::string &page_id, const std::string &ref);
- bool MoveRenderObject(const std::string &pageId, const std::string &ref,
- const std::string &parentRef, int index);
+ bool MoveRenderObject(const std::string &page_id, const std::string &ref,
+ const std::string &parent_ref, int index);
- bool UpdateAttr(const std::string &pageId, const std::string &ref, const char *data);
+ bool UpdateAttr(const std::string &page_id, const std::string &ref, const char *data);
- bool UpdateStyle(const std::string &pageId, const std::string &ref, const char *data);
+ bool UpdateStyle(const std::string &page_id, const std::string &ref, const char *data);
- bool AddEvent(const std::string &pageId, const std::string &ref, const std::string &event);
+ bool AddEvent(const std::string &page_id, const std::string &ref, const std::string &event);
- bool RemoveEvent(const std::string &pageId, const std::string &ref, const std::string &event);
+ bool RemoveEvent(const std::string &page_id, const std::string &ref, const std::string &event);
- bool CreateFinish(const std::string &pageId);
+ bool CreateFinish(const std::string &page_id);
- RenderPage *GetPage(const std::string &id);
+ RenderPage *GetPage(const std::string &page_id);
- bool ClosePage(const std::string &pageId);
+ bool ClosePage(const std::string &page_id);
static RenderManager *GetInstance() {
- if (!m_pInstance) {
- m_pInstance = new RenderManager();
+ if (!g_pInstance) {
+ g_pInstance = new RenderManager();
}
- return m_pInstance;
+ return g_pInstance;
}
private:
- static RenderManager *m_pInstance;
- std::map<std::string, RenderPage *> mPages;
+ static RenderManager *g_pInstance;
+ std::map<std::string, RenderPage *> pages;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/factory/render_creator.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/factory/render_creator.cpp b/weex_core/Source/core/render/node/factory/render_creator.cpp
index 471e312..f3ecdad 100644
--- a/weex_core/Source/core/render/node/factory/render_creator.cpp
+++ b/weex_core/Source/core/render/node/factory/render_creator.cpp
@@ -29,7 +29,7 @@
namespace WeexCore {
- RenderCreator *RenderCreator::m_pInstance = nullptr;
+ RenderCreator *RenderCreator::g_pInstance = nullptr;
IRenderObject *RenderCreator::CreateRender(const std::string &type, const std::string &ref) {
IRenderFactory *factory;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/factory/render_creator.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/factory/render_creator.h b/weex_core/Source/core/render/node/factory/render_creator.h
index 593eb57..b78a487 100644
--- a/weex_core/Source/core/render/node/factory/render_creator.h
+++ b/weex_core/Source/core/render/node/factory/render_creator.h
@@ -36,8 +36,8 @@ namespace WeexCore {
class Garbo {
public:
~Garbo() {
- if (RenderCreator::m_pInstance) {
- delete RenderCreator::m_pInstance;
+ if (RenderCreator::g_pInstance) {
+ delete RenderCreator::g_pInstance;
}
}
};
@@ -47,16 +47,16 @@ namespace WeexCore {
public:
static RenderCreator *GetInstance() {
- if (!m_pInstance) {
- m_pInstance = new RenderCreator();
+ if (!g_pInstance) {
+ g_pInstance = new RenderCreator();
}
- return m_pInstance;
+ return g_pInstance;
}
IRenderObject *CreateRender(const std::string &type, const std::string &ref);
private:
- static RenderCreator *m_pInstance;
+ static RenderCreator *g_pInstance;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/factory/render_object_interface.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/factory/render_object_interface.h b/weex_core/Source/core/render/node/factory/render_object_interface.h
index 79e6e47..13d2aaf 100644
--- a/weex_core/Source/core/render/node/factory/render_object_interface.h
+++ b/weex_core/Source/core/render/node/factory/render_object_interface.h
@@ -30,27 +30,27 @@ namespace WeexCore {
public:
inline void SetRef(std::string ref) {
- mRef = ref;
+ this->ref = ref;
}
inline const std::string &Ref() const {
- return mRef;
+ return this->ref;
}
- inline void SetPageId(std::string pageId) {
- this->mPageId = pageId;
+ inline void SetPageId(std::string page_id) {
+ this->page_id = page_id;
}
inline const std::string &PageId() const {
- return mPageId;
+ return this->page_id;
}
inline void SetType(std::string type) {
- mType = type;
+ this->tyle = type;
}
inline const std::string &Type() const {
- return mType;
+ return this->tyle;
}
inline void copyFrom(IRenderObject *src) {
@@ -62,9 +62,9 @@ namespace WeexCore {
private:
- std::string mPageId = "";
- std::string mRef = "";
- std::string mType = "";
+ std::string page_id = "";
+ std::string ref = "";
+ std::string tyle = "";
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_appbar.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_appbar.cpp b/weex_core/Source/core/render/node/render_appbar.cpp
index 9a6a766..d97c0d4 100644
--- a/weex_core/Source/core/render/node/render_appbar.cpp
+++ b/weex_core/Source/core/render/node/render_appbar.cpp
@@ -24,10 +24,10 @@
namespace WeexCore {
std::map<std::string, std::string> *RenderAppBar::GetDefaultStyle() {
- defaultNavWidth = getFloat(
+ this->default_nav_width = getFloat(
WXCoreEnvironment::getInstance()->GetOption("defaultNavWidth").c_str());
- defaultOverflowWidth = getFloat(
+ this->default_overflow_width = getFloat(
WXCoreEnvironment::getInstance()->GetOption("defaultOverflowWidth").c_str());
std::string appbar_color = WXCoreEnvironment::getInstance()->GetOption("appbar_color");
@@ -58,8 +58,8 @@ namespace WeexCore {
value,
0,
[=](float foo) {
- setPadding(kPaddingLeft, foo + defaultNavWidth),
- setPadding(kPaddingRight, foo + defaultOverflowWidth),
+ setPadding(kPaddingLeft, foo + this->default_nav_width),
+ setPadding(kPaddingRight, foo + this->default_overflow_width),
setPadding(kPaddingTop, foo),
setPadding(kPaddingBottom, foo);
});
@@ -68,14 +68,14 @@ namespace WeexCore {
UpdateStyleInternal(key,
value,
0,
- [=](float foo) { setPadding(kPaddingLeft, foo + defaultNavWidth); });
+ [=](float foo) { setPadding(kPaddingLeft, foo + this->default_nav_width); });
return kTypePadding;
} else if (key == PADDING_RIGHT) {
UpdateStyleInternal(key,
value,
0,
[=](float foo) {
- setPadding(kPaddingRight, foo + defaultOverflowWidth);
+ setPadding(kPaddingRight, foo + this->default_overflow_width);
});
return kTypePadding;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_appbar.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_appbar.h b/weex_core/Source/core/render/node/render_appbar.h
index 7259bbb..4772b10 100644
--- a/weex_core/Source/core/render/node/render_appbar.h
+++ b/weex_core/Source/core/render/node/render_appbar.h
@@ -38,8 +38,8 @@ namespace WeexCore {
private:
- float defaultNavWidth;
- float defaultOverflowWidth;
+ float default_nav_width;
+ float default_overflow_width;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_list.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_list.cpp b/weex_core/Source/core/render/node/render_list.cpp
index 8c5042c..89ac63c 100644
--- a/weex_core/Source/core/render/node/render_list.cpp
+++ b/weex_core/Source/core/render/node/render_list.cpp
@@ -28,32 +28,32 @@
namespace WeexCore {
RenderList::~RenderList() {
- if (cellSlotsCopys.size() > 0) {
- for (auto it = cellSlotsCopys.begin(); it != cellSlotsCopys.end(); ++it) {
+ if (this->cell_slots_copys.size() > 0) {
+ for (auto it = this->cell_slots_copys.begin(); it != this->cell_slots_copys.end(); ++it) {
RenderObject *child = *it;
if (child) {
delete child;
child = nullptr;
}
}
- cellSlotsCopys.clear();
+ this->cell_slots_copys.clear();
}
- if (cellSlots.size() > 0) {
- for (auto it = cellSlots.begin(); it != cellSlots.end(); ++it) {
+ if (this->cell_slots.size() > 0) {
+ for (auto it = this->cell_slots.begin(); it != this->cell_slots.end(); ++it) {
RenderObject *child = *it;
if (child) {
delete child;
child = nullptr;
}
}
- cellSlots.clear();
+ this->cell_slots.clear();
}
}
void RenderList::addCellSlotCopyTrack(RenderObject *cellSlot) {
cellSlot->setParent(this, cellSlot);
- cellSlotsCopys.push_back(cellSlot);
+ this->cell_slots_copys.push_back(cellSlot);
}
std::map<std::string, std::string> *RenderList::GetDefaultStyle() {
@@ -72,11 +72,11 @@ namespace WeexCore {
std::string prop = isVertical ? HEIGHT : WIDTH;
- if (prop == HEIGHT && isnan(getStyleHeight()) && !mIsSetFlex) {
- mIsSetFlex = true;
+ if (prop == HEIGHT && isnan(getStyleHeight()) && !this->is_set_flex) {
+ this->is_set_flex = true;
style->insert(std::pair<std::string, std::string>(FLEX, "1"));
- } else if (prop == WIDTH && isnan(getStyleWidth()) && !mIsSetFlex) {
- mIsSetFlex = true;
+ } else if (prop == WIDTH && isnan(getStyleWidth()) && !this->is_set_flex) {
+ this->is_set_flex = true;
style->insert(std::pair<std::string, std::string>(FLEX, "1"));
}
@@ -84,12 +84,12 @@ namespace WeexCore {
}
void RenderList::setFlex(const float flex) {
- mIsSetFlex = true;
+ this->is_set_flex = true;
WXCoreLayoutNode::setFlex(flex);
}
std::map<std::string, std::string> *RenderList::GetDefaultAttr() {
- if (!mIsPreCalculateCellWidth) {
+ if (!this->is_pre_calculate_cell_width) {
preCalculateCellWidth();
}
return nullptr;
@@ -98,55 +98,65 @@ namespace WeexCore {
void RenderList::preCalculateCellWidth() {
std::map<std::string, std::string> *attrs = new std::map<std::string, std::string>();
if (Attributes() != nullptr) {
- mColumnCount = getColumnCount();
- mColumnWidth = getColumnWidth();
- mColumnGap = getColumnGap();
+ this->column_count = getColumnCount();
+ this->column_width = getColumnWidth();
+ this->column_gap = getColumnGap();
- mLeftGap = getLeftGap();
- mRightGap = getRightGap();
+ this->left_gap = getLeftGap();
+ this->right_gap = getRightGap();
- mAvailableWidth =
+ this->available_width =
getStyleWidth() - getWebPxByWidth(getPaddingLeft(), GetRenderPage()->ViewPortWidth()) -
getWebPxByWidth(getPaddingRight(), GetRenderPage()->ViewPortWidth());
- if (AUTO_VALUE == mColumnCount && AUTO_VALUE == mColumnWidth) {
- mColumnCount = COLUMN_COUNT_NORMAL;
- mColumnWidth = (mAvailableWidth - ((mColumnCount - 1) * mColumnGap)) / mColumnCount;
- mColumnWidth = mColumnWidth > 0 ? mColumnWidth : 0;
- } else if (AUTO_VALUE == mColumnWidth && AUTO_VALUE != mColumnCount) {
- mColumnWidth =
- (mAvailableWidth - mLeftGap - mRightGap - ((mColumnCount - 1) * mColumnGap)) /
- mColumnCount;
- mColumnWidth = mColumnWidth > 0 ? mColumnWidth : 0;
- } else if (AUTO_VALUE != mColumnWidth && AUTO_VALUE == mColumnCount) {
- mColumnCount = (int) round(
- (mAvailableWidth + mColumnGap) / (mColumnWidth + mColumnGap) - 0.5f);
- mColumnCount = mColumnCount > 0 ? mColumnCount : 1;
- if (mColumnCount <= 0) {
- mColumnCount = COLUMN_COUNT_NORMAL;
+ if (AUTO_VALUE == this->column_count && AUTO_VALUE == this->column_width) {
+ this->column_count = COLUMN_COUNT_NORMAL;
+ this->column_width =
+ (this->available_width - ((this->column_count - 1) * this->column_gap)) /
+ this->column_count;
+ this->column_width = this->column_width > 0 ? this->column_width : 0;
+ } else if (AUTO_VALUE == this->column_width && AUTO_VALUE != this->column_count) {
+ this->column_width =
+ (this->available_width - this->left_gap - this->right_gap -
+ ((this->column_count - 1) * this->column_gap)) /
+ this->column_count;
+ this->column_width = this->column_width > 0 ? this->column_width : 0;
+ } else if (AUTO_VALUE != this->column_width && AUTO_VALUE == this->column_count) {
+ this->column_count = (int) round(
+ (this->available_width + this->column_gap) / (this->column_width + this->column_gap) -
+ 0.5f);
+ this->column_count = this->column_count > 0 ? this->column_count : 1;
+ if (this->column_count <= 0) {
+ this->column_count = COLUMN_COUNT_NORMAL;
}
- mColumnWidth =
- ((mAvailableWidth + mColumnGap - mLeftGap - mRightGap) / mColumnCount) - mColumnGap;
+ this->column_width =
+ ((this->available_width + this->column_gap - this->left_gap - this->right_gap) /
+ this->column_count) - this->column_gap;
- } else if (AUTO_VALUE != mColumnWidth && AUTO_VALUE != mColumnCount) {
+ } else if (AUTO_VALUE != this->column_width && AUTO_VALUE != this->column_count) {
int columnCount = (int) round(
- (mAvailableWidth + mColumnGap - mLeftGap - mRightGap) / (mColumnWidth + mColumnGap) -
+ (this->available_width + this->column_gap - this->left_gap - this->right_gap) /
+ (this->column_width + this->column_gap) -
0.5f);
- mColumnCount = columnCount > mColumnCount ? mColumnCount : columnCount;
- if (mColumnCount <= 0) {
- mColumnCount = COLUMN_COUNT_NORMAL;
+ this->column_count = columnCount > this->column_count ? this->column_count : columnCount;
+ if (this->column_count <= 0) {
+ this->column_count = COLUMN_COUNT_NORMAL;
}
- mColumnWidth =
- ((mAvailableWidth + mColumnGap - mLeftGap - mRightGap) / mColumnCount) - mColumnGap;
+ this->column_width =
+ ((this->available_width + this->column_gap - this->left_gap - this->right_gap) /
+ this->column_count) - this->column_gap;
}
std::string spanOffsets = calcSpanOffset();
- mIsPreCalculateCellWidth = true;
- if (getColumnCount() > 0 || getColumnWidth() > 0 || mColumnCount > COLUMN_COUNT_NORMAL) {
- attrs->insert(std::pair<std::string, std::string>(COLUMN_COUNT, to_string(mColumnCount)));
- attrs->insert(std::pair<std::string, std::string>(COLUMN_GAP, to_string(mColumnGap)));
- attrs->insert(std::pair<std::string, std::string>(COLUMN_WIDTH, to_string(mColumnWidth)));
+ this->is_pre_calculate_cell_width = true;
+ if (getColumnCount() > 0 || getColumnWidth() > 0 ||
+ this->column_count > COLUMN_COUNT_NORMAL) {
+ attrs->insert(
+ std::pair<std::string, std::string>(COLUMN_COUNT, to_string(this->column_count)));
+ attrs->insert(std::pair<std::string, std::string>(COLUMN_GAP, to_string(this->column_gap)));
+ attrs->insert(
+ std::pair<std::string, std::string>(COLUMN_WIDTH, to_string(this->column_width)));
}
if (spanOffsets.length() > 0) {
attrs->insert(std::pair<std::string, std::string>(SPAN_OFFSETS, to_string(spanOffsets)));
@@ -171,13 +181,14 @@ namespace WeexCore {
std::string RenderList::calcSpanOffset() {
std::string spanOffsets;
- if (mLeftGap > 0 || mRightGap > 0) {
+ if (this->left_gap > 0 || this->right_gap > 0) {
spanOffsets.append("[");
- for (int i = 0; i < mColumnCount; i++) {
- float spanOffset = mLeftGap + i * ((mColumnWidth + mColumnGap) -
- (mAvailableWidth + mColumnGap) / mColumnCount);
+ for (int i = 0; i < this->column_count; i++) {
+ float spanOffset = this->left_gap + i * ((this->column_width + this->column_gap) -
+ (this->available_width + this->column_gap) /
+ this->column_count);
spanOffsets.append(to_string(spanOffset));
- if (i != mColumnCount - 1) {
+ if (i != this->column_count - 1) {
spanOffsets.append(",");
}
}
@@ -207,17 +218,17 @@ namespace WeexCore {
&& (child->Type() == kRenderCellSlot || child->Type() == kRenderCell ||
child->Type() == kRenderHeader)) {
child->setParent(this, child);
- cellSlots.insert(cellSlots.end(), child);
+ this->cell_slots.insert(this->cell_slots.end(), child);
index = -1;
} else {
index = RenderObject::AddRenderObject(index, child);
}
- if (!mIsPreCalculateCellWidth) {
+ if (!this->is_pre_calculate_cell_width) {
preCalculateCellWidth();
}
- if (mColumnWidth != 0 && !isnan(mColumnWidth)) {
+ if (this->column_width != 0 && !isnan(this->column_width)) {
AddRenderObjectWidth(child, false);
}
return index;
@@ -226,11 +237,11 @@ namespace WeexCore {
void RenderList::AddRenderObjectWidth(RenderObject *child, const bool updating) {
if (Type() == kRenderWaterfall || Type() == kRenderRecycleList) {
if (child->Type() == kRenderHeader || child->Type() == kRenderFooter) {
- child->ApplyStyle(WIDTH, to_string(mAvailableWidth), updating);
+ child->ApplyStyle(WIDTH, to_string(this->available_width), updating);
} else if (child->IsSticky()) {
- child->ApplyStyle(WIDTH, to_string(mAvailableWidth), updating);
+ child->ApplyStyle(WIDTH, to_string(this->available_width), updating);
} else if (child->Type() == kRenderCell || child->Type() == kRenderCellSlot) {
- child->ApplyStyle(WIDTH, to_string(mColumnWidth), updating);
+ child->ApplyStyle(WIDTH, to_string(this->column_width), updating);
}
}
}
@@ -242,7 +253,7 @@ namespace WeexCore {
!GetAttr(COLUMN_WIDTH).empty()) {
preCalculateCellWidth();
- if (mColumnWidth == 0 && isnan(mColumnWidth)) {
+ if (this->column_width == 0 && isnan(this->column_width)) {
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_list.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_list.h b/weex_core/Source/core/render/node/render_list.h
index 16d09dc..ad0417c 100644
--- a/weex_core/Source/core/render/node/render_list.h
+++ b/weex_core/Source/core/render/node/render_list.h
@@ -67,21 +67,21 @@ namespace WeexCore {
}
inline std::vector<RenderObject *> &CellSlots() {
- return cellSlots;
+ return cell_slots;
}
private:
- bool mIsPreCalculateCellWidth = false;
- int mColumnCount = COLUMN_COUNT_NORMAL;
- float mColumnWidth = AUTO_VALUE;
- float mAvailableWidth = 0;
- float mColumnGap = COLUMN_GAP_NORMAL;
- bool mIsSetFlex = false;
- std::vector<RenderObject *> cellSlots;
- std::vector<RenderObject *> cellSlotsCopys;
- float mLeftGap = 0;
- float mRightGap = 0;
+ bool is_pre_calculate_cell_width = false;
+ int column_count = COLUMN_COUNT_NORMAL;
+ float column_width = AUTO_VALUE;
+ float available_width = 0;
+ float column_gap = COLUMN_GAP_NORMAL;
+ bool is_set_flex = false;
+ std::vector<RenderObject *> cell_slots;
+ std::vector<RenderObject *> cell_slots_copys;
+ float left_gap = 0;
+ float right_gap = 0;
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/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 04cc24a..a13d6d1 100644
--- a/weex_core/Source/core/render/node/render_object.cpp
+++ b/weex_core/Source/core/render/node/render_object.cpp
@@ -29,29 +29,29 @@
namespace WeexCore {
RenderObject::RenderObject() {
- mStyles = new std::map<std::string, std::string>();
- mAttributes = new std::map<std::string, std::string>();
- mEvents = new std::set<std::string>();
- mIsRootRender = false;
+ this->styles = new std::map<std::string, std::string>();
+ this->attributes = new std::map<std::string, std::string>();
+ this->events = new std::set<std::string>();
+ this->is_root_render = false;
}
RenderObject::~RenderObject() {
- mParentRender = nullptr;
+ this->parent_render = nullptr;
- if (mStyles != nullptr) {
- delete mStyles;
- mStyles = nullptr;
+ if (this->styles != nullptr) {
+ delete this->styles;
+ this->styles = nullptr;
}
- if (mAttributes != nullptr) {
- delete mAttributes;
- mAttributes = nullptr;
+ if (this->attributes != nullptr) {
+ delete this->attributes;
+ this->attributes = nullptr;
}
- if (mEvents != nullptr) {
- delete mEvents;
- mEvents = nullptr;
+ if (this->events != nullptr) {
+ delete this->events;
+ this->events = nullptr;
}
for (auto it = ChildListIterBegin(); it != ChildListIterEnd(); it++) {
@@ -130,7 +130,7 @@ namespace WeexCore {
bool insert = false;
if (value.length() > 0 &&
(value.at(0) == JSON_OBJECT_MARK_CHAR || value.at(0) == JSON_ARRAY_MARK_CHAR)) {
- mapInsertOrAssign(mStyles, key, value);
+ mapInsertOrAssign(this->styles, key, value);
insert = true;
}
@@ -184,9 +184,9 @@ namespace WeexCore {
} else if (key == POSITION) {
setStylePositionType(GetWXCorePositionType(value));
if (value == STICKY) {
- mIsSticky = true;
+ this->is_sticky = true;
}
- mapInsertOrAssign(mStyles, key, value);
+ mapInsertOrAssign(this->styles, key, value);
return kTypeStyle;
} else if (key == LEFT) {
UpdateStyleInternal(key, value, NAN,
@@ -253,18 +253,18 @@ namespace WeexCore {
return kTypePadding;
} else {
if (!insert) {
- mapInsertOrAssign(mStyles, key, value);
+ mapInsertOrAssign(this->styles, key, value);
}
return kTypeStyle;
}
}
const std::string RenderObject::GetStyle(const std::string &key) {
- if (mStyles == nullptr)
+ if (this->styles == nullptr)
return "";
- std::map<std::string, std::string>::iterator iter = mStyles->find(key);
- if (iter != mStyles->end()) {
+ std::map<std::string, std::string>::iterator iter = this->styles->find(key);
+ if (iter != this->styles->end()) {
return iter->second;
} else {
return "";
@@ -272,11 +272,11 @@ namespace WeexCore {
}
const std::string RenderObject::GetAttr(const std::string &key) {
- if (mAttributes == nullptr)
+ if (this->attributes == nullptr)
return "";
- std::map<std::string, std::string>::iterator iter = mAttributes->find(key);
- if (iter != mAttributes->end()) {
+ std::map<std::string, std::string>::iterator iter = this->attributes->find(key);
+ if (iter != this->attributes->end()) {
return iter->second;
} else {
return "";
@@ -284,8 +284,8 @@ namespace WeexCore {
}
float RenderObject::GetViewPortWidth() {
- if (mViewPortWidth >= 0)
- return mViewPortWidth;
+ if (this->viewport_width >= 0)
+ return this->viewport_width;
RenderPage *page = GetRenderPage();
if (page == nullptr)
@@ -374,9 +374,9 @@ namespace WeexCore {
void RenderObject::copyFrom(RenderObject *src) {
IRenderObject::copyFrom(src);
- this->mStyles->insert(src->mStyles->begin(), src->mStyles->end());
- this->mAttributes->insert(src->mAttributes->begin(), src->mAttributes->end());
- this->mEvents->insert(src->mEvents->begin(), src->mEvents->end());
+ this->styles->insert(src->styles->begin(), src->styles->end());
+ this->attributes->insert(src->attributes->begin(), src->attributes->end());
+ this->events->insert(src->events->begin(), src->events->end());
}
void RenderObject::mapInsertOrAssign(std::map<std::string, std::string> *targetMap,
@@ -408,7 +408,7 @@ namespace WeexCore {
}
void RenderObject::UpdateAttr(std::string key, std::string value) {
- mapInsertOrAssign(mAttributes, key, value);
+ mapInsertOrAssign(this->attributes, key, value);
}
StyleType RenderObject::UpdateStyle(std::string key, std::string value) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_object.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_object.h b/weex_core/Source/core/render/node/render_object.h
index 9445243..1e519af 100644
--- a/weex_core/Source/core/render/node/render_object.h
+++ b/weex_core/Source/core/render/node/render_object.h
@@ -117,7 +117,7 @@ namespace WeexCore {
}
inline void AddAttr(std::string key, std::string value) {
- mapInsertOrAssign(mAttributes, key, value);
+ mapInsertOrAssign(this->attributes, key, value);
}
inline StyleType AddStyle(std::string key, std::string value) {
@@ -125,57 +125,57 @@ namespace WeexCore {
}
inline void AddEvent(std::string event) {
- if (mEvents == nullptr || mEvents->empty()) {
- mEvents = new std::set<std::string>();
+ if (this->events == nullptr || this->events->empty()) {
+ this->events = new std::set<std::string>();
}
- mEvents->insert(event);
+ this->events->insert(event);
}
inline void RemoveEvent(const std::string &event) {
- mEvents->erase(event);
+ this->events->erase(event);
}
inline void SetParentRender(RenderObject *render) {
- mParentRender = render;
+ this->parent_render = render;
}
inline RenderObject *GetParentRender() {
- return mParentRender;
+ return this->parent_render;
}
inline std::map<std::string, std::string> *Styles() const {
- return mStyles;
+ return this->styles;
}
inline std::map<std::string, std::string> * Attributes() const {
- return mAttributes;
+ return this->attributes;
}
inline std::set<std::string> *Events() const {
- return mEvents;
+ return this->events;
}
inline void MarkRootRender() {
- mIsRootRender = true;
+ this->is_root_render = true;
}
inline bool IsRootRender() {
- return mIsRootRender;
+ return this->is_root_render;
}
inline bool IsSticky() {
- return mIsSticky;
+ return this->is_sticky;
}
private:
- RenderObject *mParentRender;
- std::map<std::string, std::string> *mStyles;
- std::map<std::string, std::string> *mAttributes;
- std::set<std::string> *mEvents;
- float mViewPortWidth = -1;
- bool mIsRootRender;
- bool mIsSticky = false;
+ RenderObject *parent_render;
+ std::map<std::string, std::string> *styles;
+ std::map<std::string, std::string> *attributes;
+ std::set<std::string> *events;
+ float viewport_width = -1;
+ bool is_root_render;
+ bool is_sticky = false;
};
} //end WeexCore
#endif //RenderObject_h
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_scroller.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_scroller.cpp b/weex_core/Source/core/render/node/render_scroller.cpp
index 563f7db..4844383 100644
--- a/weex_core/Source/core/render/node/render_scroller.cpp
+++ b/weex_core/Source/core/render/node/render_scroller.cpp
@@ -35,9 +35,9 @@ namespace WeexCore {
std::string prop = isVertical ? HEIGHT : WIDTH;
- if (prop == HEIGHT && isnan(getStyleHeight()) && !mIsSetFlex) {
+ if (prop == HEIGHT && isnan(getStyleHeight()) && !this->is_set_flex) {
style->insert(std::pair<std::string, std::string>(FLEX, "1"));
- } else if (prop == WIDTH && isnan(getStyleWidth()) && !mIsSetFlex) {
+ } else if (prop == WIDTH && isnan(getStyleWidth()) && !this->is_set_flex) {
style->insert(std::pair<std::string, std::string>(FLEX, "1"));
}
@@ -45,7 +45,7 @@ namespace WeexCore {
}
void RenderScroller::setFlex(const float flex) {
- mIsSetFlex = true;
+ this->is_set_flex = true;
WXCoreLayoutNode::setFlex(flex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2504c923/weex_core/Source/core/render/node/render_scroller.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/render_scroller.h b/weex_core/Source/core/render/node/render_scroller.h
index cb4e1f0..2868d8b 100644
--- a/weex_core/Source/core/render/node/render_scroller.h
+++ b/weex_core/Source/core/render/node/render_scroller.h
@@ -24,14 +24,14 @@
namespace WeexCore {
class RenderScroller : public RenderObject {
- bool mIsSetFlex = false;
+ bool is_set_flex = false;
std::map<std::string, std::string> *GetDefaultStyle();
void setFlex(const float flex);
inline float calcFreeSpaceAlongMainAxis(const float &width, const float &height,
- const float ¤tLength) const override {
+ const float ¤t_length) const override {
return NAN;
}