Bug 799407: Fix warnings under layout/generic, r=roc
authorDavid Zbarsky <dzbarsky@gmail.com>
Sun, 14 Oct 2012 16:56:03 -0400
changeset 110368 78022080a795fbe19558b35474dc24a3b04b71a7
parent 110364 45cf07ab3a5ef5d6142c6e44f39a30e9cd3f0487
child 110369 574ec568513b51210d5f0e97643405f1b06a979a
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersroc
bugs799407
milestone19.0a1
Bug 799407: Fix warnings under layout/generic, r=roc
layout/generic/nsObjectFrame.cpp
layout/generic/nsTextFrameThebes.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1264,18 +1264,18 @@ nsObjectFrame::BuildDisplayList(nsDispla
 #endif
 
 #if MOZ_WIDGET_ANDROID
     if (aBuilder->IsPaintingToWindow() &&
         GetLayerState(aBuilder, nullptr) == LAYER_ACTIVE) {
 
       nsTArray<nsNPAPIPluginInstance::VideoInfo*> videos;
       mInstanceOwner->GetVideos(videos);
-      
-      for (int i = 0; i < videos.Length(); i++) {
+
+      for (uint32_t i = 0; i < videos.Length(); i++) {
         rv = replacedContent.AppendNewToTop(new (aBuilder)
           nsDisplayPluginVideo(aBuilder, this, videos[i]));
         NS_ENSURE_SUCCESS(rv, rv);
       }
     }
 #endif
 
     rv = replacedContent.AppendNewToTop(new (aBuilder)
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -4675,17 +4675,17 @@ void
 nsTextFrame::GetTextDecorations(
                     nsPresContext* aPresContext,
                     nsTextFrame::TextDecorationColorResolution aColorResolution,
                     nsTextFrame::TextDecorations& aDecorations)
 {
   const nsCompatibility compatMode = aPresContext->CompatibilityMode();
 
   bool useOverride = false;
-  nscolor overrideColor;
+  nscolor overrideColor = NS_RGBA(0, 0, 0, 0);
 
   // frameTopOffset represents the offset to f's top from our baseline in our
   // coordinate space
   // baselineOffset represents the offset from our baseline to f's baseline or
   // the nearest block's baseline, in our coordinate space, whichever is closest
   // during the particular iteration
   nscoord frameTopOffset = mAscent,
           baselineOffset = 0;