Commit 579ea680 authored by Kyle Huey's avatar Kyle Huey
Browse files

Merge m-i to m-c.

parents 7e943e24 5be29bb8

b2g/app/b2g.js

+12 −0
Original line number Diff line number Diff line
@@ -483,3 +483,15 @@ pref("javascript.options.mem.gc_incremental_slice_ms", 30); 


// Show/Hide scrollbars when active/inactive

pref("ui.showHideScrollbars", 1);



// Enable the ProcessPriorityManager, and give processes with no visible

// documents a 1s grace period before they're eligible to be marked as

// background.

pref("dom.ipc.processPriorityManager.enabled", true);

pref("dom.ipc.processPriorityManager.gracePeriodMS", 1000);

pref("hal.processPriorityManager.gonk.masterOomAdjust", 0);

pref("hal.processPriorityManager.gonk.foregroundOomAdjust", 1);

pref("hal.processPriorityManager.gonk.backgroundOomAdjust", 2);

pref("hal.processPriorityManager.gonk.masterNice", -1);

pref("hal.processPriorityManager.gonk.foregroundNice", 0);

pref("hal.processPriorityManager.gonk.backgroundNice", 10);

build/autoconf/config.status.m4

+3 −0
Original line number Diff line number Diff line
@@ -45,9 +45,11 @@ dnl Replace AC_OUTPUT to create and call a python config.status 
define([AC_OUTPUT],

[dnl Top source directory in Windows format (as opposed to msys format).

WIN_TOP_SRC=

encoding=utf-8

case "$host_os" in

mingw*)

    WIN_TOP_SRC=`cd $srcdir; pwd -W`

    encoding=mbcs

    ;;

esac

AC_SUBST(WIN_TOP_SRC)
@@ -74,6 +76,7 @@ echo creating $CONFIG_STATUS 


cat > $CONFIG_STATUS <<EOF

#!${PYTHON}

# coding=$encoding



import os, sys

dnl topsrcdir is the top source directory in native form, as opposed to a

client.mk

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ endif 


ifneq (,$(CONFIG_STATUS))

$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in

	$(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk

	$(PYTHON) $(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk

endif

config/rules.mk

+6 −4
Original line number Diff line number Diff line
@@ -1154,24 +1154,26 @@ GARBAGE_DIRS += $(_JAVA_DIR) 


ifndef NO_MAKEFILE_RULE

Makefile: Makefile.in

	@$(DEPTH)/config.status -n --file=Makefile

	@$(PYTHON) $(DEPTH)/config.status -n --file=Makefile

	@$(TOUCH) $@

endif



ifndef NO_SUBMAKEFILES_RULE

ifdef SUBMAKEFILES

# VPATH does not work on some machines in this case, so add $(srcdir)

$(SUBMAKEFILES): % : $(srcdir)/%.in

	$(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@

	$(PYTHON) $(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@

	@$(TOUCH) $@

endif

endif



ifdef AUTOUPDATE_CONFIGURE

$(topsrcdir)/configure: $(topsrcdir)/configure.in

	(cd $(topsrcdir) && $(AUTOCONF)) && $(DEPTH)/config.status -n --recheck)

	(cd $(topsrcdir) && $(AUTOCONF)) && $(PYTHON) $(DEPTH)/config.status -n --recheck)

endif



$(DEPTH)/config/autoconf.mk: $(topsrcdir)/config/autoconf.mk.in

	$(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk

	$(PYTHON) $(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk

	$(TOUCH) $@



###############################################################################

dom/ipc/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ EXPORTS_mozilla/dom = \ 


EXPORTS_mozilla/dom/ipc = \

  Blob.h \

  ProcessPriorityManager.h \

  nsIRemoteBlob.h \

  $(NULL)
@@ -50,6 +51,7 @@ CPPSRCS = \ 
  ContentChild.cpp \

  CrashReporterParent.cpp \

  CrashReporterChild.cpp \

  ProcessPriorityManager.cpp \

  StructuredCloneUtils.cpp \

  TabParent.cpp \

  TabChild.cpp \