Fixed build

sailfishos · Mar 27, 2014 · 282a6a0 · 282a6a0
1 parent 6ea661a
commit 282a6a0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 28 deletions.
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
@@ -604,14 +604,6 @@ class TabChild::CachedFileDescriptorCallbackRunnable : public nsRunnable
 
 StaticRefPtr<TabChild> sPreallocatedTab;
 
-TabChildBase::TabChildBase()
-  : mOldViewportWidth(0.0f)
-  , mContentDocumentIsDisplayed(false)
-  , mTabChildGlobal(nullptr)
-  , mInnerSize(0, 0)
-{
-}
-
 /*static*/ void
 TabChild::PreloadSlowThings()
 {

diff --git a/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp b/embedding/embedlite/utils/EmbedLiteXulAppInfo.cpp
@@ -177,3 +177,14 @@ NS_IMETHODIMP EmbedLiteXulAppInfo::GetDistributionID(nsACString& aResult)
   aResult.AssignLiteral(MOZ_DISTRIBUTION_ID);
   return NS_OK;
 }
+
+NS_IMETHODIMP
+EmbedLiteXulAppInfo::GetProcessID(uint32_t* aResult)
+{
+#ifdef XP_WIN
+  *aResult = GetCurrentProcessId();
+#else
+  *aResult = getpid();
+#endif
+  return NS_OK;
+}
diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp
@@ -78,8 +78,7 @@ GLScreenBuffer::Create(GLContext* gl,
         gl,
         nullptr);
 
-    GLScreenBuffer* p = new GLScreenBuffer(gl, caps, factory, stream);
-    return p;
+    return new GLScreenBuffer(gl, caps, factory, stream);
 }
 
 GLScreenBuffer::~GLScreenBuffer()

diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h
@@ -552,6 +552,7 @@ class Compositor : public RefCounted<Compositor>
 
 private:
   static LayersBackend sBackend;
+
 };
 
 } // namespace layers

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
@@ -5826,10 +5826,7 @@ PresShell::Paint(nsView*        aViewToPaint,
   bool isRetainingManager;
   LayerManager* layerManager =
     aViewToPaint->GetWidget()->GetLayerManager(&isRetainingManager);
-  if (!layerManager) {
-    NS_WARNING("LayerManager not available in paint event");
-    return;
-  }
+  NS_ASSERTION(layerManager, "Must be in paint event");
   bool shouldInvalidate = layerManager->NeedsWidgetInvalidation();
 
   uint32_t didPaintFlags = aFlags;

diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
@@ -411,7 +411,7 @@ void TelemetryIOInterposeObserver::AddPath(const nsAString& aPath,
 void TelemetryIOInterposeObserver::Observe(Observation& aOb)
 {
   // We only report main-thread I/O
-  if (!NS_IsMainThread()) {
+  if (!IsMainThread()) {
     return;
   }
 

diff --git a/widget/qt/mozqwidget.cpp b/widget/qt/mozqwidget.cpp
@@ -17,7 +17,7 @@ MozQWidget::MozQWidget(nsWindow* aReceiver, QWindow* aParent)
   , mReceiver(aReceiver)
   , mUpdatePending(false)
 {
-    mReceiver->GetWindowType(mWindowType);
+    mWindowType = mReceiver->WindowType();
 }
 
 MozQWidget::~MozQWidget()

diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
@@ -1788,18 +1788,6 @@ nsWindow::GetScreenBounds(nsIntRect &aRect)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsWindow::SetForegroundColor(const nscolor &aColor)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsWindow::SetBackgroundColor(const nscolor &aColor)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 nsWindow::SetIcon(const nsAString& aIconSpec)
 {