Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 29 Sep 2012 23:45:54 -0400
changeset 114970 e95251661b78d7ddcc4451efd5a4c1166bb00a12
parent 114969 56680410dde6cba71b8614112813743a016229e0 (current diff)
parent 114949 d0b325032484073aa3e97a385aaa157ec507440b (diff)
child 114971 c1fff87fd8e8c5ee39b0d2f813be2bdc476ac09b
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [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/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1082,17 +1082,17 @@ Function OnClick_ButtonBrowse
   ; http://www.nullsoft.com/free/nsis/makensis.htm#InstallDir
   StrCpy $0 "$INSTDIR" "" -1 ; the last character
   ${If} "$0" == "\"
     StrCpy $0 "$INSTDIR"
   ${Else}
     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
   ${EndIf}
 
   ${If} $0 != ""
     StrCpy $INSTDIR "$0"
     system::Call `user32::SetWindowTextW(i $DirRequest, t "$INSTDIR")`
--- a/browser/locales/en-US/installer/nsisstrings.properties
+++ b/browser/locales/en-US/installer/nsisstrings.properties
@@ -52,14 +52,14 @@ INSTALL_MAINT_SERVICE=&Install the $Bran
 BROWSE_BUTTON=B&rowse…
 DEST_FOLDER=Destination Folder
 
 DOWNLOADING_IN_PROGRESS=Downloading…
 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
 MEGA=M
 GIGA=G
--- a/build/valgrind/cross-architecture.sup
+++ b/build/valgrind/cross-architecture.sup
@@ -255,8 +255,15 @@
    Bug 795395
    Memcheck:Addr4
    fun:PR_UnloadLibrary
    fun:_ZN18nsGSettingsServiceD1Ev
    fun:_ZN18nsGSettingsService7ReleaseEv
    fun:_ZL29nsGSettingsServiceConstructorP11nsISupportsRK4nsIDPPv
    ...
 }
+{
+   Bug 795631
+   Memcheck:Cond
+   fun:_ZN7mozilla17FrameLayerBuilder18ClippedDisplayItemD1Ev
+   fun:_ZN12nsTHashtableIN7mozilla17FrameLayerBuilder21ThebesLayerItemsEntryEE12s_ClearEntryEP12PLDHashTableP15PLDHashEntryHdr
+   ...
+}
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2464,26 +2464,28 @@ FrameLayerBuilder::AddLayerDisplayItem(L
   DisplayItemDataEntry* entry = 
     mNewDisplayItemData.PutEntry(aItem->GetUnderlyingFrame());
   if (entry) {
     entry->mContainerLayerGeneration = mContainerLayerGeneration;
     entry->mData.AppendElement(data);
     data->AddFrame(aItem->GetUnderlyingFrame());
   }
 
+#if 0
   nsAutoTArray<nsIFrame*,4> mergedFrames;
   aItem->GetMergedFrames(&mergedFrames);
   for (uint32_t i = 0; i < mergedFrames.Length(); ++i) {
     entry = mNewDisplayItemData.PutEntry(mergedFrames[i]);
     if (entry) {
       entry->mContainerLayerGeneration = mContainerLayerGeneration;
       entry->mData.AppendElement(data);
       data->AddFrame(mergedFrames[i]);
     }
   }
+#endif
   
   DisplayItemData* oldData = GetDisplayItemDataForManager(aItem, mRetainingManager);
   if (oldData && oldData->FrameListMatches(aItem)) {
     oldData->mUsed = true;
   }
 }
 
 nsIntPoint
--- a/toolkit/content/widgets/editor.xml
+++ b/toolkit/content/widgets/editor.xml
@@ -110,16 +110,19 @@
                 readonly="true"
                 onget="return this.webNavigation.currentURI;"/>
       <property name="contentWindow"
                 readonly="true"
                 onget="return this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);"/>
       <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);"/>
       <property name="commandManager"
                 readonly="true"
                 onget="return this.webNavigation.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsICommandManager);"/>
     </implementation>
   </binding>