diff --git a/browser/base/content/test/browser_bug517902.js b/browser/base/content/test/browser_bug517902.js index 3a9af4049599..02338f31c407 100644 --- a/browser/base/content/test/browser_bug517902.js +++ b/browser/base/content/test/browser_bug517902.js @@ -31,7 +31,7 @@ function test() { content.location = "data:text/html," + - "" + + "" + "2" + "2" + "" + diff --git a/browser/base/content/test/tabview/browser_tabview_bug594958.js b/browser/base/content/test/tabview/browser_tabview_bug594958.js index 0ac228a415bf..f570c251be61 100644 --- a/browser/base/content/test/tabview/browser_tabview_bug594958.js +++ b/browser/base/content/test/tabview/browser_tabview_bug594958.js @@ -15,12 +15,12 @@ function test() { } // very long page that produces black bars at the right - let html1 = '' + - '
' + + '
'; // very short page that produces black bars at the bottom - let html2 = ''; + let html2 = ''; let tests = [{ url: 'data:text/html,' + html1, diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 2eab028f7a68..49a915065f2e 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -867,6 +867,7 @@ ContentParent::RecvSetURITitle(const IPC::URI& uri, bool ContentParent::RecvShowFilePicker(const PRInt16& mode, const PRInt16& selectedType, + const PRBool& addToRecentDocs, const nsString& title, const nsString& defaultFile, const nsString& defaultExtension, @@ -892,7 +893,9 @@ ContentParent::RecvShowFilePicker(const PRInt16& mode, *result = filePicker->Init(window, title, mode); if (NS_FAILED(*result)) return true; - + + filePicker->SetAddToRecentDocs(addToRecentDocs); + PRUint32 count = filters.Length(); for (PRUint32 i = 0; i < count; ++i) { filePicker->AppendFilter(filterNames[i], filters[i]); diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index 36e832106ab6..44771f0781d6 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -178,6 +178,7 @@ private: virtual bool RecvShowFilePicker(const PRInt16& mode, const PRInt16& selectedType, + const PRBool& addToRecentDocs, const nsString& title, const nsString& defaultFile, const nsString& defaultExtension, diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index a2ca6a04d8d8..9981c8fa3040 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -144,7 +144,7 @@ parent: async SetURITitle(URI uri, nsString title); // filepicker remoting - sync ShowFilePicker(PRInt16 mode, PRInt16 selectedType, + sync ShowFilePicker(PRInt16 mode, PRInt16 selectedType, PRBool addToRecentDocs, nsString title, nsString defaultFile, nsString defaultExtension, nsString[] filters, nsString[] filterNames) returns (nsString[] files, PRInt16 retValue, nsresult result); diff --git a/dom/tests/mochitest/general/test_focusrings.xul b/dom/tests/mochitest/general/test_focusrings.xul index a61ff250982b..d7a961880975 100644 --- a/dom/tests/mochitest/general/test_focusrings.xul +++ b/dom/tests/mochitest/general/test_focusrings.xul @@ -189,7 +189,7 @@ SimpleTest.waitForFocus(runTest);