Commit Graph

224858 Commits

Author SHA1 Message Date
Bob Owen
823c53bbd3 Bug 1102215: Move security/sandbox/chromium/base/shim/ to new directory security/sandbox/chromium-shim/ r=ted
--HG--
rename : security/sandbox/chromium/base/shim/base/gtest_prod_util.h => security/sandbox/chromium-shim/base/gtest_prod_util.h
rename : security/sandbox/chromium/base/shim/base/logging.cpp => security/sandbox/chromium-shim/base/logging.cpp
rename : security/sandbox/chromium/base/shim/base/strings/string_piece.h => security/sandbox/chromium-shim/base/strings/string_piece.h
rename : security/sandbox/chromium/base/shim/base/third_party/nspr/prtime.h => security/sandbox/chromium-shim/base/third_party/nspr/prtime.h
rename : security/sandbox/chromium/base/shim/base/third_party/nspr/prtypes.h => security/sandbox/chromium-shim/base/third_party/nspr/prtypes.h
rename : security/sandbox/chromium/base/shim/base/threading/thread_local_storage.h => security/sandbox/chromium-shim/base/threading/thread_local_storage.h
rename : security/sandbox/chromium/base/shim/base/tracked_objects.h => security/sandbox/chromium-shim/base/tracked_objects.h
rename : security/sandbox/chromium/base/shim/base/win/registry.h => security/sandbox/chromium-shim/base/win/registry.h
rename : security/sandbox/chromium/base/shim/sdkdecls.h => security/sandbox/chromium-shim/base/win/sdkdecls.h
rename : security/sandbox/win/src/logging/loggingCallbacks.h => security/sandbox/chromium-shim/sandbox/win/loggingCallbacks.h
rename : security/sandbox/win/src/logging/loggingTypes.h => security/sandbox/chromium-shim/sandbox/win/loggingTypes.h
rename : security/sandbox/win/src/logging/sandboxLogging.cpp => security/sandbox/chromium-shim/sandbox/win/sandboxLogging.cpp
rename : security/sandbox/win/src/logging/sandboxLogging.h => security/sandbox/chromium-shim/sandbox/win/sandboxLogging.h
2015-01-22 08:37:30 +00:00
Bob Owen
62de1a9d78 Bug 1102211: Move security/sandbox/build/ into security/sandbox/chromium/ r=ted
--HG--
rename : security/sandbox/build/build_config.h => security/sandbox/chromium/build/build_config.h
rename : security/sandbox/chromium-commit-status.txt => security/sandbox/moz-chromium-commit-status.txt
2015-01-22 08:37:30 +00:00
Jon Coppeard
0a9fcdcde7 Bug 1124195 - Replace use of AutoPtr with mozilla::UniquePtr r=sfink 2015-01-22 14:11:12 +00:00
Jon Coppeard
d08a147168 Bug 1123648 - Fix rooting hazard in CTypes r=sfink 2015-01-22 14:11:10 +00:00
Carsten "Tomcat" Book
cd20078ecd Merge mozilla-central to mozilla-inbound 2015-01-22 14:39:29 +01:00
Carsten "Tomcat" Book
22bec65ed2 merge mozilla-inbound to mozilla-central a=merge 2015-01-22 14:30:51 +01:00
Jim Mathies
e02596de2e Bug 669200 - clean up some windows line endings in PPluginWidget classes. r=nobug 2015-01-22 07:20:13 -06:00
Jim Mathies
aaa48a9e24 Bug 1088203 - e10sify PageThumbs support for checking page security and error state. r=Dao 2015-01-22 07:07:56 -06:00
Carsten "Tomcat" Book
3f03122753 merge fx-team to mozilla-central a=merge 2015-01-22 14:02:40 +01:00
Andreas Pehrson
ddb72d387a Bug 1124139 - Don't use mPlaybackStream for CameraPreview. r=jesup
From db346795ad1a0ae33e7496df893288eb1fbf7699 Mon Sep 17 00:00:00 2001
---
 dom/camera/CameraPreviewMediaStream.h |  1 +
 dom/html/HTMLMediaElement.cpp         | 29 +++++++++++++++++------------
 dom/html/HTMLMediaElement.h           |  6 +++++-
 dom/media/MediaStreamGraph.h          |  2 ++
 4 files changed, 25 insertions(+), 13 deletions(-)
2015-01-22 09:27:24 +01:00
James Graham
28d1e567e6 Bug 1124311 - Update web-platform-tests expected data to revision 412773b71c81d7356636f698e86d7b544cf48fcb, a=testonly 2015-01-22 12:00:01 +00:00
James Graham
f0f1c77c2b Bug 1124311 - Update web-platform-tests to revision 412773b71c81d7356636f698e86d7b544cf48fcb, a=testonly 2015-01-22 11:59:59 +00:00
Nicolas B. Pierron
709ee16e3a Bug 1124120 - MIPS: Remove unused variable from opt-builds. r=rankov 2015-01-22 12:05:48 +01:00
Nicolas B. Pierron
f37bba6928 Bug 1124120 - ARM: Remove unused variable from opt-builds. r=mjrosenb 2015-01-22 12:05:47 +01:00
Geoff Lankow
860cd65acb Bug 675372 - Allow resource protocol mappings in chrome.manifest files of bootstrapped add-ons; r=Unfocused 2015-01-22 20:00:13 +13:00
B2G Bumper Bot
59b32cfbb1 Bumping manifests a=b2g-bump 2015-01-21 22:21:21 -08:00
B2G Bumper Bot
3edaa7b0db Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9a9aef701b1c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #27479 from crh0716/1119024

