Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge b2g-inbound to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-09-05 15:36:26 -04:00
commit 429d1d689c
9 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/chrome/content/forms.js
View File

@ -1140,7 +1140,9 @@ let CompositionManager = {
if (this._text !== text) {
domWindowUtils.sendCompositionEvent('compositionupdate', text, '');
}
domWindowUtils.sendTextEvent(text, 0, 0, 0, 0, 0, 0, 0, 0);
// Set the cursor position to |text.length| so that the text will be
// committed before the cursor position.
domWindowUtils.sendTextEvent(text, 0, 0, 0, 0, 0, 0, text.length, 0);
domWindowUtils.sendCompositionEvent('compositionend', text, '');
this._text = '';
this._isStarted = false;

4
b2g/components/ActivitiesGlue.js
View File

@ -47,7 +47,9 @@ ActivitiesDialog.prototype = {
return;
content.removeEventListener("mozContentEvent", act_getChoice);
activity.callback.handleEvent(evt.detail.value ? evt.detail.value : -1);
activity.callback.handleEvent(evt.detail.value !== undefined
? evt.detail.value
: -1);
});
browser.shell.sendChromeEvent(detail);

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "57210698c630b30a91de70b7f333f55207f31104",
"revision": "1bb5a08dd1a7b974168dfd7f03bb1246c592d304",
"repo_path": "/integration/gaia-central"
}

18
config/makefiles/rcs.mk
View File

@ -10,13 +10,14 @@ ifdef USE_RCS_MK #{
ifndef INCLUDED_RCS_MK #{
MOZ_RCS_TYPE ?= $(notdir $(wildcard $(topsrcdir)/.hg))
MOZ_RCS_TYPE_HG ?= $(notdir $(wildcard $(topsrcdir)/.hg))
MOZ_RCS_TYPE_GIT ?= $(notdir $(wildcard $(topsrcdir)/.git))
###########################################################################
# HAVE_MERCURIAL_RCS
###########################################################################
ifeq (.hg,$(MOZ_RCS_TYPE)) #{
ifeq (.hg,$(MOZ_RCS_TYPE_HG)) #{
# Intent: Retrieve the http:// repository path for a directory.
# Usage: $(call getSourceRepo[,repo_dir|args])
@ -33,7 +34,18 @@ FUNC_getSourceRepo = \
$(firstword $(shell $(getargv) showconfig paths.default))\
)))
endif #} HAVE_MERCURIAL_RCS
#} HAVE_MERCURIAL_RCS
###########################################################################
# HAVE_GIT_RCS
###########################################################################
else ifeq (.git,$(MOZ_RCS_TYPE_GIT)) #{
GIT ?= git
getSourceRepo = \
$(shell cd $(topsrcdir) && $(GIT) rev-parse --verify HEAD)
endif #} HAVE_GIT_RCS
INCLUDED_RCS_MK := 1

3
dom/apps/src/OfflineCacheInstaller.jsm
View File

@ -253,6 +253,9 @@ function installCache(app) {
let type = nsIApplicationCache.ITEM_FALLBACK;
applicationCache.markEntry(url, type);
});
storeCache(applicationCache, appcacheURL, cacheManifest,
nsIApplicationCache.ITEM_MANIFEST);
});
}

14
dom/system/gonk/ril_worker.js
View File

@ -353,6 +353,14 @@ let RIL = {
*/
this._processingNetworkInfo = false;
/**
* Multiple requestNetworkInfo() in a row before finishing the first
* request, hence we need to fire requestNetworkInfo() again after
* gathering all necessary stuffs. This is to make sure that ril_worker
* gets precise network information.
*/
this._needRepollNetworkInfo = false;
/**
* Pending messages to be send in batch from requestNetworkInfo()
*/
@ -1130,6 +1138,7 @@ let RIL = {
requestNetworkInfo: function requestNetworkInfo() {
if (this._processingNetworkInfo) {
if (DEBUG) debug("Network info requested, but we're already requesting network info.");
this._needRepollNetworkInfo = true;
return;
}
@ -3142,6 +3151,11 @@ let RIL = {
for (let i = 0; i < NETWORK_INFO_MESSAGE_TYPES.length; i++) {
delete RIL._pendingNetworkInfo[NETWORK_INFO_MESSAGE_TYPES[i]];
}
if (RIL._needRepollNetworkInfo) {
RIL._needRepollNetworkInfo = false;
RIL.requestNetworkInfo();
}
},
/**

18
js/src/config/makefiles/rcs.mk
View File

@ -10,13 +10,14 @@ ifdef USE_RCS_MK #{
ifndef INCLUDED_RCS_MK #{
MOZ_RCS_TYPE ?= $(notdir $(wildcard $(topsrcdir)/.hg))
MOZ_RCS_TYPE_HG ?= $(notdir $(wildcard $(topsrcdir)/.hg))
MOZ_RCS_TYPE_GIT ?= $(notdir $(wildcard $(topsrcdir)/.git))
###########################################################################
# HAVE_MERCURIAL_RCS
###########################################################################
ifeq (.hg,$(MOZ_RCS_TYPE)) #{
ifeq (.hg,$(MOZ_RCS_TYPE_HG)) #{
# Intent: Retrieve the http:// repository path for a directory.
# Usage: $(call getSourceRepo[,repo_dir|args])
@ -33,7 +34,18 @@ FUNC_getSourceRepo = \
$(firstword $(shell $(getargv) showconfig paths.default))\
)))
endif #} HAVE_MERCURIAL_RCS
#} HAVE_MERCURIAL_RCS
###########################################################################
# HAVE_GIT_RCS
###########################################################################
else ifeq (.git,$(MOZ_RCS_TYPE_GIT)) #{
GIT ?= git
getSourceRepo = \
$(shell cd $(topsrcdir) && $(GIT) rev-parse --verify HEAD)
endif #} HAVE_GIT_RCS
INCLUDED_RCS_MK := 1

2
toolkit/content/Makefile.in
View File

@ -33,6 +33,8 @@ endif
source_repo ?= $(call getSourceRepo)
ifneq (,$(filter http%,$(source_repo)))
DEFINES += -DSOURCE_REPO="$(source_repo)"
else ifneq (,$(strip $(source_repo)))
DEFINES += -DSOURCE_GIT_COMMIT="$(source_repo)"
endif
ifneq (,$(findstring stlport,$(STLPORT_LIBS)))

3
toolkit/content/buildconfig.html
View File

@ -30,6 +30,9 @@
<h2>Source</h2>
<p>Built from <a href="@SOURCE_REPO@/rev/@SOURCE_CHANGESET@">@SOURCE_REPO@/rev/@SOURCE_CHANGESET@</a></p>
#endif
#else ifdef SOURCE_GIT_COMMIT
<h2>Source</h2>
<p>Built from git commit <a href="#">@SOURCE_GIT_COMMIT@</a></p>
#endif
<h2>Build platform</h2>
<table>