Merge branch 'lognitologt' into 'master'

Switch LOGNI() for LOGT() in places See merge request mer-core/gecko-dev!250
sailfishos · Apr 28, 2021 · e2967be · e2967be
2 parents eb79852 + e925d62
commit e2967be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp b/embedding/embedlite/embedshared/EmbedLiteViewBaseParent.cpp
@@ -134,7 +134,7 @@ EmbedLiteViewBaseParent::RecvOnLocationChanged(const nsCString& aLocation,
                                                  const bool& aCanGoBack,
                                                  const bool& aCanGoForward)
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnLocationChanged(aLocation.get(), aCanGoBack, aCanGoForward);
@@ -143,7 +143,7 @@ EmbedLiteViewBaseParent::RecvOnLocationChanged(const nsCString& aLocation,
 
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadStarted(const nsCString& aLocation)
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnLoadStarted(aLocation.get());
@@ -152,7 +152,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadStarted(const nsCStri
 
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadFinished()
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnLoadFinished();
@@ -161,7 +161,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadFinished()
 
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnWindowCloseRequested()
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnWindowCloseRequested();
@@ -170,7 +170,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnWindowCloseRequested()
 
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadRedirect()
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnLoadRedirect();
@@ -179,7 +179,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadRedirect()
 
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadProgress(const int32_t &aProgress, const int32_t &aCurTotal, const int32_t &aMaxTotal)
 {
-  LOGNI("progress:%i", aProgress);
+  LOGT("progress:%i", aProgress);
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnLoadProgress(aProgress, aCurTotal, aMaxTotal);
@@ -189,7 +189,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnLoadProgress(const int32_
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnSecurityChanged(const nsCString &aStatus,
                                                                        const uint32_t &aState)
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnSecurityChanged(aStatus.get(), aState);
@@ -199,7 +199,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnSecurityChanged(const nsC
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnFirstPaint(const int32_t &aX,
                                                                   const int32_t &aY)
 {
-  LOGNI();
+  LOGT();
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnFirstPaint(aX, aY);
@@ -209,7 +209,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnFirstPaint(const int32_t
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnScrolledAreaChanged(const uint32_t &aWidth,
                                                                            const uint32_t &aHeight)
 {
-  LOGNI("area[%u,%u]", aWidth, aHeight);
+  LOGT("area[%u,%u]", aWidth, aHeight);
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnScrolledAreaChanged(aWidth, aHeight);
@@ -219,7 +219,7 @@ mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnScrolledAreaChanged(const
 mozilla::ipc::IPCResult EmbedLiteViewBaseParent::RecvOnScrollChanged(const int32_t& offSetX,
                                                const int32_t& offSetY)
 {
-  LOGNI("off[%i,%i]", offSetX, offSetY);
+  LOGT("off[%i,%i]", offSetX, offSetY);
   NS_ENSURE_TRUE(mView && !mViewAPIDestroyed, IPC_OK());
 
   mView->GetListener()->OnScrollChanged(offSetX, offSetY);

diff --git a/embedding/embedlite/embedshared/PuppetWidgetBase.cpp b/embedding/embedlite/embedshared/PuppetWidgetBase.cpp
@@ -148,7 +148,7 @@ PuppetWidgetBase::ConstrainPosition(bool, int32_t *aX, int32_t *aY)
 {
   *aX = kMaxDimension;
   *aY = kMaxDimension;
-  LOGNI();
+  LOGT();
 }
 
 // We're always at <0, 0>, and so ignore move requests.
@@ -214,14 +214,14 @@ PuppetWidgetBase::Resize(double aX, double aY, double aWidth, double aHeight, bo
 void
 PuppetWidgetBase::Enable(bool aState)
 {
-  LOGNI();
+  LOGT();
   mEnabled = aState;
 }
 
 bool
 PuppetWidgetBase::IsEnabled() const
 {
-  LOGNI();
+  LOGT();
   return mEnabled;
 }
 

diff --git a/embedding/embedlite/embedthread/EmbedContentController.cpp b/embedding/embedlite/embedthread/EmbedContentController.cpp
@@ -137,7 +137,7 @@ void EmbedContentController::DoSendScrollEvent(const FrameMetrics aFrameMetrics)
     contentRect.MoveTo(aFrameMetrics.GetScrollOffset());
     CSSSize scrollableSize = aFrameMetrics.GetScrollableRect().Size();
 
-    LOGNI("contentR[%g,%g,%g,%g], scrSize[%g,%g]",
+    LOGT("contentR[%g,%g,%g,%g], scrSize[%g,%g]",
           contentRect.x, contentRect.y, contentRect.width, contentRect.height,
           scrollableSize.width, scrollableSize.height);
     gfxRect rect(contentRect.x, contentRect.y, contentRect.width, contentRect.height);

diff --git a/embedding/embedlite/utils/WindowCreator.cpp b/embedding/embedlite/utils/WindowCreator.cpp
@@ -95,7 +95,7 @@ WindowCreator::CreateChromeWindow(nsIWebBrowserChrome* aParent,
                                   uint32_t aChromeFlags,
                                   nsIWebBrowserChrome* *_retval)
 {
-  LOGNI();
+  LOGT();
   bool cancel;
   return CreateChromeWindow2(aParent, aChromeFlags, nullptr, nullptr, 0, &cancel, _retval);
 }