Bug 1119024 - Use number instead of string r=eragonj, drs

========

https://hg.mozilla.org/integration/gaia-central/rev/b861c6bc167f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1119024 - Use number instead of string
2015-01-21 22:19:43 -08:00
Alexandre Poirot
b7db63a495 Bug 1118544 - Tweak WebIDE to better support FxOS addons. r=jryans 2015-01-21 21:07:45 -08:00
Matthew Noorenberghe
263d43b5b4 Bug 1079554 - Ignore most UITour messages from pages that aren't visible. r=Unfocused
--HG--
extra : rebase_source : 23e09cde5bae0393b8d3428670306123d74c0f70
2015-01-21 21:05:05 -08:00
B2G Bumper Bot
de1495aaa8 Bumping manifests a=b2g-bump 2015-01-21 20:21:58 -08:00
B2G Bumper Bot
91ac0d7498 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1d51fd305973
Author: Tzu-Lin Huang <dwi019@gmail.com>
Desc: Merge pull request #27521 from dwi2/bug1123301

Bug 1123301 - [Stingray] move default-cards.json to tv_shared/ and copy it to app folders at build-time

========

https://hg.mozilla.org/integration/gaia-central/rev/4028f48ceb83
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1123301 - [Stingray] move default-cards.json to tv_shared/ and copy it to app folders at build-time

========

https://hg.mozilla.org/integration/gaia-central/rev/df2735ca2522
Author: Sherman Chen <shamenchens@users.noreply.github.com>
Desc: Merge pull request #27523 from shamenchens/Bug1123184-ContextMenuL10nArgs

Bug 1123184 - Enable l10n args format in browser context menu, r=gandalf

========

https://hg.mozilla.org/integration/gaia-central/rev/411a39df249b
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 1123184 - Enable l10n args format in browser context menu
2015-01-21 20:20:19 -08:00
Mark Finkle
50fa828fee Bug 1117186 - fix geo-specific search defaults interaction with the defaultEngine getter/setter and use a helper for getting geo-specific prefs f=gavin,r=markh 2015-01-21 23:05:48 -05:00
B2G Bumper Bot
6448e504fa Bumping manifests a=b2g-bump 2015-01-21 19:36:22 -08:00
B2G Bumper Bot
df2e6b0883 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5148663f0f7
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1115083 - merge pull request #27577 from millermedeiros:1115083-intermittent-day-observer-test to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/3502ab1d2f50
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1115083 - Intermittent day_observer_test.js | day_observer cached #on: yesterday + persist + remove + visibility
2015-01-21 19:34:45 -08:00
Chenxia Liu
f2aaffe518 Backout bug 1091461 for visual changes. r=bustage 2015-01-21 17:57:16 -08:00
Allison Naaktgeboren
ae242e0fb4 Bug 1123820 - Change the expiration of master password probes to never expire.r=MattN 2015-01-21 17:50:43 -08:00
B2G Bumper Bot
0f2f33fce5 Bumping manifests a=b2g-bump 2015-01-21 17:36:22 -08:00
B2G Bumper Bot
2bd34b4f89 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b395d5d859c6
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #27562 from asutherland/email-coremail-sent

Bug 1055445 - CoreMail servers auto-file in sent, like gmail. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/a3cefd5b7be4
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1055445 - CoreMail servers auto-file in sent, like gmail. r=asuth

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/361
2015-01-21 17:34:43 -08:00
Wes Kocher
a0df05bf48 Merge m-c to b2g-inbound a=merge 2015-01-21 16:27:25 -08:00
Wes Kocher
ed2e775bf5 Merge fx-team to m-c a=merge 2015-01-21 15:28:31 -08:00
Wes Kocher
6f864ed310 Merge inbound to m-c a=merge 2015-01-21 14:14:21 -08:00
B2G Bumper Bot
689441605c Bumping manifests a=b2g-bump 2015-01-21 13:51:28 -08:00
B2G Bumper Bot
cb34d01c57 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/833ac164319c
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #27459 from stasm/1115797-langpacks-extend-list

Bug 1115797 - Extend languages list in Settings with Langpack provided locales. r=eragonj r=kgrandon r=gandalf

========

