Commit 371b6292 authored by Ed Morley's avatar Ed Morley
Browse files

Merge last PGO-green changeset of mozilla-inbound to mozilla-central

parents 8376d144 baaa9546

b2g/config/tooltool-manifests/releng.manifest

+8 −8
Original line number Diff line number Diff line 
[

{

"size": 195, 

    "digest": "85369693c2362131515014cd4547cd0824225b03e1e52a352a84012e6e8586fa46ad619181167d220c463761865719a1747a83aeee76a5fcc5ab7859c14ef24a", 

"digest": "ff960e3cb9e07865bde6fdb0d4127a11205d4cb70ee527e30ccc38f6370a9d750eb5da8993cb3c5de28b45836a3a20b8c25c4adcc68b1945a59dbe1c8b28cc23", 

"algorithm": "sha512", 

"filename": "setup.sh"

}, 

{

    "size": 121344236, 

    "digest": "0bf5cceced8add6142c1c7522890c39554b94848e3f5eb9b92de2a8c6f6af3c0e8ab69ddf7bae39eaab2bcb637233ff02de07b47a1850767d2810a46fb31bf65", 

"size": 121135598, 

"digest": "e182eb95105f186ec81546c373752c3af5b8fbc520fd14d37fcb1bb40efac76b96befe868b5a5a17f967bd04390122b7911d167dda1516225709cbd3a00e2c78", 

"algorithm": "sha512", 

    "filename": "gonk-toolchain-0.tar.bz2"

"filename": "gonk-toolchain-1.tar.bz2"

}

]

browser/confvars.sh

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ if test "$OS_ARCH" = "WINNT"; then 
  fi

fi



if (test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"); then

  MOZ_WEBAPP_RUNTIME=1

fi



MOZ_CHROME_FILE_FORMAT=omni

MOZ_SAFE_BROWSING=1

MOZ_SERVICES_SYNC=1

build/automation.py.in

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t 
      prefs.append(part)



    for v in extraPrefs:

      thispref = v.split("=")

      thispref = v.split("=", 1)

      if len(thispref) < 2:

        print "Error: syntax error in --setpref=" + v

        sys.exit(1)

configure.in

+0 −2
Original line number Diff line number Diff line
@@ -4605,7 +4605,6 @@ MOZ_GRAPHITE=1 
case "${target}" in

*darwin*)

    ACCESSIBILITY=

    MOZ_WEBAPP_RUNTIME=1

    ;;

*)

    ACCESSIBILITY=1
@@ -4616,7 +4615,6 @@ case "$target_os" in 
    mingw*)

        NS_ENABLE_TSF=1

        AC_DEFINE(NS_ENABLE_TSF)

        MOZ_WEBAPP_RUNTIME=1

        ;;

esac

content/base/src/nsContentUtils.cpp

+0 −8
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID); 


#include "nsWrapperCacheInlines.h"

#include "nsIDOMDocumentType.h"

#include "nsIDOMWindowUtils.h"

#include "nsCharSeparatedTokenizer.h"



extern "C" int MOZ_XMLTranslateEntity(const char* ptr, const char* end,
@@ -4900,13 +4899,6 @@ nsContentUtils::GetViewportInfo(nsIDocument *aDocument) 
    return ret;

  }



  nsIDOMWindow* window = aDocument->GetWindow();

  nsCOMPtr<nsIDOMWindowUtils> windowUtils(do_GetInterface(window));



  if (!windowUtils) {

    return ret;

  }



  nsAutoString handheldFriendly;

  aDocument->GetHeaderData(nsGkAtoms::handheldFriendly, handheldFriendly);