Improve embedlite trace logs

This commit also separates tracing logs into "EmbedLiteTrace" log module.
sailfishos · Dec 19, 2016 · 041bc56 · 041bc56
1 parent d23e956
commit 041bc56
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -89,7 +89,7 @@ EmbedLiteView::LoadURL(const char* aUrl)
 void
 EmbedLiteView::SetIsActive(bool aIsActive)
 {
-  LOGT();
+  LOGT("active: %d", aIsActive);
   NS_ENSURE_TRUE(mViewParent, );
   unused << mViewParent->SendSetIsActive(aIsActive);
   // Make sure active view content controller is always registered with
@@ -235,6 +235,7 @@ EmbedLiteView::SetDPI(const float& dpi)
 void
 EmbedLiteView::ReceiveInputEvent(const InputData& aEvent)
 {
+  LOGT();
   NS_ENSURE_TRUE(mViewImpl,);
   mViewImpl->ReceiveInputEvent(aEvent);
 }

diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -403,7 +403,7 @@ EmbedLitePuppetWidget::GetNativeData(uint32_t aDataType)
   LOGT("t:%p, DataType: %i", this, aDataType);
   switch (aDataType) {
     case NS_NATIVE_SHAREABLE_WINDOW: {
-      LOGW("aDataType:%i\n", __LINE__, aDataType);
+      LOGW("aDataType:%i\n", aDataType);
       return (void*)nullptr;
     }
     case NS_NATIVE_OPENGL_CONTEXT: {

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseChild.cpp
@@ -1028,6 +1028,7 @@ bool EmbedLiteViewBaseChild::ContentReceivedInputBlock(const ScrollableLayerGuid
 bool
 EmbedLiteViewBaseChild::RecvInputDataTouchEvent(const ScrollableLayerGuid& aGuid, const mozilla::MultiTouchInput& aData, const uint64_t& aInputBlockId)
 {
+  LOGT();
   WidgetTouchEvent localEvent;
   if (!mHelper->ConvertMutiTouchInputToEvent(aData, localEvent)) {
     return true;
@@ -1221,7 +1222,7 @@ EmbedLiteViewBaseChild::DispatchSynthesizedMouseEvent(const WidgetTouchEvent& aE
 
 void EmbedLiteViewBaseChild::WidgetBoundsChanged(const nsIntRect& aSize)
 {
-  LOGT("sz[%g,%g]", aSize.width, aSize.height);
+  LOGT("sz[%d,%d]", aSize.width, aSize.height);
   mViewResized = true;
 
   MOZ_ASSERT(mHelper && mWebBrowser);

diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp
@@ -59,14 +59,15 @@ EmbedLiteViewBaseParent::ActorDestroy(ActorDestroyReason aWhy)
 void
 EmbedLiteViewBaseParent::SetCompositor(EmbedLiteCompositorParent* aCompositor)
 {
-  LOGT();
   mCompositor = aCompositor;
+  LOGT("compositor: %p", mCompositor.get());
   UpdateScrollController();
 }
 
 void
 EmbedLiteViewBaseParent::UpdateScrollController()
 {
+  LOGT("view api destroyed: %d mVIew: %p compositor: %p\n", mViewAPIDestroyed, mView, mCompositor.get());
   if (mViewAPIDestroyed || !mView) {
     return;
   }
@@ -284,6 +285,7 @@ EmbedLiteViewBaseParent::RecvZoomToRect(const uint32_t& aPresShellId,
 bool
 EmbedLiteViewBaseParent::RecvContentReceivedInputBlock(const ScrollableLayerGuid& aGuid, const uint64_t& aInputBlockId, const bool& aPreventDefault)
 {
+  LOGT();
   if (mController->GetManager()) {
     mController->GetManager()->ContentReceivedInputBlock(aInputBlockId, aPreventDefault);
   }
@@ -380,6 +382,7 @@ EmbedLiteViewBaseParent::CompositorCreated()
 NS_IMETHODIMP
 EmbedLiteViewBaseParent::ReceiveInputEvent(const mozilla::InputData& aEvent)
 {
+  LOGT("APZCTreeManager: %p\n", mController->GetManager());
   if (mController->GetManager()) {
     ScrollableLayerGuid guid;
     uint64_t outInputBlockId;

diff --git a/embedding/embedlite/embedthread/EmbedContentController.cpp b/embedding/embedlite/embedthread/EmbedContentController.cpp
@@ -28,6 +28,7 @@ EmbedContentController::EmbedContentController(EmbedLiteViewBaseParent* aRenderF
 void EmbedContentController::SetManagerByRootLayerTreeId(uint64_t aRootLayerTreeId)
 {
   mAPZC = CompositorParent::GetAPZCTreeManager(aRootLayerTreeId);
+  LOGT("APZCTreeManager: %p\n", mAPZC.get());
 }
 
 void EmbedContentController::RequestContentRepaint(const FrameMetrics& aFrameMetrics)
@@ -194,6 +195,9 @@ EmbedContentController::ReceiveInputEvent(InputData& aEvent,
                                           mozilla::layers::ScrollableLayerGuid* aOutTargetGuid,
                                           uint64_t* aOutInputBlockId)
 {
+
+  LOGT(" has mAPZC: %p\n", mAPZC.get());
+
   if (!mAPZC) {
     return nsEventStatus_eIgnore;
   }

diff --git a/embedding/embedlite/utils/EmbedLog.h b/embedding/embedlite/utils/EmbedLog.h
@@ -16,7 +16,7 @@
 extern mozilla::LogModule* GetEmbedCommonLog(const char* aModule);
 
 #define LOGF(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLite"), mozilla::LogLevel::Error, ("FUNC::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGT(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLite"), mozilla::LogLevel::Debug, ("TRACE::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGT(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLiteTrace"), mozilla::LogLevel::Debug, ("TRACE::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define LOGW(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLite"), mozilla::LogLevel::Info, ("WARN: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define LOGE(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLite"), mozilla::LogLevel::Warning, ("ERROR: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
 #define LOGNI(FMT, ...) MOZ_LOG(GetEmbedCommonLog("EmbedLite"), mozilla::LogLevel::Error, ("NON_IMPL: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))