Allow to build most of embedlite sources in unified mode

embedding/embedlite/EmbedLiteApp.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteApp"
 #include "EmbedLog.h"
 
 #include "EmbedLiteApp.h"

embedding/embedlite/EmbedLiteMessagePump.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteMessagePump"
 #include "EmbedLog.h"
 
 #include "EmbedLiteMessagePump.h"

embedding/embedlite/EmbedLiteRenderTarget.cpp

@@ -3,11 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteRenderTarget"
 #include "EmbedLog.h"
 
-#include "EmbedLiteRenderTarget.h"
 #include "GLContext.h"
+#include "EmbedLiteRenderTarget.h"
 #include "GLContextProvider.h"
 
 using namespace mozilla::gl;

embedding/embedlite/EmbedLiteView.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteView"
 #include "EmbedLog.h"
 
 #include "EmbedLiteView.h"

embedding/embedlite/embedhelpers/EmbedLiteSubThread.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteSubThread"
 #include "EmbedLog.h"
 
 #include "EmbedLiteSubThread.h"

embedding/embedlite/embedhelpers/EmbedLiteUILoop.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteUILoop"
 #include "EmbedLog.h"
 
 #include "EmbedLiteUILoop.h"

embedding/embedlite/embedthread/EmbedContentController.cpp

@@ -17,7 +17,6 @@ using namespace mozilla::gfx;
 using namespace mozilla::layers;
 
 class FakeListener : public EmbedLiteViewListener {};
-static FakeListener sFakeListener;
 
 EmbedContentController::EmbedContentController(EmbedLiteViewThreadParent* aRenderFrame, MessageLoop* aUILoop)
   : mUILoop(aUILoop)
@@ -167,6 +166,7 @@ void EmbedContentController::PostDelayedTask(Task* aTask, int aDelayMs)
 
 EmbedLiteViewListener* const EmbedContentController::GetListener() const
 {
+  static FakeListener sFakeListener;
   return mRenderFrame && mRenderFrame->mView ?
          mRenderFrame->mView->GetListener() : &sFakeListener;
 }

embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteAppThreadChild"
 #include "EmbedLog.h"
 
 #include "EmbedLiteAppThreadChild.h"

embedding/embedlite/embedthread/EmbedLiteAppThreadParent.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteAppThreadParent"
 #include "EmbedLog.h"
 
 #include "EmbedLiteViewThreadParent.h"

embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteCompositorParent"
 #include "EmbedLog.h"
 
 #include "EmbedLiteCompositorParent.h"

embedding/embedlite/embedthread/EmbedLitePuppetWidget.cpp

@@ -5,7 +5,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLitePuppetWidget"
 #include "EmbedLog.h"
 
 #include "base/basictypes.h"
@@ -25,7 +24,6 @@
 #include "Layers.h"
 #include "BasicLayers.h"
 #include "ClientLayerManager.h"
-#include "GLContext.h"
 #include "GLContextProvider.h"
 #include "EmbedLiteCompositorParent.h"
 #include "mozilla/Preferences.h"
@@ -45,7 +43,6 @@ const size_t EmbedLitePuppetWidget::kMaxDimension = 4000;
 
 static nsTArray<EmbedLitePuppetWidget*> gTopLevelWindows;
 static bool sFailedToCreateGLContext = false;
-static nsRefPtr<gl::GLContext> sGLContext;
 
 NS_IMPL_ISUPPORTS_INHERITED1(EmbedLitePuppetWidget, nsBaseWidget,
                              nsISupportsWeakReference)

embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteViewThreadChild"
 #include "EmbedLog.h"
 
 #include "EmbedLiteViewThreadChild.h"

embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "EmbedLiteViewThreadParent"
 #include "EmbedLog.h"
 
 #include "EmbedLiteViewThreadParent.h"
@@ -18,7 +17,7 @@
 #include "mozilla/layers/APZCTreeManager.h"
 #include "EmbedLiteRenderTarget.h"
 
-#include "GLContext.h"                  // for GLContext
+//#include "GLContext.h"                  // for GLContext
 #include "GLScreenBuffer.h"             // for GLScreenBuffer
 #include "SharedSurfaceEGL.h"           // for SurfaceFactory_EGLImage
 #include "SharedSurfaceGL.h"            // for SurfaceFactory_GLTexture, etc

embedding/embedlite/moz.build

