Ryan VanderMeulen
b93dddec49
Merge b2g-inbound to m-c.
2014-02-14 08:55:04 -05:00
Ryan VanderMeulen
ef7d356d30
Merge inbound to m-c.
2014-02-14 08:54:12 -05:00
Ryan VanderMeulen
c2eab593d8
Merge fx-team to m-c.
2014-02-14 08:42:41 -05:00
Honza Bambas
34a108d747
Bug 971975 - Proper state and non-null check for CacheFile::WriteMetadataIfNeededLocked(), r=michal
2014-02-14 14:21:28 +01:00
Honza Bambas
0a33541973
Bug 950164 - Proper non-null check at CacheFileIOManager::OnProfile(), r=michal
2014-02-14 14:21:18 +01:00
Mike de Boer
f1c5279f2a
Bug 326743: update tests to know about the Find Clipboard on OSX. r=Unfocused
2014-02-14 14:04:28 +01:00
Mike de Boer
8f0475a831
Bug 326743: support find-selection in view-source component. r=Unfocused
2014-02-14 14:04:25 +01:00
Mike de Boer
ea9c7b0eab
Bug 326743: use cmd-e to set find-in-page search term to currently selected text. r=Unfocused
2014-02-14 14:04:23 +01:00
Mike de Boer
0e98650667
Bug 326743: support the find clipboard in the find toolbar. r=Unfocused
2014-02-14 14:04:21 +01:00
Mike de Boer
e6d70963f2
Bug 326743: add find clipboard to the list of available clipboard on OSX. r=joshmoz
2014-02-14 14:04:19 +01:00
Ryan VanderMeulen
98fa8d829d
Backed out changesets d3855e27cb32, 6ac71c1149a5, and b8d0cbe94d15 (bug 971939) for Android bustage.
...
CLOSED TREE
2014-02-14 12:13:07 -05:00
Jan de Mooij
9bb95be4cb
Backout bug 785905, off-thread IonBuilder. r=jorendorff
2014-02-14 13:17:53 +01:00
Nicolas Silva
6299666958
Bug 972397 - Fix BufferTextureClient::Lock. r=jrmuizel
2014-02-14 10:20:41 +01:00
Nick Alexander
dbbb01b243
Bug 853045 - Second follow-up: Fix bustage caused by .hgignore. r=me
2014-02-13 22:58:48 -08:00
Nick Alexander
0de9043bfd
Bug 853045 - Follow-up: Address review comment and avoid bustage. r=me
2014-02-13 22:25:26 -08:00
Nick Alexander
bdab4ed07e
Bug 853045 - Part 6: Allow running AndroidEclipse backend in |mach build-backend|. r=gps
...
This adds and uses a --backend parameter to config_status.py.
2014-02-13 22:19:50 -08:00
Nick Alexander
fa2dd1ef35
Bug 853045 - Part 5: Advertise where Eclipse projects were written. r=gps
2014-02-13 22:19:50 -08:00
Nick Alexander
4e0e33eada
Bug 853045 - Part 4: Add Android Eclipse projects to moz.build files. r=gps
2014-02-13 22:19:50 -08:00
Nick Alexander
48efc741b7
Bug 853045 - Part 3: Add AndroidEclipseBackend. r=gps
...
test_recursive_make.py depends on the test data added by this commit, so
it's here rather than in the earlier commit.
2014-02-13 22:19:49 -08:00
Nick Alexander
33ec9e8af1
Bug 853045 - Part 2: Add frontend and RecursiveMakeBackend for Android Eclipse projects. r=gps
2014-02-13 22:19:49 -08:00
Nick Alexander
8f1f977233
Bug 853045 - Part 1: Add Android Eclipse project templates to mozbuild. r=gps
2014-02-13 22:19:49 -08:00
Nick Alexander
be5ccb2308
Bug 853045 - Pre: Remove outdated test files. r=me
2014-02-13 22:19:49 -08:00
Nick Alexander
e02b48a46d
Bug 971525 - Optionally make FileCopier only delete symlinked directories it needs to replace. r=gps
2014-02-13 22:19:48 -08:00
B2G Bumper Bot
61971eed50
Bumping manifests a=b2g-bump
2014-02-13 18:30:58 -08:00
Chris Peterson
b7a36cac1b
Bug 972700 - Change "New OOP Window" menu item to "New e10s Window". r=billm
2014-02-13 18:27:25 -08:00
Shu-yu Guo
d640ccb3dc
Bug 970427 - Push ForkJoinActivation after calling the bounds function. (r=nmatsakis)
2014-02-13 19:14:14 -08:00
Nicholas Nethercote
dc264778f4
Bug 972657 - Move the "is this script too small to compress?" check to a better place. r=benjamin.
...
--HG--
extra : rebase_source : 5be3ed97b89f1a8cf5579e3e0d39bdb6cf985aeb
2014-02-13 19:04:05 -08:00
Bobby Holley
7e6a232b92
Bug 956382 - Remove implementations of *IgnoringDomain variants. r=mrbkap
2014-02-13 18:57:36 -08:00
Bobby Holley
1c600e7056
Bug 956382 - Remove usage of explicit *IgnoringDomain variants. r=mrbkap
2014-02-13 18:57:36 -08:00
Bobby Holley
5489839173
Bug 956382 - Remove unused CAPS gunk. r=mrbkap
2014-02-13 18:57:36 -08:00
Bobby Holley
db40fe8635
Bug 956382 - Hoist nsScriptSecurityManager::CheckSameOriginPrincipal into nsPrincipal::EqualsConsideringDomain. r=mrbkap
2014-02-13 18:57:36 -08:00
Bobby Holley
0efcb609ad
Bug 956382 - Ignore document.domain by default. r=mrbkap
2014-02-13 18:57:36 -08:00
Bobby Holley
5e82273b68
Bug 956382 - Remove useless security checks in nsDocument. r=mrbkap
...
In an o-cap world, we'll generally not get references to cross-origin elements.
And even if we do, we'll fail at the binding layer (when we try to CheckedUnwrap
the security wrapper).
2014-02-13 18:57:36 -08:00
Bobby Holley
88d6ae4ad9
Bug 956382 - Consider document.domain in wacky postMessage security check. r=mrbkap
...
We can clean this stuff up in bug 968460.
2014-02-13 18:57:35 -08:00
Bobby Holley
7c4284bf87
Bug 956382 - Consider document.domain for showModalDialog's dialogArguments and returnValue. r=mrbkap
2014-02-13 18:57:35 -08:00
Bobby Holley
02b3bf5876
Bug 956382 - Consider document.domain when doing Location security checks. r=mrbkap
2014-02-13 18:57:35 -08:00
Bobby Holley
0e8b3267e2
Bug 956382 - Consider document.domain when deciding whether to return contentDocument. r=mrbkap
2014-02-13 18:57:35 -08:00
Bobby Holley
2b33b064b7
Bug 956382 - Consider document.domain when computing security wrappers. r=mrbkap
2014-02-13 18:57:35 -08:00
Bobby Holley
e0f33e6e2e
Bug 956382 - Add AccessCheck::subsumesConsideringDomain and clean up other implementations. r=mrbkap
...
We now assert that we have a principal when we enter the wrap callback, and we
now have a convenient overload defined in nsIPrincipal.idl.
2014-02-13 18:57:34 -08:00
Bobby Holley
c5505c6f3d
Bug 956382 - Introduce an explicit API to do principal checks with document.domain. r=mrbkap
2014-02-13 18:57:34 -08:00
Wes Kocher
3211da1532
Merge m-c to inbound on a CLOSED TREE
2014-02-13 18:50:08 -08:00
Mike Hommey
fb4e9ba3f6
Followup for bug 967556 - Force AC_CHECK_FUNC to use a different cache. r=bustage on a CLOSED TREE
2014-02-14 11:34:12 +09:00
B2G Bumper Bot
d481522b3d
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4f00231c5cc5
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #16193 from crh0716/958736
Bug 958736 - Move the localization logic to LockScreenConnInfoManager r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/2c46d671757c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 958736 - Move the localization logic to LockScreenConnInfoManager
========
https://hg.mozilla.org/integration/gaia-central/rev/bcedbf5ab53b
Author: RickyChien <ricky060709@gmail.com>
Desc: Merge pull request #13408 from RickyChien/issue-934952
Bug 934952 - Add test-agent coverage report into allow-failures of Travis CI. r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/766af2e57ac0
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 934952 - Add test-agent coverage report into allow-failures of Travis CI
2014-02-13 18:25:10 -08:00
Wes Kocher
60c87002cf
Merge m-c to b2g-inbound
2014-02-13 18:12:02 -08:00
B2G Bumper Bot
0a855815b1
Bumping manifests a=b2g-bump
2014-02-13 18:06:01 -08:00
B2G Bumper Bot
1b1d2dea0d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a211d50351e0
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #16235 from yurenju/comm-makefile-2
Bug 968675 - Add Makefile for communications r=@timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/58b1a98eb555
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 968675 - Add Makefile for communications
2014-02-13 18:00:10 -08:00
Wes Kocher
b921abacaf
Merge fx-team to m-c
2014-02-13 17:28:56 -08:00
B2G Bumper Bot
ea1c067d4a
Bumping manifests a=b2g-bump
2014-02-13 17:10:57 -08:00
B2G Bumper Bot
f16df0fa5c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1d05c815645a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #16268 from gaye/bug-972631
Bug 972631 - Disable caldav_test.js on TBPL
========
https://hg.mozilla.org/integration/gaia-central/rev/a32360105e28
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 972631 - Disable caldav_test.js on TBPL
2014-02-13 17:05:10 -08:00
Wes Kocher
7782444919
Merge b2g-inbound to m-c
2014-02-13 17:02:58 -08:00