You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/06/12 04:44:27 UTC
[03/12] incubator-weex git commit: [WEEX-442][Core] Using clang-format
[WEEX-442][Core] Using clang-format
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ad255b3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ad255b3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ad255b3a
Branch: refs/heads/master
Commit: ad255b3a43e4b246060c1b2b7a71c92b19296a25
Parents: 8f8b214
Author: miomin <mi...@foxmail.com>
Authored: Tue Jun 12 11:45:19 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Tue Jun 12 12:44:03 2018 +0800
----------------------------------------------------------------------
.../android/bridge/impl/bridge_impl_android.cpp | 34 +-
.../bridge/impl/weexcore_impl_android.cpp | 28 +-
.../Source/core/moniter/render_performance.cpp | 5 +-
.../Source/core/moniter/render_performance.h | 20 +-
.../render/action/render_action_add_element.cpp | 58 +-
.../render/action/render_action_add_element.h | 64 +-
.../render/action/render_action_add_event.cpp | 26 +-
.../render/action/render_action_add_event.h | 30 +-
.../render_action_appendtree_createfinish.cpp | 22 +-
.../render_action_appendtree_createfinish.h | 26 +-
.../render/action/render_action_createbody.cpp | 45 +-
.../render/action/render_action_createbody.h | 53 +-
.../action/render_action_createfinish.cpp | 15 +-
.../render/action/render_action_createfinish.h | 23 +-
.../render/action/render_action_interface.h | 16 +-
.../core/render/action/render_action_layout.cpp | 47 +-
.../core/render/action/render_action_layout.h | 49 +-
.../action/render_action_move_element.cpp | 32 +-
.../render/action/render_action_move_element.h | 32 +-
.../action/render_action_remove_element.cpp | 22 +-
.../action/render_action_remove_element.h | 25 +-
.../action/render_action_remove_event.cpp | 25 +-
.../render/action/render_action_remove_event.h | 30 +-
.../render/action/render_action_update_attr.cpp | 24 +-
.../render/action/render_action_update_attr.h | 31 +-
.../action/render_action_update_style.cpp | 41 +-
.../render/action/render_action_update_style.h | 50 +-
.../core/render/manager/render_manager.cpp | 270 ++---
.../Source/core/render/manager/render_manager.h | 96 +-
.../render/node/factory/render_appbar_factory.h | 20 +-
.../render/node/factory/render_cell_factory.h | 20 +-
.../core/render/node/factory/render_creator.cpp | 54 +-
.../core/render/node/factory/render_creator.h | 58 +-
.../node/factory/render_factory_interface.h | 16 +-
.../render/node/factory/render_list_factory.h | 20 +-
.../render/node/factory/render_mask_factory.h | 20 +-
.../node/factory/render_object_interface.h | 61 +-
.../node/factory/render_scroller_factory.h | 20 +-
.../render/node/factory/render_text_factory.h | 20 +-
.../core/render/node/factory/render_type.h | 32 +-
.../render/node/factory/simple_render_factory.h | 21 +-
.../Source/core/render/node/render_appbar.cpp | 106 +-
.../Source/core/render/node/render_appbar.h | 35 +-
weex_core/Source/core/render/node/render_cell.h | 12 +-
.../Source/core/render/node/render_list.cpp | 487 ++++-----
weex_core/Source/core/render/node/render_list.h | 92 +-
.../Source/core/render/node/render_mask.cpp | 57 +-
weex_core/Source/core/render/node/render_mask.h | 22 +-
.../Source/core/render/node/render_object.cpp | 712 +++++++-------
.../Source/core/render/node/render_object.h | 184 ++--
.../Source/core/render/node/render_scroller.cpp | 46 +-
.../Source/core/render/node/render_scroller.h | 32 +-
.../Source/core/render/node/render_text.cpp | 20 +-
weex_core/Source/core/render/node/render_text.h | 22 +-
.../Source/core/render/page/render_page.cpp | 979 +++++++++----------
weex_core/Source/core/render/page/render_page.h | 211 ++--
56 files changed, 2307 insertions(+), 2311 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/android/bridge/impl/bridge_impl_android.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/android/bridge/impl/bridge_impl_android.cpp b/weex_core/Source/android/bridge/impl/bridge_impl_android.cpp
index 439d5b1..4d2c1f5 100644
--- a/weex_core/Source/android/bridge/impl/bridge_impl_android.cpp
+++ b/weex_core/Source/android/bridge/impl/bridge_impl_android.cpp
@@ -152,7 +152,7 @@ namespace WeexCore {
void Bridge_Impl_Android::reportException(const char* pageId, const char *func, const char *exception_string) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jstring jFunc = env->NewStringUTF(func);
@@ -178,7 +178,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callNative(const char* pageId, const char *task, const char *callback) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jbyteArray jTask = newJByteArray(env, task);
@@ -214,7 +214,7 @@ namespace WeexCore {
void* Bridge_Impl_Android::callNativeModule(const char* pageId, const char *module, const char *method,
const char *arguments, int argumentsLen, const char *options, int optionsLen) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jstring jModule = env->NewStringUTF(module);
@@ -251,7 +251,7 @@ namespace WeexCore {
void Bridge_Impl_Android::callNativeComponent(const char* pageId, const char* ref, const char *method,
const char *arguments, int argumentsLength, const char *options, int optionsLength) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jstring jMethod = env->NewStringUTF(method);
@@ -322,7 +322,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callUpdateFinish(const char* pageId, const char *task, const char *callback) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jbyteArray jTask = newJByteArray(env, task);
@@ -354,7 +354,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callRefreshFinish(const char* pageId, const char *task, const char *callback) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jbyteArray jTask = newJByteArray(env, task);
@@ -390,7 +390,7 @@ namespace WeexCore {
const WXCorePadding &paddings,
const WXCoreBorderWidth &borders) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -536,7 +536,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callRemoveElement(const char* pageId, const char* ref) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -562,7 +562,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callMoveElement(const char* pageId, const char* ref, const char* parentRef, int index) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -589,7 +589,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callAddEvent(const char* pageId, const char* ref, const char *event) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
jstring jPageId = getKeyFromCache(env, pageId);
@@ -616,7 +616,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callRemoveEvent(const char* pageId, const char* ref, const char *event) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -647,7 +647,7 @@ namespace WeexCore {
std::vector<std::pair<std::string, std::string>> *padding,
std::vector<std::pair<std::string, std::string>> *border) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -700,7 +700,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callUpdateAttr(const char* pageId, const char* ref, std::vector<std::pair<std::string, std::string>> *attrs) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -738,7 +738,7 @@ namespace WeexCore {
int height, int width, int index) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -766,7 +766,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callCreateFinish(const char* pageId) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -791,7 +791,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callAppendTreeCreateFinish(const char *pageId, const char *ref) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
@@ -818,7 +818,7 @@ namespace WeexCore {
int Bridge_Impl_Android::callHasTransitionPros(const char* pageId, const char* ref, std::vector<std::pair<std::string, std::string>> *style) {
RenderPage *page = RenderManager::GetInstance()->GetPage(pageId);
- long long startTime = getCurrentTime();
+ int64_t startTime = getCurrentTime();
JNIEnv *env = getJNIEnv();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 4138530..3febd5b 100644
--- a/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
+++ b/weex_core/Source/android/bridge/impl/weexcore_impl_android.cpp
@@ -142,7 +142,7 @@ static void SetRenderContainerWrapContent(JNIEnv* env, jobject jcaller, jboolean
if (page == nullptr)
return;
- page->SetRenderContainerWidthWrapContent(wrap);
+ page->set_is_render_container_width_wrap_content(wrap);
}
static jlongArray GetFirstScreenRenderTime(JNIEnv *env, jobject jcaller, jstring instanceId) {
@@ -158,7 +158,7 @@ static jlongArray GetFirstScreenRenderTime(JNIEnv *env, jobject jcaller, jstring
return jFirstScreenRenderTime;
}
- std::vector<long> temp = page->PrintFirstScreenLog();
+ std::vector<int64_t> temp = page->PrintFirstScreenLog();
jlong ret[3];
@@ -190,7 +190,7 @@ static jlongArray GetRenderFinishTime(JNIEnv *env, jobject jcaller, jstring inst
return jRenderFinishTime;
}
- std::vector<long> temp = page->PrintRenderSuccessLog();
+ std::vector<int64_t> temp = page->PrintRenderSuccessLog();
jlong ret[3];
@@ -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->need_layout.load()) {
- page->need_layout.store(true);
+ if (!page->need_layout_.load()) {
+ page->need_layout_.store(true);
}
- bool ret = !page->has_fore_layout_action.load() && page->isDirty();
+ bool ret = !page->has_fore_layout_action_.load() && page->is_dirty();
if (ret) {
- page->has_fore_layout_action.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->has_fore_layout_action.store(false);
+ page->has_fore_layout_action_.store(false);
}
}
@@ -253,7 +253,7 @@ static void SetStyleWidth(JNIEnv *env, jobject jcaller,
render->setStyleWidthLevel(CSS_STYLE);
render->setStyleWidth(value, true);
- page->updateDirty(true);
+ page->set_is_dirty(true);
}
static void SetStyleHeight(JNIEnv *env, jobject jcaller,
@@ -269,7 +269,7 @@ static void SetStyleHeight(JNIEnv *env, jobject jcaller,
render->setStyleHeightLevel(CSS_STYLE);
render->setStyleHeight(value);
- page->updateDirty(true);
+ page->set_is_dirty(true);
}
static void SetMargin(JNIEnv *env, jobject jcaller,
@@ -293,7 +293,7 @@ static void SetMargin(JNIEnv *env, jobject jcaller,
} else if (edge == 4) {
render->setMargin(kMarginALL, value);
}
- page->updateDirty(true);
+ page->set_is_dirty(true);
}
static void SetPadding(JNIEnv *env, jobject jcaller,
@@ -318,7 +318,7 @@ static void SetPadding(JNIEnv *env, jobject jcaller,
} else if (edge == 4) {
render->setPadding(kPaddingALL, value);
}
- page->updateDirty(true);
+ page->set_is_dirty(true);
}
@@ -342,7 +342,7 @@ static void SetPosition(JNIEnv *env, jobject jcaller,
} else if (edge == 3) {
render->setStylePosition(kPositionEdgeRight, value);
}
- page->updateDirty(true);
+ page->set_is_dirty(true);
}
static void MarkDirty(JNIEnv *env, jobject jcaller,
@@ -371,7 +371,7 @@ static void SetViewPortWidth(JNIEnv *env, jobject jcaller, jstring instanceId, j
if (page == nullptr)
return;
- page->SetViewPortWidth(value);
+ page->set_viewport_width(value);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/core/moniter/render_performance.cpp
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/moniter/render_performance.cpp b/weex_core/Source/core/moniter/render_performance.cpp
index 4fe594b..a35eeb4 100644
--- a/weex_core/Source/core/moniter/render_performance.cpp
+++ b/weex_core/Source/core/moniter/render_performance.cpp
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
+#include <cstdint>
#include "render_performance.h"
namespace WeexCore {
- std::vector<long> RenderPerformance::PrintPerformanceLog(PerformanceStage performanceStage) {
+ std::vector<int64_t> RenderPerformance::PrintPerformanceLog(PerformanceStage performanceStage) {
- std::vector<long> ret(3);
+ std::vector<int64_t> ret(3);
if (performanceStage == onFirstScreen) {
firstScreenCallBridgeTime = callBridgeTime;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/core/moniter/render_performance.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/moniter/render_performance.h b/weex_core/Source/core/moniter/render_performance.h
index f6c24ee..1eff88f 100644
--- a/weex_core/Source/core/moniter/render_performance.h
+++ b/weex_core/Source/core/moniter/render_performance.h
@@ -31,30 +31,30 @@ namespace WeexCore {
public:
- long long callBridgeTime;
+ int64_t callBridgeTime;
- long long cssLayoutTime;
+ int64_t cssLayoutTime;
- long long parseJsonTime;
+ int64_t parseJsonTime;
- long long firstScreenCallBridgeTime;
+ int64_t firstScreenCallBridgeTime;
- long long firstScreenCssLayoutTime;
+ int64_t firstScreenCssLayoutTime;
- long long firstScreenParseJsonTime;
+ int64_t firstScreenParseJsonTime;
- long long onRenderSuccessCallBridgeTime;
+ int64_t onRenderSuccessCallBridgeTime;
- long long onRenderSuccessCssLayoutTime;
+ int64_t onRenderSuccessCssLayoutTime;
- long long onRenderSuccessParseJsonTime;
+ int64_t onRenderSuccessParseJsonTime;
RenderPerformance() : callBridgeTime(0), cssLayoutTime(0), parseJsonTime(0),
firstScreenCallBridgeTime(0), firstScreenCssLayoutTime(0),
firstScreenParseJsonTime(0), onRenderSuccessCallBridgeTime(0),
onRenderSuccessCssLayoutTime(0), onRenderSuccessParseJsonTime(0) {}
- std::vector<long> PrintPerformanceLog(PerformanceStage performanceStage);
+ std::vector<int64_t> PrintPerformanceLog(PerformanceStage performanceStage);
};
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 aa4fa67..564d7b6 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
@@ -17,41 +17,35 @@
* under the License.
*/
-#include "core/render/node/render_object.h"
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_add_element.h"
+#include "core/manager/weex_core_manager.h"
+#include "core/render/node/render_object.h"
namespace WeexCore {
- RenderActionAddElement::RenderActionAddElement(const std::string &page_id,
- const RenderObject *render,
- const RenderObject *parent, int index,
- 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;
- }
+RenderActionAddElement::RenderActionAddElement(const std::string &page_id,
+ const RenderObject *render,
+ const RenderObject *parent,
+ int index, 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(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_);
- }
+void RenderActionAddElement::ExecuteAction() {
+ 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_);
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 be7c6d7..ed828b0 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
@@ -16,43 +16,43 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_ADDELEMENTACTION_H
-#define WEEX_PROJECT_ADDELEMENTACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_ADD_ELEMENT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_ADD_ELEMENT_H_
-#include <string>
#include <map>
#include <set>
+#include <string>
-#include "core/render/action/render_action_interface.h"
#include "core/layout/style.h"
+#include "core/render/action/render_action_interface.h"
namespace WeexCore {
- class RenderObject;
-
- class RenderActionAddElement : public RenderAction {
-
- public:
- explicit RenderActionAddElement(const std::string &page_id, const RenderObject *render,
- const RenderObject *parent,
- int index, bool will_layout = true);
-
- void ExecuteAction();
-
- public:
- 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_;
- };
-}
-
-#endif //WEEX_PROJECT_ADDELEMENTACTION_H
+class RenderObject;
+
+class RenderActionAddElement : public RenderAction {
+ public:
+ explicit RenderActionAddElement(const std::string &page_id,
+ const RenderObject *render,
+ const RenderObject *parent, int index,
+ bool will_layout = true);
+
+ void ExecuteAction();
+
+ public:
+ 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_;
+};
+} // namespace WeexCore
+
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_ADD_ELEMENT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 bcd4aa5..c64ba19 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
@@ -17,22 +17,22 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_add_event.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionAddEvent::RenderActionAddEvent(const std::string &page_id, const std::string &ref,
- const std::string &event) {
- this->page_id_ = page_id;
- this->ref_ = ref;
- this->event_ = event;
- }
-
- void RenderActionAddEvent::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callAddEvent(this->page_id_.c_str(),
- this->ref_.c_str(),
- this->event_.c_str());
- }
+RenderActionAddEvent::RenderActionAddEvent(const std::string &page_id,
+ const std::string &ref,
+ const std::string &event) {
+ this->page_id_ = page_id;
+ this->ref_ = ref;
+ this->event_ = event;
+}
+void RenderActionAddEvent::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callAddEvent(
+ this->page_id_.c_str(), this->ref_.c_str(), this->event_.c_str());
}
+
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 6347177..b27f981 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
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_ADDEVENTACTION_H
-#define WEEX_PROJECT_ADDEVENTACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_ADD_EVENT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_ADD_EVENT_H_
#include <string>
@@ -25,19 +25,19 @@
namespace WeexCore {
- class RenderActionAddEvent : public RenderAction {
+class RenderActionAddEvent : public RenderAction {
+ public:
+ explicit RenderActionAddEvent(const std::string &page_id,
+ const std::string &ref,
+ const std::string &event);
- public:
- explicit RenderActionAddEvent(const std::string &page_id, const std::string &ref,
- const std::string &event);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+ std::string ref_;
+ std::string event_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- std::string ref_;
- std::string event_;
- };
-}
-
-#endif //WEEX_PROJECT_ADDEVENTACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_ADD_EVENT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 7f8b620..cafe48c 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
@@ -17,20 +17,20 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_appendtree_createfinish.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionAppendTreeCreateFinish::RenderActionAppendTreeCreateFinish(const std::string &page_id,
- const std::string &ref) {
- this->page_id_ = page_id;
- this->ref_ = ref;
- }
+RenderActionAppendTreeCreateFinish::RenderActionAppendTreeCreateFinish(
+ const std::string &page_id, const std::string &ref) {
+ this->page_id_ = page_id;
+ this->ref_ = ref;
+}
- void RenderActionAppendTreeCreateFinish::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callAppendTreeCreateFinish(
- this->page_id_.c_str(),
- this->ref_.c_str());
- }
+void RenderActionAppendTreeCreateFinish::ExecuteAction() {
+ WeexCoreManager::getInstance()
+ ->getPlatformBridge()
+ ->callAppendTreeCreateFinish(this->page_id_.c_str(), this->ref_.c_str());
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 32700fc..4ea40e8 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
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_CORE_RENDER_ACTION_APPENDTREE_CREATEFINISH_H
-#define WEEX_CORE_RENDER_ACTION_APPENDTREE_CREATEFINISH_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_APPENDTREE_CREATEFINISH_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_APPENDTREE_CREATEFINISH_H_
#include <string>
@@ -25,17 +25,17 @@
namespace WeexCore {
- class RenderActionAppendTreeCreateFinish : public RenderAction {
+class RenderActionAppendTreeCreateFinish : public RenderAction {
+ public:
+ explicit RenderActionAppendTreeCreateFinish(const std::string &page_id,
+ const std::string &ref);
- public:
- explicit RenderActionAppendTreeCreateFinish(const std::string &page_id, const std::string &ref);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+ std::string ref_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- std::string ref_;
- };
-}
-
-#endif //WEEX_CORE_RENDER_ACTION_APPENDTREE_CREATEFINISH_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_APPENDTREE_CREATEFINISH_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 75c5bdf..9f91ce6 100644
--- a/weex_core/Source/core/render/action/render_action_createbody.cpp
+++ b/weex_core/Source/core/render/action/render_action_createbody.cpp
@@ -17,34 +17,29 @@
* under the License.
*/
-#include "core/render/node/render_object.h"
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_createbody.h"
+#include "core/manager/weex_core_manager.h"
+#include "core/render/node/render_object.h"
namespace WeexCore {
- RenderActionCreateBody::RenderActionCreateBody(const std::string &page_id,
- const RenderObject *render) {
- 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();
- }
+RenderActionCreateBody::RenderActionCreateBody(const std::string &page_id,
+ const RenderObject *render) {
+ 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(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_);
- }
+void RenderActionCreateBody::ExecuteAction() {
+ 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_);
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 9de047d..23d713c 100644
--- a/weex_core/Source/core/render/action/render_action_createbody.h
+++ b/weex_core/Source/core/render/action/render_action_createbody.h
@@ -16,37 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_CREATEBODYACTION_H
-#define WEEX_PROJECT_CREATEBODYACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_CREATEBODY_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_CREATEBODY_H_
-#include <string>
#include <map>
#include <set>
+#include <string>
+#include "core/layout/style.h"
#include "core/render/action/render_action_interface.h"
namespace WeexCore {
- class RenderObject;
-
- class RenderActionCreateBody : public RenderAction {
-
- public:
- explicit RenderActionCreateBody(const std::string &page_id, const RenderObject *render);
-
- void ExecuteAction();
-
- public:
- 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_;
- };
-}
-
-#endif //WEEX_PROJECT_CREATEBODYACTION_H
+class RenderObject;
+
+class RenderActionCreateBody : public RenderAction {
+ public:
+ explicit RenderActionCreateBody(const std::string &page_id,
+ const RenderObject *render);
+
+ void ExecuteAction();
+
+ public:
+ 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_;
+};
+} // namespace WeexCore
+
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_CREATEBODY_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 a9a4b73..786981e 100644
--- a/weex_core/Source/core/render/action/render_action_createfinish.cpp
+++ b/weex_core/Source/core/render/action/render_action_createfinish.cpp
@@ -17,16 +17,17 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_createfinish.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionCreateFinish::RenderActionCreateFinish(const std::string &page_id) {
- this->page_id_ = page_id;
- }
+RenderActionCreateFinish::RenderActionCreateFinish(const std::string &page_id) {
+ this->page_id_ = page_id;
+}
- void RenderActionCreateFinish::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callCreateFinish(this->page_id_.c_str());
- }
+void RenderActionCreateFinish::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callCreateFinish(
+ this->page_id_.c_str());
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 449ea7d..4da25cf 100644
--- a/weex_core/Source/core/render/action/render_action_createfinish.h
+++ b/weex_core/Source/core/render/action/render_action_createfinish.h
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_CREATEFINISHACTION_H
-#define WEEX_PROJECT_CREATEFINISHACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_CREATEFINISH_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_CREATEFINISH_H_
#include <string>
@@ -25,16 +25,15 @@
namespace WeexCore {
- class RenderActionCreateFinish : public RenderAction {
+class RenderActionCreateFinish : public RenderAction {
+ public:
+ explicit RenderActionCreateFinish(const std::string &page_id);
- public:
- explicit RenderActionCreateFinish(const std::string &page_id);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- };
-}
-
-#endif //WEEX_PROJECT_CREATEFINISHACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_CREATEFINISH_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/core/render/action/render_action_interface.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/action/render_action_interface.h b/weex_core/Source/core/render/action/render_action_interface.h
index e5e3cbc..73f4888 100644
--- a/weex_core/Source/core/render/action/render_action_interface.h
+++ b/weex_core/Source/core/render/action/render_action_interface.h
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEXV8_RENDERACTION_H
-#define WEEXV8_RENDERACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_INTERFACE_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_INTERFACE_H_
namespace WeexCore {
- class RenderAction {
- public:
- virtual void ExecuteAction() = 0;
- };
-}
+class RenderAction {
+ public:
+ virtual void ExecuteAction() = 0;
+};
+} // namespace WeexCore
-#endif //WEEXV8_RENDERACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_INTERFACE_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 1edd9cb..e041511 100644
--- a/weex_core/Source/core/render/action/render_action_layout.cpp
+++ b/weex_core/Source/core/render/action/render_action_layout.cpp
@@ -17,35 +17,32 @@
* under the License.
*/
-#include "core/render/node/render_object.h"
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_layout.h"
+#include "core/manager/weex_core_manager.h"
+#include "core/render/node/render_object.h"
namespace WeexCore {
- RenderActionLayout::RenderActionLayout(const std::string &page_id, const RenderObject *render,
- int index) {
- this->page_id_ = page_id;
- this->ref_ = render->ref();
- this->index_ = index;
- GetLayoutInfo(render);
- }
+RenderActionLayout::RenderActionLayout(const std::string &page_id,
+ const RenderObject *render, int index) {
+ this->page_id_ = page_id;
+ this->ref_ = render->ref();
+ this->index_ = index;
+ GetLayoutInfo(render);
+}
- void RenderActionLayout::ExecuteAction() {
- 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::ExecuteAction() {
+ 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) {
- this->top_ = node->getLayoutPositionTop();
- this->bottom_ = node->getLayoutPositionBottom();
- this->right_ = node->getLayoutPositionRight();
- this->left_ = node->getLayoutPositionLeft();
- this->height_ = node->getLayoutHeight();
- this->width_ = node->getLayoutWidth();
- }
+void RenderActionLayout::GetLayoutInfo(const WXCoreLayoutNode *node) {
+ this->top_ = node->getLayoutPositionTop();
+ this->bottom_ = node->getLayoutPositionBottom();
+ this->right_ = node->getLayoutPositionRight();
+ this->left_ = node->getLayoutPositionLeft();
+ this->height_ = node->getLayoutHeight();
+ this->width_ = node->getLayoutWidth();
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 38b98e9..ef36700 100644
--- a/weex_core/Source/core/render/action/render_action_layout.h
+++ b/weex_core/Source/core/render/action/render_action_layout.h
@@ -16,41 +16,40 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_RELAYOUTRENDERACTION_H
-#define WEEX_PROJECT_RELAYOUTRENDERACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_LAYOUT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_LAYOUT_H_
-#include <string>
#include <set>
+#include <string>
#include "core/render/action/render_action_interface.h"
namespace WeexCore {
- class RenderObject;
-
- class WXCoreLayoutNode;
+class RenderObject;
- class RenderActionLayout : public RenderAction {
+class WXCoreLayoutNode;
- public:
- explicit RenderActionLayout(const std::string &page_id, const RenderObject *render,
- const int index);
+class RenderActionLayout : public RenderAction {
+ public:
+ explicit RenderActionLayout(const std::string &page_id,
+ const RenderObject *render, const int index);
- void ExecuteAction();
+ void ExecuteAction();
- void GetLayoutInfo(const WXCoreLayoutNode *node);
+ void GetLayoutInfo(const WXCoreLayoutNode *node);
- public:
- std::string page_id_;
- std::string ref_;
- float width_;
- float height_;
- float top_;
- float left_;
- float bottom_;
- float right_;
- int index_;
- };
-}
+ public:
+ std::string page_id_;
+ std::string ref_;
+ float width_;
+ float height_;
+ float top_;
+ float left_;
+ float bottom_;
+ float right_;
+ int index_;
+};
+} // namespace WeexCore
-#endif //WEEX_PROJECT_RELAYOUTRENDERACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_LAYOUT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 ac328ba..fab00cb 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
@@ -17,24 +17,24 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_move_element.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionMoveElement::RenderActionMoveElement(const std::string &page_id,
- const std::string &ref,
- const std::string &parent_ref, int index) {
- this->page_id_ = page_id;
- this->ref_ = ref;
- this->parent_ref_ = parent_ref;
- this->index_ = index;
- }
+RenderActionMoveElement::RenderActionMoveElement(const std::string &page_id,
+ const std::string &ref,
+ 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(this->page_id_.c_str(),
- this->ref_.c_str(),
- this->parent_ref_.c_str(),
- this->index_);
- }
-}
\ No newline at end of file
+void RenderActionMoveElement::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callMoveElement(
+ this->page_id_.c_str(), this->ref_.c_str(), this->parent_ref_.c_str(),
+ this->index_);
+}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 fcc6509..88d9044 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
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_RENDERACTIONMOVEELEMENT_H
-#define WEEX_PROJECT_RENDERACTIONMOVEELEMENT_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_MOVE_ELEMENT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_MOVE_ELEMENT_H_
#include <string>
@@ -25,20 +25,20 @@
namespace WeexCore {
- class RenderActionMoveElement : public RenderAction {
+class RenderActionMoveElement : public RenderAction {
+ public:
+ explicit RenderActionMoveElement(const std::string &page_id,
+ const std::string &ref,
+ const std::string &parent_ref, int index);
- public:
- explicit RenderActionMoveElement(const std::string &page_id, const std::string &ref,
- const std::string &parent_ref, int index);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+ std::string ref_;
+ std::string parent_ref_;
+ int index_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- std::string ref_;
- std::string parent_ref_;
- int index_;
- };
-}
-
-#endif //WEEX_PROJECT_RENDERACTIONMOVEELEMENT_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_MOVE_ELEMENT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 8995c40..ac00435 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
@@ -17,19 +17,19 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_remove_element.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionRemoveElement::RenderActionRemoveElement(const std::string &page_id,
- const std::string &ref) {
- this->page_id_ = page_id;
- this->ref_ = ref;
- }
+RenderActionRemoveElement::RenderActionRemoveElement(const std::string &page_id,
+ const std::string &ref) {
+ this->page_id_ = page_id;
+ this->ref_ = ref;
+}
- void RenderActionRemoveElement::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveElement(this->page_id_.c_str(),
- this->ref_.c_str());
- }
-}
\ No newline at end of file
+void RenderActionRemoveElement::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveElement(
+ this->page_id_.c_str(), this->ref_.c_str());
+}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 6699d0d..ff042d3 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
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_RENDERACTIONREMOVEELEMENT_H
-#define WEEX_PROJECT_RENDERACTIONREMOVEELEMENT_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_ELEMENT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_ELEMENT_H_
#include <string>
@@ -25,16 +25,17 @@
namespace WeexCore {
- class RenderActionRemoveElement : public RenderAction {
- public:
- explicit RenderActionRemoveElement(const std::string &page_id, const std::string &ref);
+class RenderActionRemoveElement : public RenderAction {
+ public:
+ explicit RenderActionRemoveElement(const std::string &page_id,
+ const std::string &ref);
- void ExecuteAction();
+ void ExecuteAction();
- public:
- std::string page_id_;
- std::string ref_;
- };
-}
+ public:
+ std::string page_id_;
+ std::string ref_;
+};
+} // namespace WeexCore
-#endif //WEEX_PROJECT_RENDERACTIONREMOVEELEMENT_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_ELEMENT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 732f7b7..f4ae667 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
@@ -17,22 +17,21 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_remove_event.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- RenderActionRemoveEvent::RenderActionRemoveEvent(const std::string &page_id,
- const std::string &ref,
- const std::string &event) {
- this->page_id_ = page_id;
- this->ref_ = ref;
- this->event_ = event;
- }
+RenderActionRemoveEvent::RenderActionRemoveEvent(const std::string &page_id,
+ const std::string &ref,
+ const std::string &event) {
+ this->page_id_ = page_id;
+ this->ref_ = ref;
+ this->event_ = event;
+}
- void RenderActionRemoveEvent::ExecuteAction() {
- WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveEvent(this->page_id_.c_str(),
- this->ref_.c_str(),
- this->event_.c_str());
- }
+void RenderActionRemoveEvent::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callRemoveEvent(
+ this->page_id_.c_str(), this->ref_.c_str(), this->event_.c_str());
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 5d6d0fe..f448032 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
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_REMOVEEVENTACTION_H
-#define WEEX_PROJECT_REMOVEEVENTACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_EVENT_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_EVENT_H_
#include <string>
@@ -25,19 +25,19 @@
namespace WeexCore {
- class RenderActionRemoveEvent : public RenderAction {
+class RenderActionRemoveEvent : public RenderAction {
+ public:
+ explicit RenderActionRemoveEvent(const std::string &page_id,
+ const std::string &ref,
+ const std::string &event);
- public:
- explicit RenderActionRemoveEvent(const std::string &page_id, const std::string &ref,
- const std::string &event);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+ std::string ref_;
+ std::string event_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- std::string ref_;
- std::string event_;
- };
-}
-
-#endif //WEEX_PROJECT_REMOVEEVENTACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_REMOVE_EVENT_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 35500b2..43f05e0 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
@@ -17,21 +17,21 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_update_attr.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- 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;
- }
+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(this->page_id_.c_str(),
- this->ref_.c_str(),
- this->attrs_);
- }
+void RenderActionUpdateAttr::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateAttr(
+ this->page_id_.c_str(), this->ref_.c_str(), this->attrs_);
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 81b48b5..56ebe90 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
@@ -16,29 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_UPDATEATTRACTION_H
-#define WEEX_PROJECT_UPDATEATTRACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_ATTR_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_ATTR_H_
#include <string>
+#include <utility>
#include <vector>
#include "core/render/action/render_action_interface.h"
namespace WeexCore {
- class RenderActionUpdateAttr : public RenderAction {
+class RenderActionUpdateAttr : public RenderAction {
+ public:
+ explicit RenderActionUpdateAttr(
+ const std::string &page_id, const std::string &ref,
+ std::vector<std::pair<std::string, std::string>> *attrs);
- public:
- explicit RenderActionUpdateAttr(const std::string &page_id, const std::string &ref,
- std::vector<std::pair<std::string, std::string>> *attrs);
+ void ExecuteAction();
- void ExecuteAction();
+ public:
+ std::string page_id_;
+ std::string ref_;
+ std::vector<std::pair<std::string, std::string>> *attrs_;
+};
+} // namespace WeexCore
- public:
- std::string page_id_;
- std::string ref_;
- std::vector<std::pair<std::string, std::string>> *attrs_;
- };
-}
-
-#endif //WEEX_PROJECT_UPDATEATTRACTION_H
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_ATTR_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 1bc9342..7ec19b8 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
@@ -17,31 +17,28 @@
* under the License.
*/
-#include "core/manager/weex_core_manager.h"
#include "core/render/action/render_action_update_style.h"
+#include "core/manager/weex_core_manager.h"
namespace WeexCore {
- 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->page_id_ = page_id;
- this->ref_ = ref;
- this->style_ = style;
- this->margin_ = margin;
- this->padding_ = padding;
- this->border_ = border;
- }
+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->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(this->page_id_.c_str(),
- this->ref_.c_str(),
- this->style_,
- this->margin_,
- this->padding_,
- this->border_);
- }
+void RenderActionUpdateStyle::ExecuteAction() {
+ WeexCoreManager::getInstance()->getPlatformBridge()->callUpdateStyle(
+ this->page_id_.c_str(), this->ref_.c_str(), this->style_, this->margin_,
+ this->padding_, this->border_);
}
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 ae914f5..e60d500 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
@@ -16,36 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_UPDATESTYLEACTION_H
-#define WEEX_PROJECT_UPDATESTYLEACTION_H
+#ifndef CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_STYLE_H_
+#define CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_STYLE_H_
#include <string>
+#include <utility>
#include <vector>
#include "core/render/action/render_action_interface.h"
namespace WeexCore {
- class RenderActionUpdateStyle : public RenderAction {
-
- public:
-
- 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,
- std::vector<std::pair<std::string, std::string>> *border);
-
- void ExecuteAction();
-
- public:
- 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_;
- };
-}
-
-#endif //WEEX_PROJECT_UPDATESTYLEACTION_H
+class RenderActionUpdateStyle : public RenderAction {
+ public:
+ 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,
+ std::vector<std::pair<std::string, std::string>> *border);
+
+ void ExecuteAction();
+
+ public:
+ 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_;
+};
+} // namespace WeexCore
+
+#endif // CORE_RENDER_ACTION_RENDER_ACTION_UPDATE_STYLE_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 64e179c..0eebc82 100644
--- a/weex_core/Source/core/render/manager/render_manager.cpp
+++ b/weex_core/Source/core/render/manager/render_manager.cpp
@@ -16,201 +16,201 @@
* specific language governing permissions and limitations
* under the License.
*/
-#include "core/render/manager/render_manager.h"
-#include "core/render/page/render_page.h"
-#include "core/render/node/render_object.h"
+
+#include <utility>
+#include <vector>
+
#include "base/TimeUtils.h"
-#include "core/parser/dom_wson.h"
#include "core/layout/measure_func_adapter.h"
+#include "core/parser/dom_wson.h"
+#include "core/render/manager/render_manager.h"
+#include "core/render/node/render_object.h"
+#include "core/render/page/render_page.h"
namespace WeexCore {
- RenderManager *RenderManager::g_pInstance = nullptr;
-
- bool RenderManager::CreatePage(std::string page_id, const char *data) {
+RenderManager *RenderManager::g_pInstance = nullptr;
+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());
+ wson_parser parser(data);
+ LOGD("[RenderManager] CreatePage >>>> pageId: %s, dom data: %s",
+ pageId.c_str(), parser.toStringUTF8().c_str());
#endif
- 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, page_id);
- page->ParseJsonTime(getCurrentTime() - startTime);
+ RenderPage *page = new RenderPage(page_id);
+ this->pages_.insert(std::pair<std::string, RenderPage *>(page_id, page));
- page->updateDirty(true);
- return page->CreateRootRender(root);
- }
+ int64_t start_time = getCurrentTime();
+ RenderObject *root = Wson2RenderObject(data, page_id);
+ page->ParseJsonTime(getCurrentTime() - start_time);
- bool RenderManager::AddRenderObject(const std::string &page_id, const std::string &parent_ref,
- int index, const char *data) {
+ page->set_is_dirty(true);
+ return page->CreateRootRender(root);
+}
- RenderPage *page = GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::AddRenderObject(const std::string &page_id,
+ const std::string &parent_ref, int index,
+ const char *data) {
+ RenderPage *page = GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- wson_parser parser(data);
- LOGD("[RenderManager] AddRenderObject >>>> pageId: %s, parentRef: %s, index: %d, dom data: %s",
- pageId.c_str(), parentRef.c_str(), index, parser.toStringUTF8().c_str());
+ wson_parser parser(data);
+ LOGD(
+ "[RenderManager] AddRenderObject >>>> pageId: %s, parentRef: %s, index: "
+ "%d, dom data: %s",
+ pageId.c_str(), parentRef.c_str(), index, parser.toStringUTF8().c_str());
#endif
- long long startTime = getCurrentTime();
- RenderObject *child = Wson2RenderObject(data, page_id);
- page->ParseJsonTime(getCurrentTime() - startTime);
+ int64_t start_time = getCurrentTime();
+ RenderObject *child = Wson2RenderObject(data, page_id);
+ page->ParseJsonTime(getCurrentTime() - start_time);
- if (child == nullptr)
- return false;
+ if (child == nullptr) return false;
- page->updateDirty(true);
- return page->AddRenderObject(parent_ref, index, child);
- }
-
- bool RenderManager::RemoveRenderObject(const std::string &page_id, const std::string &ref) {
+ page->set_is_dirty(true);
+ return page->AddRenderObject(parent_ref, index, child);
+}
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::RemoveRenderObject(const std::string &page_id,
+ const std::string &ref) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- LOGD("[RenderManager] RemoveRenderObject >>>> pageId: %s, ref: %s", pageId.c_str(),
- ref.c_str());
+ LOGD("[RenderManager] RemoveRenderObject >>>> pageId: %s, ref: %s",
+ pageId.c_str(), ref.c_str());
#endif
- page->updateDirty(true);
- return page->RemoveRenderObject(ref);
- }
+ page->set_is_dirty(true);
+ return page->RemoveRenderObject(ref);
+}
- 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;
+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;
#if RENDER_LOG
- LOGD("[RenderManager] MoveRenderObject >>>> pageId: %s, ref: %s, parentRef: %s, index: %d",
- pageId.c_str(), ref.c_str(), parentRef.c_str(), index);
+ LOGD(
+ "[RenderManager] MoveRenderObject >>>> pageId: %s, ref: %s, parentRef: "
+ "%s, index: %d",
+ pageId.c_str(), ref.c_str(), parentRef.c_str(), index);
#endif
- page->updateDirty(true);
- return page->MoveRenderObject(ref, parent_ref, index);
- }
+ page->set_is_dirty(true);
+ return page->MoveRenderObject(ref, parent_ref, index);
+}
- bool RenderManager::UpdateAttr(const std::string &page_id, const std::string &ref,
- const char *data) {
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::UpdateAttr(const std::string &page_id,
+ const std::string &ref, const char *data) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- wson_parser parser(data);
- LOGD("[RenderManager] UpdateAttr >>>> pageId: %s, ref: %s, data: %s",
- pageId.c_str(), ref.c_str(), parser.toStringUTF8().c_str());
+ wson_parser parser(data);
+ LOGD("[RenderManager] UpdateAttr >>>> pageId: %s, ref: %s, data: %s",
+ pageId.c_str(), ref.c_str(), parser.toStringUTF8().c_str());
#endif
- long long startTime = getCurrentTime();
- std::vector <std::pair<std::string, std::string>> *attrs = Wson2Pairs(data);
- page->ParseJsonTime(getCurrentTime() - startTime);
+ int64_t start_time = getCurrentTime();
+ std::vector<std::pair<std::string, std::string>> *attrs = Wson2Pairs(data);
+ page->ParseJsonTime(getCurrentTime() - start_time);
- page->updateDirty(true);
- return page->UpdateAttr(ref, attrs);
- }
+ page->set_is_dirty(true);
+ return page->UpdateAttr(ref, attrs);
+}
- bool RenderManager::UpdateStyle(const std::string &page_id, const std::string &ref,
- const char *data) {
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::UpdateStyle(const std::string &page_id,
+ const std::string &ref, const char *data) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- wson_parser parser(data);
- LOGD("[RenderManager] UpdateStyle >>>> pageId: %s, ref: %s, data: %s",
- pageId.c_str(), ref.c_str(), parser.toStringUTF8().c_str());
+ wson_parser parser(data);
+ LOGD("[RenderManager] UpdateStyle >>>> pageId: %s, ref: %s, data: %s",
+ pageId.c_str(), ref.c_str(), parser.toStringUTF8().c_str());
#endif
- long long startTime = getCurrentTime();
- std::vector <std::pair<std::string, std::string>> *styles = Wson2Pairs(data);
- page->ParseJsonTime(getCurrentTime() - startTime);
+ int64_t start_time = getCurrentTime();
+ std::vector<std::pair<std::string, std::string>> *styles = Wson2Pairs(data);
+ page->ParseJsonTime(getCurrentTime() - start_time);
- page->updateDirty(true);
- return page->UpdateStyle(ref, styles);
- }
+ page->set_is_dirty(true);
+ return page->UpdateStyle(ref, styles);
+}
- bool RenderManager::AddEvent(const std::string &page_id, const std::string &ref,
- const std::string &event) {
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::AddEvent(const std::string &page_id, const std::string &ref,
+ const std::string &event) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- LOGD("[RenderManager] AddEvent >>>> pageId: %s, ref: %s, event: %s",
- pageId.c_str(), ref.c_str(), event.c_str());
+ LOGD("[RenderManager] AddEvent >>>> pageId: %s, ref: %s, event: %s",
+ pageId.c_str(), ref.c_str(), event.c_str());
#endif
- page->updateDirty(true);
- return page->AddEvent(ref, event);
- }
+ page->set_is_dirty(true);
+ return page->AddEvent(ref, event);
+}
- bool RenderManager::RemoveEvent(const std::string &page_id, const std::string &ref,
- const std::string &event) {
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::RemoveEvent(const std::string &page_id,
+ const std::string &ref,
+ const std::string &event) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- LOGD("[RenderManager] RemoveEvent >>>> pageId: %s, ref: %s, event: %s",
- pageId.c_str(), ref.c_str(), event.c_str());
+ LOGD("[RenderManager] RemoveEvent >>>> pageId: %s, ref: %s, event: %s",
+ pageId.c_str(), ref.c_str(), event.c_str());
#endif
- page->updateDirty(true);
- return page->RemoveEvent(ref, event);
- }
+ page->set_is_dirty(true);
+ return page->RemoveEvent(ref, event);
+}
- bool RenderManager::CreateFinish(const std::string &page_id) {
- RenderPage *page = GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::CreateFinish(const std::string &page_id) {
+ RenderPage *page = GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- LOGD("[RenderManager] CreateFinish >>>> pageId: %s", pageId.c_str());
+ LOGD("[RenderManager] CreateFinish >>>> pageId: %s", pageId.c_str());
#endif
- page->updateDirty(true);
- return page->CreateFinish();
- }
-
- 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;
- }
+ page->set_is_dirty(true);
+ return page->CreateFinish();
+}
+
+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 &page_id) {
- RenderPage *page = GetPage(page_id);
- if (page == nullptr)
- return false;
+bool RenderManager::ClosePage(const std::string &page_id) {
+ RenderPage *page = GetPage(page_id);
+ if (page == nullptr) return false;
#if RENDER_LOG
- LOGD("[RenderManager] ClosePage >>>> pageId: %s", pageId.c_str());
+ LOGD("[RenderManager] ClosePage >>>> pageId: %s", pageId.c_str());
#endif
- page->OnRenderPageClose();
- this->pages_.erase(page_id);
- delete page;
- page = nullptr;
- }
+ page->OnRenderPageClose();
+ this->pages_.erase(page_id);
+ delete page;
+ page = nullptr;
+}
- void RenderManager::Batch(const std::string &page_id) {
- RenderPage *page = this->GetPage(page_id);
- if (page == nullptr)
- return;
+void RenderManager::Batch(const std::string &page_id) {
+ RenderPage *page = this->GetPage(page_id);
+ if (page == nullptr) return;
- page->Batch();
- }
+ page->Batch();
+}
-} //namespace WeexCore
+} // namespace WeexCore
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 b87c486..9abe2da 100644
--- a/weex_core/Source/core/render/manager/render_manager.h
+++ b/weex_core/Source/core/render/manager/render_manager.h
@@ -16,76 +16,80 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef RenderManager_h
-#define RenderManager_h
+#ifndef CORE_RENDER_MANAGER_RENDER_MANAGER_H_
+#define CORE_RENDER_MANAGER_RENDER_MANAGER_H_
#include <map>
#include <string>
namespace WeexCore {
- class RenderPage;
+class RenderPage;
- class RenderManager {
+class RenderManager {
+ private:
+ RenderManager() {}
- private:
- explicit RenderManager() {}
+ ~RenderManager() {}
- ~RenderManager() {}
-
- //just to release singleton object
- class Garbo {
- public:
- ~Garbo() {
- if (RenderManager::g_pInstance) {
- delete RenderManager::g_pInstance;
- }
+ // just to release singleton object
+ class Garbo {
+ public:
+ ~Garbo() {
+ if (RenderManager::g_pInstance) {
+ delete RenderManager::g_pInstance;
}
- };
-
- static Garbo garbo;
+ }
+ };
- public:
+ static Garbo garbo;
- void Batch(const std::string &page_id);
+ public:
+ void Batch(const std::string &page_id);
- // create root node
- bool CreatePage(std::string page_id, const char *data);
+ // create root node
+ 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 &page_id, const std::string &parent_ref, int index,
- const char *data);
+ /** use auto constructor is bad idea, it cann't transfer binary, use char* is
+ * better */
+ bool AddRenderObject(const std::string &page_id,
+ const std::string &parent_ref, int index,
+ const char *data);
- bool RemoveRenderObject(const std::string &page_id, const std::string &ref);
+ bool RemoveRenderObject(const std::string &page_id, const std::string &ref);
- bool MoveRenderObject(const std::string &page_id, const std::string &ref,
- const std::string &parent_ref, 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 &page_id, 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 &page_id, 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 &page_id, 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 &page_id, 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 &page_id);
+ bool CreateFinish(const std::string &page_id);
- RenderPage *GetPage(const std::string &page_id);
+ RenderPage *GetPage(const std::string &page_id);
- bool ClosePage(const std::string &page_id);
+ bool ClosePage(const std::string &page_id);
- static RenderManager *GetInstance() {
- if (!g_pInstance) {
- g_pInstance = new RenderManager();
- }
- return g_pInstance;
+ static RenderManager *GetInstance() {
+ if (!g_pInstance) {
+ g_pInstance = new RenderManager();
}
+ return g_pInstance;
+ }
- private:
- static RenderManager *g_pInstance;
- std::map<std::string, RenderPage *> pages_;
- };
-}
+ private:
+ static RenderManager *g_pInstance;
+ std::map<std::string, RenderPage *> pages_;
+};
+} // namespace WeexCore
-#endif //RenderManager_h
\ No newline at end of file
+#endif // CORE_RENDER_MANAGER_RENDER_MANAGER_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/core/render/node/factory/render_appbar_factory.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/factory/render_appbar_factory.h b/weex_core/Source/core/render/node/factory/render_appbar_factory.h
index 874cdda..803666f 100644
--- a/weex_core/Source/core/render/node/factory/render_appbar_factory.h
+++ b/weex_core/Source/core/render/node/factory/render_appbar_factory.h
@@ -16,21 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_RENDERAPPBARFACTORY_H
-#define WEEX_PROJECT_RENDERAPPBARFACTORY_H
+#ifndef CORE_RENDER_NODE_FACTORY_RENDER_APPBAR_FACTORY_H_
+#define CORE_RENDER_NODE_FACTORY_RENDER_APPBAR_FACTORY_H_
-#include "core/render/node/render_appbar.h"
#include "core/render/node/factory/render_factory_interface.h"
+#include "core/render/node/render_appbar.h"
namespace WeexCore {
- class RenderAppBarFactory : public IRenderFactory {
- public:
- IRenderObject *CreateRender() {
- return new RenderAppBar();
- }
- };
+class RenderAppBarFactory : public IRenderFactory {
+ public:
+ IRenderObject *CreateRender() { return new RenderAppBar(); }
+};
-}
+} // namespace WeexCore
-#endif //WEEX_PROJECT_RENDERAPPBARFACTORY_H
+#endif // CORE_RENDER_NODE_FACTORY_RENDER_APPBAR_FACTORY_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/weex_core/Source/core/render/node/factory/render_cell_factory.h
----------------------------------------------------------------------
diff --git a/weex_core/Source/core/render/node/factory/render_cell_factory.h b/weex_core/Source/core/render/node/factory/render_cell_factory.h
index 2d4ae5b..d6d439a 100644
--- a/weex_core/Source/core/render/node/factory/render_cell_factory.h
+++ b/weex_core/Source/core/render/node/factory/render_cell_factory.h
@@ -16,20 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-#ifndef WEEX_PROJECT_RENDERCELLFACTORY_H
-#define WEEX_PROJECT_RENDERCELLFACTORY_H
+#ifndef CORE_RENDER_NODE_FACTORY_RENDER_CELL_FACTORY_H_
+#define CORE_RENDER_NODE_FACTORY_RENDER_CELL_FACTORY_H_
-#include "core/render/node/render_cell.h"
#include "core/render/node/factory/render_factory_interface.h"
+#include "core/render/node/render_cell.h"
namespace WeexCore {
- class RenderCellFactory : public IRenderFactory {
- public:
- IRenderObject *CreateRender() {
- return new RenderCell();
- }
- };
+class RenderCellFactory : public IRenderFactory {
+ public:
+ IRenderObject *CreateRender() { return new RenderCell(); }
+};
-}
-#endif //WEEX_PROJECT_RENDERCELLFACTORY_H
+} // namespace WeexCore
+#endif // CORE_RENDER_NODE_FACTORY_RENDER_CELL_FACTORY_H_
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ad255b3a/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 92f8c3b..8632110 100644
--- a/weex_core/Source/core/render/node/factory/render_creator.cpp
+++ b/weex_core/Source/core/render/node/factory/render_creator.cpp
@@ -17,40 +17,42 @@
* under the License.
*/
#include "core/render/node/factory/render_creator.h"
-#include "core/render/node/factory/render_object_interface.h"
+#include "core/render/node/factory/render_appbar_factory.h"
#include "core/render/node/factory/render_factory_interface.h"
-#include "core/render/node/factory/render_text_factory.h"
-#include "core/render/node/factory/simple_render_factory.h"
#include "core/render/node/factory/render_list_factory.h"
#include "core/render/node/factory/render_mask_factory.h"
+#include "core/render/node/factory/render_object_interface.h"
#include "core/render/node/factory/render_scroller_factory.h"
-#include "core/render/node/factory/render_appbar_factory.h"
+#include "core/render/node/factory/render_text_factory.h"
#include "core/render/node/factory/render_type.h"
+#include "core/render/node/factory/simple_render_factory.h"
namespace WeexCore {
- RenderCreator *RenderCreator::g_pInstance = nullptr;
+RenderCreator *RenderCreator::g_pInstance = nullptr;
- IRenderObject *RenderCreator::CreateRender(const std::string &type, const std::string &ref) {
- IRenderFactory *factory;
- if (type == kRenderText) {
- factory = new RenderTextFactory();
- } else if (type == kRenderList || type == kRenderWaterfall || type == kRenderRecycleList) {
- factory = new RenderListFactory();
- } else if (type == kRenderMask) {
- factory = new RenderMaskFactory();
- } else if (type == kRenderScroller) {
- factory = new RenderScrollerFactory();
- } else if (type == kRenderAppBar) {
- factory = new RenderAppBarFactory();
- } else {
- factory = new RenderCommonFactory();
- }
-
- IRenderObject *render = factory->CreateRender();
- render->set_ref(ref);
- render->set_type(type);
- delete factory;
- return render;
+IRenderObject *RenderCreator::CreateRender(const std::string &type,
+ const std::string &ref) {
+ IRenderFactory *factory;
+ if (type == kRenderText) {
+ factory = new RenderTextFactory();
+ } else if (type == kRenderList || type == kRenderWaterfall ||
+ type == kRenderRecycleList) {
+ factory = new RenderListFactory();
+ } else if (type == kRenderMask) {
+ factory = new RenderMaskFactory();
+ } else if (type == kRenderScroller) {
+ factory = new RenderScrollerFactory();
+ } else if (type == kRenderAppBar) {
+ factory = new RenderAppBarFactory();
+ } else {
+ factory = new RenderCommonFactory();
}
+
+ IRenderObject *render = factory->CreateRender();
+ render->set_ref(ref);
+ render->set_type(type);
+ delete factory;
+ return render;
}
+} // namespace WeexCore