@@ -30,20 +30,17 @@ EXPORTS.mozilla.embedlite += [
 
 EXPORTS.ipc = ['embedhelpers/InputDataIPC.h']
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'embedhelpers/EmbedLiteSubThread.cpp',
     'embedhelpers/EmbedLiteUILoop.cpp',
     'EmbedLiteApp.cpp',
     'EmbedLiteMessagePump.cpp',
-    'EmbedLiteRenderTarget.cpp',
     'EmbedLiteView.cpp',
     'embedthread/EmbedContentController.cpp',
     'embedthread/EmbedLiteAppThreadChild.cpp',
     'embedthread/EmbedLiteAppThreadParent.cpp',
-    'embedthread/EmbedLiteCompositorParent.cpp',
     'embedthread/EmbedLitePuppetWidget.cpp',
     'embedthread/EmbedLiteViewThreadChild.cpp',
-    'embedthread/EmbedLiteViewThreadParent.cpp',
     'modules/EmbedLiteAppService.cpp',
     'modules/EmbedLiteJSON.cpp',
     'utils/DirProvider.cpp',
@@ -55,6 +52,12 @@ SOURCES += [
     'utils/WindowCreator.cpp',
 ]
 
+SOURCES += [
+    'EmbedLiteRenderTarget.cpp',
+    'embedthread/EmbedLiteCompositorParent.cpp',
+    'embedthread/EmbedLiteViewThreadParent.cpp',
+]
+
 IPDL_SOURCES += [
     'PEmbedLiteApp.ipdl',
     'PEmbedLiteView.ipdl'

embedding/embedlite/utils/DirProvider.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "DirProvider"
 #include "EmbedLog.h"
 
 #include "DirProvider.h"

embedding/embedlite/utils/EmbedLog.h

@@ -14,36 +14,22 @@
 
 #ifdef EMBED_LITE_INTERNAL
 
-#define FORCE_PR_LOG 1
 #include "prlog.h"
 
 extern PRLogModuleInfo* GetEmbedCommonLog(const char* aModule);
 
-#ifdef LOG_COMPONENT
-#define LOGF(FMT, ...) PR_LOG(GetEmbedCommonLog(LOG_COMPONENT), PR_LOG_DEBUG, (LOG_COMPONENT "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGT(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLiteTrace"), PR_LOG_DEBUG, (LOG_COMPONENT "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGW(FMT, ...) PR_LOG(GetEmbedCommonLog(LOG_COMPONENT), PR_LOG_WARNING, ("W:" LOG_COMPONENT "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGE(FMT, ...) PR_LOG(GetEmbedCommonLog(LOG_COMPONENT), PR_LOG_ERROR, ("E:" LOG_COMPONENT "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGNI(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedNonImpl"), PR_LOG_ALWAYS, ("NON_IMPL:" LOG_COMPONENT "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#else  // NON LOG_COMPONENT
-#define LOGF(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_DEBUG, ("EmbedLite::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGT(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLiteTrace"), PR_LOG_DEBUG, ("EmbedLite::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGW(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_WARNING, ("W: EmbedLite::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGE(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_ERROR, ("E: EmbedLite::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#define LOGNI(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedNonImpl"), PR_LOG_ALWAYS, ("NON_IMPL: EmbedLite::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
-#endif // LOG_COMPONENT
-
-#define LOGC(CUSTOMNAME, FMT, ...) PR_LOG(GetEmbedCommonLog(CUSTOMNAME), PR_LOG_DEBUG, (CUSTOMNAME "::%s:%d " FMT , __FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGF(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_ALWAYS, ("FUNC::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGT(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_DEBUG, ("TRACE::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGW(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_WARNING, ("WARN: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGE(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_ERROR, ("ERROR: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+#define LOGNI(FMT, ...) PR_LOG(GetEmbedCommonLog("EmbedLite"), PR_LOG_ALWAYS, ("NON_IMPL: EmbedLite::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
+
+#define LOGC(CUSTOMNAME, FMT, ...) PR_LOG(GetEmbedCommonLog(CUSTOMNAME), PR_LOG_WARNING, (CUSTOMNAME "::%s:%d " FMT , __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__))
 
 #else // EMBED_LITE_INTERNAL
 
-#ifdef LOG_COMPONENT
-#define LOGT(FMT, ...) fprintf(stderr, \
-                               "EmbedLiteExt %s:%s:%d: " FMT "\n", LOG_COMPONENT, __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#else // LOG_COMPONENT
 #define LOGT(FMT, ...) fprintf(stderr, \
-                               "EmbedLiteExt %s:%d: " FMT "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
-#endif // LOG_COMPONENT
+                               "EmbedLiteExt %s:%d: " FMT "\n", __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 
 #endif // EMBED_LITE_INTERNAL
 

embedding/embedlite/utils/GeckoLoader.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "GeckoLoader"
 #include "EmbedLog.h"
 
 #include "GeckoLoader.h"

embedding/embedlite/utils/TabChildHelper.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "TabChildHelper"
 #include "EmbedLog.h"
 
 #include "TabChildHelper.h"

embedding/embedlite/utils/WebBrowserChrome.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "WebBrowserChrome"
 #include "EmbedLog.h"
 
 #include "WebBrowserChrome.h"

embedding/embedlite/utils/WindowCreator.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#define LOG_COMPONENT "WindowCreator"
 #include "EmbedLog.h"
 
 #include "nsIWebBrowserChrome.h"