Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 02 Oct 2012 22:09:07 -0400
changeset 115854 4d5e812682389945e07e5a4bc40a1d695cba6d61
parent 115853 6e04928c99aace512db1d28fa5ffb10a08cb527c (current diff)
parent 115822 635fcc11d2b16265114d6bbc02768d007f73d66b (diff)
child 115855 0cd12dcf7f8f2e5fb55951dec5e5bfa876e177fa
push id239
push userakeybl@mozilla.com
push dateThu, 03 Jan 2013 21:54:43 +0000
treeherdermozilla-release@3a7b66445659 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/build/valgrind/cross-architecture.sup
+++ b/build/valgrind/cross-architecture.sup
@@ -83,65 +83,16 @@
    Memcheck:Leak
    fun:malloc
    fun:moz_xmalloc
    fun:NS_Alloc_P
    fun:_Z12ToNewCStringRK19nsACString_internal
    fun:_ZN13CrashReporter14SetupExtraDataEP7nsIFileRK19nsACString_internal
    ...
 }
-# Suppressing the suppression(s) to get Valgrind stacks with line numbers
-#{
-#   Bug 793601
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:_ZN2js15ArgumentsObject6createEP9JSContextPNS_10StackFrameE
-#   ...
-#}
-#{
-#   Bug 793602
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:moz_xmalloc
-#   fun:_Z22NS_NewComputedDOMStylePN7mozilla3dom7ElementERK18nsAString_internalP12nsIPresShell
-#   fun:_ZN14nsGlobalWindow16GetComputedStyleEP13nsIDOMElementRK18nsAString_internalPP25nsIDOMCSSStyleDeclaration
-#   ...
-#}
-#{
-#   Bug 793603
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:moz_xmalloc
-#   fun:_ZN18nsDeflateConverter15OnDataAvailableEP10nsIRequestP11nsISupportsP14nsIInputStreammj
-#   ...
-#}
-#{
-#   Bug 793605
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:moz_xmalloc
-#   fun:_Z30nsStringInputStreamConstructorP11nsISupportsRK4nsIDPPv
-#   ...
-#}
-#{
-#   Bug 793606
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:moz_xmalloc
-#   fun:_ZL27nsXMLHttpRequestConstructorP11nsISupportsRK4nsIDPPv
-#   ...
-#}
-#{
-#   Bug 793607
-#   Memcheck:Leak
-#   fun:malloc
-#   fun:moz_xmalloc
-#   fun:_ZN11nsZipWriter14AddEntryStreamERK19nsACString_internalliP14nsIInputStreambj
-#   ...
-#}
 {
    Bug 793608
    Memcheck:Leak
    ...
    fun:gaih_inet
    fun:getaddrinfo
    fun:PR_GetAddrInfoByName
    fun:_ZN14nsHostResolver10ThreadFuncEPv
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2832,30 +2832,16 @@ FrameLayerBuilder::BuildContainerLayerFo
                            LAYER_ACTIVE, mContainerLayerGeneration);
 
     DisplayItemDataEntry* entry = mNewDisplayItemData.PutEntry(aContainerFrame);
     if (entry) {
       entry->mData.AppendElement(data);
       data->AddFrame(aContainerFrame);
       entry->mContainerLayerGeneration = mContainerLayerGeneration;
     }
-
-    nsAutoTArray<nsIFrame*,4> mergedFrames;
-    if (aContainerItem) {
-      aContainerItem->GetMergedFrames(&mergedFrames);
-    }
-    for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
-      nsIFrame* mergedFrame = mergedFrames[i];
-      entry = mNewDisplayItemData.PutEntry(mergedFrame);
-      if (entry) {
-        entry->mContainerLayerGeneration = mContainerLayerGeneration;
-        entry->mData.AppendElement(data);
-        data->AddFrame(mergedFrame);
-      }
-    }
   }
 
   nsRect bounds;
   nsIntRect pixBounds;
   int32_t appUnitsPerDevPixel;
   uint32_t stateFlags =
     (aContainerFrame->GetStateBits() & NS_FRAME_NO_COMPONENT_ALPHA) ?
       ContainerState::NO_COMPONENT_ALPHA : 0;
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5275,27 +5275,27 @@ PresShell::Paint(nsIView*           aVie
 
       if (layerManager->EndEmptyTransaction((aType == PaintType_NoComposite) ? LayerManager::END_NO_COMPOSITE : LayerManager::END_DEFAULT)) {
         nsIntRect invalid;
         if (props) {
           invalid = props->ComputeDifferences(layerManager->GetRoot(), computeInvalidFunc);
         } else {
           LayerProperties::ClearInvalidations(layerManager->GetRoot());
         }
-        if (!invalid.IsEmpty()) {
-          if (props) {
+        if (props) {
+          if (!invalid.IsEmpty()) {
             nsRect rect(presContext->DevPixelsToAppUnits(invalid.x),
                         presContext->DevPixelsToAppUnits(invalid.y),
                         presContext->DevPixelsToAppUnits(invalid.width),
                         presContext->DevPixelsToAppUnits(invalid.height));
             aViewToPaint->GetViewManager()->InvalidateViewNoSuppression(aViewToPaint, rect);
             presContext->NotifyInvalidation(invalid, 0);
-          } else {
-            aViewToPaint->GetViewManager()->InvalidateView(aViewToPaint);
           }
+        } else {
+          aViewToPaint->GetViewManager()->InvalidateView(aViewToPaint);
         }
 
         frame->UpdatePaintCountForPaintedPresShells();
         presContext->NotifyDidPaintForSubtree();
         return;
       }
     }
     frame->RemoveStateBits(NS_FRAME_UPDATE_LAYER_TREE);
--- a/python/mozbuild/mozbuild/testing/mochitest.py
+++ b/python/mozbuild/mozbuild/testing/mochitest.py
@@ -1,14 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 from __future__ import unicode_literals
 
+import os
+
 from mozbuild.testing.test import TestRunner
 
 
 class MochitestRunner(TestRunner):
     """Easily run mochitests.
 
     This currently contains just the basics for running mochitests. We may want
     to hook up result parsing, etc.