https://hg.mozilla.org/integration/gaia-central/rev/c8bf9811dde9
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1115797 - Extend languages list in Settings with Langpack provided locales. r=eragonj r=kgrandon r=gandalf
2015-01-21 13:49:46 -08:00
B2G Bumper Bot
55f03ab03a Bumping manifests a=b2g-bump 2015-01-21 11:11:22 -08:00
B2G Bumper Bot
363c92592e Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3033c2214b58
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #27541 from zbraniecki/1124013-upgrade-sinon-to-1.12.2

Bug 1124013 - Upgrade sinon to 1.12.2. r=felash

========

https://hg.mozilla.org/integration/gaia-central/rev/06fb8f5c6c02
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1124013 - Upgrade sinon to 1.12.2

========

https://hg.mozilla.org/integration/gaia-central/rev/a71aedaddda3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27567 from Cwiiis/bug1120718-hover-over-top-with-collection

Bug 1120718 - Fix creating new group at top with collection as first icon. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/50e95afe93ba
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1120718 - Test that creating groups above collections works. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/6b650dfa7fcb
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1120718 - Fix creating new group at top with collection as first icon. r=kgrandon

If the first icon in a grid was a collection, dragging an icon to the top
of the grid would drop it into that collection instead of creating a new
group.
2015-01-21 11:09:45 -08:00
B2G Bumper Bot
bf45c66606 Bumping manifests a=b2g-bump 2015-01-21 10:31:54 -08:00
B2G Bumper Bot
ec91af0d3d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c1a0215e7a28
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27540 from martasect/bug_1120726

Bug 1120726 - do not change the setting of notifications r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/586a3b25453e
Author: Marta Piekarska <marta@sec.t-labs.tu-berlin.de>
Desc: Bug 1120726 - do not change the setting of notifications + autolander
2015-01-21 10:30:17 -08:00
Jordan Santell
f30e4ff3b1 Bug 1118497 - Update web audio editor 'parameters' view to the more accurately described 'properties' view. r=vp 2015-01-21 10:29:00 -08:00
Matthew Noorenberghe
3a00f98d4a Bug 1089000 - UITour: Remove broken code for detaching a tab to a new window. r=Unfocused
--HG--
extra : rebase_source : 5c5aa012a8c3a29e85ad38e1c547a139fb9e0e01
2015-01-21 17:27:47 -08:00
Mark Hammond
d61886cf4e Bug 1117979 - fix orange by not relying on DNS lookup failure in the 'error' test. r=gavin 2015-01-22 12:13:23 +11:00
Wes Kocher
6b6ca4243b Merge m-c to fx-team a=merge 2015-01-21 16:28:27 -08:00
Mark Capella
bac281c227 Bug 851861 - v2 - Intermittent testFlingCorrectness, etc al. dragSync() consumers 2015-01-21 19:23:49 -05:00
Mark Capella
6901fede2a Bug 851861 - v1 - BACKOUT Intermittent testFlingCorrectness, etc al. dragSync() consumers, r=mfinkle 2015-01-21 19:23:49 -05:00
Allison Naaktgeboren
08338cbfa3 Bug 1091461 - Fix Tapping anywhere under the 'Private Browsing' tip in the History panel will open the Custom menu when it shouldn't.r=liuche 2015-01-21 15:10:11 -08:00
Nick Alexander
2f1289b00b Bug 1124052 - Part 2: Don't preprocess Java in background services. r=rnewman
--HG--
rename : mobile/android/base/background/common/GlobalConstants.java.in => mobile/android/base/background/common/GlobalConstants.java
rename : mobile/android/base/background/healthreport/HealthReportConstants.java.in => mobile/android/base/background/healthreport/HealthReportConstants.java
rename : mobile/android/base/fxa/FxAccountConstants.java.in => mobile/android/base/fxa/FxAccountConstants.java
rename : mobile/android/base/sync/SyncConstants.java.in => mobile/android/base/sync/SyncConstants.java
extra : rebase_source : 833561a9970bd2705d81c094a2d62a510c3484e0
2015-01-21 11:15:24 -08:00
Dan Mosedale
f189874e4b Bug 974904-Add Google Analytics snippet for Hello link-clicker side, r=jaws 2015-01-21 10:20:29 -08:00
Nick Alexander
aed7a58862 Bug 1124052 - Part 1: Remove BUILD_TIMESTAMP_*. r=rnewman
--HG--
extra : rebase_source : 6eb237fc70a8fe93863fedbeac75193507299342
2015-01-21 09:55:12 -08:00
Benjamin Bouvier
b565fef35c Bug 1123643: Fix typo in float64x2 ctor and add test cases; r=till
--HG--
extra : rebase_source : a21dccaa2af04d623f002f7f3cb693d6611ae4ea
extra : amend_source : 640dde0724252f5421179a550d74bb9093c30d27
2015-01-21 18:50:49 +01:00
Jean-Yves Avenard
4ac459f765 Bug 1123198: Run reset parser state algorithm when aborting. r=cajbir 2015-01-22 21:19:02 +11:00
Jon Coppeard
d7cfd67180 Bug 1120591 - Avoid race condition updating gcTriggerBytes_ between main and background threads r=terrence 2015-01-22 09:38:54 +00:00