Commit fb82e94d authored by Marco Bonardo's avatar Marco Bonardo
Browse files

Merge last PGO-safe changeset from inbound to central

parents b2a028fe 52d2c4d9

aclocal.m4

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ builtin(include, build/autoconf/lto.m4)dnl 
builtin(include, build/autoconf/gcc-pr49911.m4)dnl

builtin(include, build/autoconf/frameptr.m4)dnl

builtin(include, build/autoconf/compiler-opts.m4)dnl

builtin(include, build/autoconf/expandlibs.m4)dnl



MOZ_PROG_CHECKMSYS()

browser/base/content/nsContextMenu.js

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ nsContextMenu.prototype = { 
      let uri = makeURI(this.mediaURL);

      let url = uri.QueryInterface(Ci.nsIURL);

      if (url.fileBaseName)

        name = url.fileBaseName + ".jpg";

        name = decodeURI(url.fileBaseName) + ".jpg";

    } catch (e) { }

    if (!name)

      name = "snapshot.jpg";

browser/components/certerror/content/aboutCertError.css

+1 −15
Original line number Diff line number Diff line
@@ -47,20 +47,6 @@ 
  white-space: pre-wrap;

}



#technicalContent > h2, #expertContent > h2 {

  cursor: pointer;

  -moz-padding-start: 20px;

  position: relative;

  left: -20px;

}



body[dir="rtl"] #technicalContent > h2,

body[dir="rtl"] #expertContent > h2 {

  left: auto;

  right: -20px;

}



div[collapsed] > p,

div[collapsed] > div {

.expander[collapsed] + * {

  display: none;

}

browser/components/certerror/content/aboutCertError.xhtml

+11 −11
Original line number Diff line number Diff line
@@ -260,13 +260,14 @@ 
        

        <!-- The following sections can be unhidden by default by setting the

             "browser.xul.error_pages.expert_bad_cert" pref to true -->

        <div id="technicalContent" collapsed="true">

          <h2 onclick="toggle('technicalContent');" id="technicalContentHeading">&certerror.technical.heading;</h2>

        <h2 id="technicalContent" class="expander" collapsed="true">

          <button onclick="toggle('technicalContent');">&certerror.technical.heading;</button>

        </h2>

        <p id="technicalContentText"/>

        </div>

        

        <div id="expertContent" collapsed="true">

          <h2 onclick="toggle('expertContent');" id="expertContentHeading">&certerror.expert.heading;</h2>

        <h2 id="expertContent" class="expander" collapsed="true">

          <button onclick="toggle('expertContent');">&certerror.expert.heading;</button>

        </h2>

        <div>

          <p>&certerror.expert.content;</p>

          <p>&certerror.expert.contentPara2;</p>
@@ -274,7 +275,6 @@ 
        </div>

      </div>

    </div>

    </div>



    <!--

    - Note: It is important to run the script this way, instead of using

browser/components/dirprovider/DirectoryProvider.cpp

+13 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "nsServiceManagerUtils.h"

#include "nsStringAPI.h"

#include "nsXULAppAPI.h"

#include "nsIPrefLocalizedString.h"



namespace mozilla {

namespace browser {
@@ -200,7 +201,18 @@ AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array) 
    localePlugins->AppendNative(NS_LITERAL_CSTRING("locale"));



    nsCString locale;

    nsCOMPtr<nsIPrefLocalizedString> prefString;

    rv = prefs->GetComplexValue("general.useragent.locale",

                                NS_GET_IID(nsIPrefLocalizedString),

                                getter_AddRefs(prefString));

    if (NS_SUCCEEDED(rv)) {

      nsAutoString wLocale;

      prefString->GetData(getter_Copies(wLocale));

      CopyUTF16toUTF8(wLocale, locale);

    } else {

      rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale));

    }



    if (NS_SUCCEEDED(rv)) {



      nsCOMPtr<nsIFile> curLocalePlugins;