Merge m-c to inbound.

browser/installer/windows/nsis/stub.nsi

@@ -1087,7 +1087,7 @@ Function OnClick_ButtonBrowse
     StrCpy $0 "$INSTDIR"
   ${EndIf}
 
-  nsDialogs::SelectFolderDialog /NOUNLOAD "$(SELECT_FOLDER)" $0
+  nsDialogs::SelectFolderDialog /NOUNLOAD "$(SELECT_FOLDER_TEXT)" $0
   Pop $0
   ${If} $0 == "error" ; returns 'error' if 'cancel' was pressed?
     Return

browser/locales/en-US/installer/nsisstrings.properties

@@ -57,7 +57,7 @@ DOWNLOADING_DONE=Downloaded
 INSTALLING_TO_BE_DONE=Installing
 INSTALLING_IN_PROGRESS=Installing…
 
-SELECT_FOLDER=Select the folder to install Firefox in.
+SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in.
 
 BYTE=B
 KILO=K

build/valgrind/cross-architecture.sup

@@ -260,3 +260,10 @@
    fun:_ZL29nsGSettingsServiceConstructorP11nsISupportsRK4nsIDPPv
    ...
 }
+{
+   Bug 795631
+   Memcheck:Cond
+   fun:_ZN7mozilla17FrameLayerBuilder18ClippedDisplayItemD1Ev
+   fun:_ZN12nsTHashtableIN7mozilla17FrameLayerBuilder21ThebesLayerItemsEntryEE12s_ClearEntryEP12PLDHashTableP15PLDHashEntryHdr
+   ...
+}

layout/base/FrameLayerBuilder.cpp

@@ -2469,6 +2469,7 @@ FrameLayerBuilder::AddLayerDisplayItem(Layer* aLayer,
     data->AddFrame(aItem->GetUnderlyingFrame());
   }
 
+#if 0
   nsAutoTArray<nsIFrame*,4> mergedFrames;
   aItem->GetMergedFrames(&mergedFrames);
   for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
@@ -2479,6 +2480,7 @@ FrameLayerBuilder::AddLayerDisplayItem(Layer* aLayer,
       data->AddFrame(mergedFrames[i]);
     }
   }
+#endif
   
   DisplayItemData* oldData = GetDisplayItemDataForManager(aItem, mRetainingManager);
   if (oldData && oldData->FrameListMatches(aItem)) {

toolkit/content/widgets/editor.xml

@@ -115,6 +115,9 @@
       <property name="webBrowserFind"
                 readonly="true"
                 onget="return this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebBrowserFind);"/>
+      <property name="markupDocumentViewer"
+                readonly="true"
+                onget="return this.docShell.contentViewer.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer);"/>
       <property name="editingSession"
                 readonly="true"
                 onget="return this.webNavigation.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIEditingSession);"/>