Refactor CRU_LOG_TAG_*.

4 files changed, 18 insertions, 16 deletions

diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 18fc6475..080bcc4f 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -82,8 +82,8 @@ RenderObject* BorderRenderObject::HitTest(const Point& point) {
 
 void BorderRenderObject::Draw(platform::graphics::IPainter* painter) {
   if constexpr (debug_flags::draw) {
-    CRU_LOG_TAG_DEBUG(
-        "BorderRenderObject draw, background: {}, foreground: {}.",
+    CruLogDebug(
+        kLogTag, "BorderRenderObject draw, background: {}, foreground: {}.",
         background_brush_ == nullptr ? "NONE"
                                      : background_brush_->GetDebugString(),
         foreground_brush_ == nullptr ? "NONE"
@@ -96,7 +96,7 @@ void BorderRenderObject::Draw(platform::graphics::IPainter* painter) {
 
   if (is_border_enabled_) {
     if (border_brush_ == nullptr) {
-      CRU_LOG_TAG_WARN("Border is enabled but border brush is null.");
+      CruLogWarn(kLogTag, "Border is enabled but border brush is null.");
     } else {
       painter->FillGeometry(geometry_.get(), border_brush_.get());
     }
diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index 124f7e70..4c7762e3 100644
--- a/src/ui/render/FlexLayoutRenderObject.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -299,7 +299,8 @@ Size FlexLayoutMeasureContentImpl(
 
   if (max_main_length.IsSpecified() &&
       total_length > max_main_length.GetLengthOrUndefined()) {
-    CRU_LOG_TAG_WARN(
+    CruLogWarn(
+        kLogTag,
         "(Measure) Children's main axis length exceeds required max length.");
     total_length = max_main_length.GetLengthOrUndefined();
   } else if (min_main_length.IsSpecified() &&
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index 424fd2ee..f6f081ec 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -82,8 +82,8 @@ void RenderObject::SetMaxSize(const MeasureSize& max_size) {
 }
 
 void RenderObject::Measure(const MeasureRequirement& requirement) {
-  CRU_LOG_TAG_DEBUG("{} Measure begins, requirement {}.",
-                    this->GetDebugPathInTree(), requirement);
+  CruLogDebug(kLogTag, "{} Measure begins, requirement {}.",
+              this->GetDebugPathInTree(), requirement);
 
   if (layout_valid_ && requirement == last_measure_requirement_) {
     return;
@@ -96,8 +96,8 @@ void RenderObject::Measure(const MeasureRequirement& requirement) {
 
   last_measure_requirement_ = requirement;
 
-  CRU_LOG_TAG_DEBUG("{} Measure ends, result size: {}.",
-                    this->GetDebugPathInTree(), measure_result_size_);
+  CruLogDebug(kLogTag, "{} Measure ends, result size: {}.",
+              this->GetDebugPathInTree(), measure_result_size_);
 }
 
 void RenderObject::Layout(const Point& offset) {
@@ -105,8 +105,8 @@ void RenderObject::Layout(const Point& offset) {
 }
 
 void RenderObject::Layout(const Rect& rect) {
-  CRU_LOG_TAG_DEBUG("{} Layout begins, rect: {}.", this->GetDebugPathInTree(),
-                    rect);
+  CruLogDebug(kLogTag, "{} Layout begins, rect: {}.",
+              this->GetDebugPathInTree(), rect);
 
   offset_ = rect.GetLeftTop();
   auto new_size = rect.GetSize();
@@ -118,7 +118,7 @@ void RenderObject::Layout(const Rect& rect) {
   OnLayoutCore(rect);
   layout_valid_ = true;
 
-  CRU_LOG_TAG_DEBUG("{} Layout ends.", this->GetDebugPathInTree());
+  CruLogDebug(kLogTag, "{} Layout ends.", this->GetDebugPathInTree());
 }
 
 Thickness RenderObject::GetTotalSpaceThickness() { return margin_ + padding_; }
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 1fe8e652..12d77d0d 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -178,11 +178,12 @@ RenderObject* TextRenderObject::HitTest(const Point& point) {
 
 void TextRenderObject::Draw(platform::graphics::IPainter* painter) {
   if constexpr (debug_flags::draw) {
-    CRU_LOG_TAG_DEBUG(
-        "Begin to paint, total_offset: {}, size: {}, text_layout: "
-        "{}, brush: {}.",
-        this->GetTotalOffset(), this->GetMeasureResultSize(),
-        this->text_layout_->GetDebugString(), this->brush_->GetDebugString());
+    CruLogDebug(kLogTag,
+                "Begin to paint, total_offset: {}, size: {}, text_layout: "
+                "{}, brush: {}.",
+                this->GetTotalOffset(), this->GetMeasureResultSize(),
+                this->text_layout_->GetDebugString(),
+                this->brush_->GetDebugString());
   }
 
   if (this->selection_range_.has_value()) {