Merge m-c to inbound.

browser/installer/package-manifest.in

@@ -747,6 +747,7 @@ bin/libfreebl_32int64_3.so
 
 #ifdef MOZ_METRO
 @BINPATH@/components/MetroUIUtils.js
+@BINPATH@/components/MetroUIUtils.manifest
 [metro]
 ; gre resources
 @BINPATH@/CommandExecuteHandler@BIN_SUFFIX@

browser/locales/l10n.ini

@@ -8,7 +8,6 @@ all = browser/locales/all-locales
 
 [compare]
 dirs = browser
-     browser/metro
      extensions/reporter
      other-licenses/branding/firefox
      browser/branding/official

gfx/layers/basic/BasicTiledThebesLayer.cpp

@@ -421,7 +421,6 @@ BasicTiledThebesLayer::ProgressiveUpdate(BasicTiledLayerBuffer& aTiledBuffer,
                                          void* aCallbackData)
 {
   bool repeat = false;
-  bool isBufferChanged = false;
   do {
     // Compute the region that should be updated. Repeat as many times as
     // is required.
@@ -436,13 +435,16 @@ BasicTiledThebesLayer::ProgressiveUpdate(BasicTiledLayerBuffer& aTiledBuffer,
                                             aResolution,
                                             repeat);
 
-    // There's no further work to be done.
+    // There's no further work to be done, return if nothing has been
+    // drawn, or give what has been drawn to the shadow layer to upload.
     if (regionToPaint.IsEmpty()) {
-      break;
+      if (repeat) {
+        break;
+      } else {
+        return false;
+      }
     }
 
-    isBufferChanged = true;
-
     // Keep track of what we're about to refresh.
     aValidRegion.Or(aValidRegion, regionToPaint);
 
@@ -457,9 +459,7 @@ BasicTiledThebesLayer::ProgressiveUpdate(BasicTiledLayerBuffer& aTiledBuffer,
     aInvalidRegion.Sub(aInvalidRegion, regionToPaint);
   } while (repeat);
 
-  // Return false if nothing has been drawn, or give what has been drawn
-  // to the shadow layer to upload.
-  return isBufferChanged;
+  return true;
 }
 
 void

widget/windows/winrt/Makefile.in

@@ -63,10 +63,9 @@ MIDL_GENERATED_FILES = \
 	dlldata.c \
 	$(NULL)
 
-EXTRA_PP_COMPONENTS = components.manifest \
-		$(NULL)
 EXTRA_COMPONENTS = MetroUIUtils.js \
-		$(NULL)
+	MetroUIUtils.manifest \
+	$(NULL)
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen