Carsten "Tomcat" Book
634dc488d6
merge mozilla-inbound to mozilla-central a=merge
2015-10-08 15:26:54 +02:00
Chris Pearce
70498d2115
Bug 1211812 - Add pref to select GMP to use for unencrypted decoding. r=jwwang
2015-10-08 20:40:09 +13:00
Paolo Amadini
cec3e85a4e
Bug 1179961 - Use a lock with a strikethrough for HTTP pages that have password fields in the Control Center. r=ttaubert,bgrins
...
--HG--
extra : commitid : 9Cv8FpIQva7
extra : rebase_source : f0d10a153b1f054141fd1caaf8423049af79f04e
2015-10-07 20:50:40 +01:00
Brian Grinstead
a520cde0b1
Bug 1212456 - Merge platform-specific aboutCertError.css files into a single shared file;r=paolo
...
--HG--
rename : browser/themes/osx/aboutCertError.css => browser/themes/shared/aboutCertError.css
extra : commitid : 8E8FNpzEX7I
2015-10-07 13:01:12 -07:00
David Critchley
310ba9b7a3
Bug 1209632 - Removing footer from Loop Standalone, moved Logo to mediaLayoutView. r=Standard8,ui-review=Sevaan
2015-10-07 19:48:28 +01:00
Wes Kocher
c23069f318
Merge m-c to fx-team a=merge
...
--HG--
rename : mobile/android/config/tooltool-manifests/android/releng.manifest => mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest
extra : rebase_source : 10508628a76cecbf86b54dd2e27fca8c39cfa37b
2015-10-07 11:33:10 -07:00
Mark Banner
219eacc1d3
Bug 1212272 - 'make dist' for the Loop standalone doesn't update the css and supplementary files properly. r=dmose. NPOTB DONTBUILD
2015-10-07 19:20:03 +01:00
Wes Kocher
399a23b6c1
Merge inbound to m-c a=merge
2015-10-07 10:29:41 -07:00
Wes Kocher
92eaf64910
Backed out changeset 1f51d1614b9a (bug 1207245)
2015-10-07 10:19:31 -07:00
Wes Kocher
75ff20f5af
Backed out changeset 91d4539e00ce (bug 1207245)
...
--HG--
rename : mfbt/RefPtr.h => mfbt/nsRefPtr.h
2015-10-07 10:19:19 -07:00
Wes Kocher
9d0985e9fd
Merge fx-team to central, a=merge
2015-10-07 09:58:09 -07:00
Nathan Froyd
89a69c829a
Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat
...
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
2015-10-07 16:50:25 -04:00
Nathan Froyd
1f70f620da
Bug 1207245 - part 3 - switch all uses of mozilla::RefPtr<T> to nsRefPtr<T>; r=ehsan
...
This commit was generated using the following script, executed at the
top level of a typical source code checkout.
# Don't modify select files in mfbt/ because it's not worth trying to
# tease out the dependencies currently.
#
# Don't modify anything in media/gmp-clearkey/0.1/ because those files
# use their own RefPtr, defined in their own RefCounted.h.
find . -name '*.cpp' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
grep -v 'mfbt/RefPtr.h' | \
grep -v 'mfbt/nsRefPtr.h' | \
grep -v 'mfbt/RefCounted.h' | \
grep -v 'media/gmp-clearkey/0.1/' | \
xargs perl -p -i -e '
s/mozilla::RefPtr/nsRefPtr/g; # handle declarations in headers
s/\bRefPtr</nsRefPtr</g; # handle local variables in functions
s#mozilla/RefPtr.h#mozilla/nsRefPtr.h#; # handle #includes
s#mfbt/RefPtr.h#mfbt/nsRefPtr.h#; # handle strange #includes
'
# |using mozilla::RefPtr;| is OK; |using nsRefPtr;| is invalid syntax.
find . -name '*.cpp' -o -name '*.mm' | xargs sed -i -e '/using nsRefPtr/d'
# RefPtr.h used |byRef| for dealing with COM-style outparams.
# nsRefPtr.h uses |getter_AddRefs|.
# Fixup that mismatch.
find . -name '*.cpp' | \
xargs perl -p -i -e 's/byRef/getter_AddRefs/g'
2015-10-07 15:05:02 -04:00
Carsten "Tomcat" Book
58e0d2ac7d
Backed out 6 changesets (bug 1132203) for e10s-dt2 test failures
...
Backed out changeset d6e2d567d8c3 (bug 1132203)
Backed out changeset 8a90df6a9ae7 (bug 1132203)
Backed out changeset 0677c5169e05 (bug 1132203)
Backed out changeset f3023ebc9881 (bug 1132203)
Backed out changeset f00c53c8ffd4 (bug 1132203)
Backed out changeset 2a6416177736 (bug 1132203)
--HG--
extra : rebase_source : 90d20637f825c7fbd144cb5a8beb2962064c157d
2015-10-07 15:35:31 +02:00
Carsten "Tomcat" Book
08997000eb
Backed out 2 changesets (bug 1202902
) to recking bug 1202902
to be able to reopen inbound on a CLOSED TREE
...
Backed out changeset 647025383676 (bug 1202902
)
Backed out changeset d70c7fe532c6 (bug 1202902
)
2015-10-07 14:03:21 +02:00
Sebastian Hengst
cdcff6d0a7
Backed out changeset c6b267589d0d (bug 1202902
) for Mulet Reftest, W3C Platform Test and other failures. r=backout a=backout on a CLOSED TREE
2015-10-07 13:36:26 +02:00
Kit Cambridge
824ed3e7f6
Bug 1212035 - yield on removeTab in browser_notification_open_settings.js to fix intermittent failures. r=MattN
...
--HG--
extra : commitid : 5jcasqxnN2K
extra : rebase_source : 458c24a040cfc670519398de30860241ed025377
2015-10-07 11:45:30 -04:00
Manav Batra
e302facb88
Bug 1212280 - Remove workaround for bug 1202618 from stop/reload/go buttons. r=dao, DONTBUILD
2015-10-07 16:48:47 +02:00
Dão Gottwald
b288c9fdec
Backed out changeset 7f6553651b3b (wrong author)
2015-10-07 17:16:32 +02:00
Dão Gottwald
839eab110f
Bug 1173744 - Update Back/Forward button styling for Windows 10. r=gijs
2015-10-07 17:12:54 +02:00
Dão Gottwald
047a2fcb1f
Bug 1212280 - Remove workaround for bug 1202618 from stop/reload/go buttons. r=dao
2015-10-07 16:48:47 +02:00
Dão Gottwald
1114aac7bd
Bug 1203661 - Fix spacing in location bar to be less uneven. r=gijs
2015-10-07 16:47:56 +02:00
Ed Lee
22dc1b2cfe
Bug 1211563 - Invite buttons should be underneath "Invite a friend" text in popped-out view [r=Standard8]
2015-10-05 15:34:21 -07:00
Marco Bonardo
ed553c88ae
Bug 1208063 - The name input field on the new bookmark dialog doesn't get focus. r=adw
2015-10-07 15:40:13 +02:00
Ed Lee
07095402be
Bug 1211592 - The Copy Link and Email Link buttons show cursor:default, but the other buttons (Camera,Mic,Share Screen,Settings) show cursor:pointer [rs=jaws]
2015-10-05 15:24:32 -07:00
Tom Tromey
bc328979f0
Bug 984880 - as-authored styles in the rule view; r=pbrosset,r=bgrins
...
--HG--
extra : commitid : Io2mbcAjYMx
2015-10-06 09:35:31 -07:00
Shane Caraveo
2a825165c5
Bug 1188378 fix loading share pages when TP is turned on, r=markh
2015-10-05 15:53:51 -07:00
Mark Banner
a06648dbfd
Bug 1208047 - Close the dropdown menu for sharing on Loop's conversation window as soon as an item is clicked, rather than leaving it open in a potentially confusing state. r=mikedeboer
2015-10-06 16:05:50 +01:00
Mike Conley
226e9b91b6
Bug 1110511 - Regression tests. r=felipe
...
--HG--
extra : commitid : Bj6HzQgu0se
extra : rebase_source : 67229249a62b7e2898b953ecb58a575ca759a0b7
2015-09-30 17:50:27 -04:00
Mike Conley
f29c98bfde
Bug 1110511 - Move tab-crashing test helper function to BrowserTestUtils.jsm r=felipe
...
--HG--
extra : commitid : 4ACRUHc4rlx
extra : source : 0eb0dda094b30354a84991e430a0e49320fde52b
extra : amend_source : 32bd586ee11bb38ddb733ced6d86179b051b7f96
2015-09-29 16:44:50 -04:00
Mike Conley
dc52923a83
Bug 1110511 - Add comment and email input to about:tabcrashed. r=felipe,ntim
...
Original patch by Ursula Sarracini
--HG--
extra : commitid : 1lruBAoE7jC
extra : source : 8e20cd68ca78366976495c9a7f003f0f120c1166
2015-09-30 17:50:48 -04:00
Mike Conley
d46d8fbfbd
Bug 1110511 - Allow TabCrashReporter to pass extraExtraKeyVals. r=felipe
...
--HG--
extra : commitid : 69Ly6A88hOv
extra : source : 219d86f78b6be95ffbac8d005c428cd04db11150
2015-09-28 18:39:39 -04:00
Mike Conley
1f12033291
Bug 1110511 - Use the browser permanentKey to map to childIDs in TabCrashReporter. r=felipe
...
--HG--
extra : commitid : 6Z2a3BxiuJ6
extra : source : 0e055b648e1003d29b243e036aef43565f2e9874
2015-10-01 13:42:44 -04:00
Xidorn Quan
03a2ea5f2e
Bug 1161565 - Give titlebar proper appearance on OS X Yosemite and revmoe special case of double click behavior on unified tabbar on OS X. r=gijs
...
--HG--
extra : source : ab5152f6824840563f677260e56672964c7b0a7e
2015-10-06 22:17:41 +11:00
Carsten "Tomcat" Book
e424a0e150
Merge m-c to fx-team
2015-10-06 12:22:48 +02:00
Carsten "Tomcat" Book
71e22d0c44
merge mozilla-inbound to mozilla-central a=merge
2015-10-06 12:01:35 +02:00
Kit Cambridge
c32b73c214
Bug 1192458, Part 2 - New icon for consolidated notification permission. r=MattN
...
--HG--
extra : commitid : Bs2HfzOQss0
2015-10-05 16:39:41 -07:00
Kit Cambridge
74ef03c1a6
Bug 1192458, Part 1 - Consolidate push and desktop notification permissions. r=nsm,wchen,MattN
...
--HG--
extra : commitid : 1veevVaOOYv
2015-10-05 16:39:34 -07:00
Wes Kocher
c1121ee892
Backed out 6 changesets (bug 1110511) for automation timeouts in mochitest-bc suites
...
Backed out changeset eddfd7f32a1c (bug 1110511)
Backed out changeset 0eb0dda094b3 (bug 1110511)
Backed out changeset 8e20cd68ca78 (bug 1110511)
Backed out changeset c7b983f65568 (bug 1110511)
Backed out changeset 219d86f78b6b (bug 1110511)
Backed out changeset 0e055b648e10 (bug 1110511)
2015-10-05 16:38:03 -07:00
Richard Marti
7c2d9ade65
Bug 1211250 - Backout bug 1206469 after landing of bug 1194480. r=gijs
2015-10-03 22:12:35 +02:00
Jared Wein
0bb22245ff
Bug 1211221 - Add a unit to the --tab-toolbar-navbar-overlap CSS varialbe to please the calc() parser. r=Gijs
2015-10-05 08:01:00 +02:00
Edouard Oger
c43954f28d
Bug 1210947 - Center buttons text in sync preferences. r=markh
2015-10-04 11:19:00 +02:00
Jan Odvarko
e1e3cb3ebb
Bug 1132203 - JSON Viewer for application/json documents; r=jlong
...
--HG--
extra : rebase_source : 0d9bd8b4f731d0a5219efac7db998bcaab69bea2
2015-09-28 13:33:20 +02:00
Xidorn Quan
965a30f6ea
Bug 1196247 - Hide findbar without animation when entering DOM fullscreen. r=mikedeboer
...
--HG--
extra : source : 9dc1d62b85172813dc0ef9d055cdcc487dc84329
2015-10-07 16:53:43 +11:00
Matthew Noorenberghe
d1625cdffe
Bug 1208295
- Open content preferences after receiving notifications-open-settings. r=jaws
...
--HG--
rename : browser/base/content/test/general/browser_notification_tab_switching.js => browser/base/content/test/alerts/browser_notification_tab_switching.js
rename : browser/base/content/test/general/file_dom_notifications.html => browser/base/content/test/alerts/file_dom_notifications.html
extra : commitid : L8SBHW3urul
extra : rebase_source : 2b308872a836a6df9634e991409c008f3e72040c
2015-09-25 13:18:29 -07:00
Gijs Kruitbosch
539d69a3dd
Bug 1211456 - remove usage of getImageURLForResolution from search component, r=florian
...
--HG--
extra : commitid : 8okcoGpNbUe
extra : rebase_source : f14d17cd5fe3e67b6c1b2bccbbf6260c71e6de58
2015-10-05 15:39:16 +01:00
Gijs Kruitbosch
b5e57e3f6b
Bug 1073551 - fix doorhangers to not steal focus unless explicitly opened using mouse or keyboard, r=jaws
...
--HG--
extra : commitid : Mw8yIeqhB0
extra : rebase_source : 94344e5ee39946c0a7eb75a686be17c072788f5d
2015-10-02 18:32:17 +01:00
Mike Conley
2a19b75b12
Bug 1110511 - Regression tests. r=felipe
...
--HG--
extra : commitid : GLdt6U8gPWC
extra : rebase_source : cd5d40b385caa2ec0b7c0656132275f04abacc56
2015-09-30 17:50:27 -04:00
Mike Conley
8f9fdedf8f
Bug 1110511 - Move tab-crashing test helper function to BrowserTestUtils.jsm r=felipe
...
--HG--
extra : commitid : 3btc3brhudn
extra : rebase_source : 9e9cdf816b78eeeda4157a428b5d5e7fd1632b04
2015-09-29 16:44:50 -04:00
Mike Conley
ed57b12c2f
Bug 1110511 - Add comment and email input to about:tabcrashed. r=felipe,ntim
...
Original patch by Ursula Sarracini
--HG--
extra : commitid : 5oDPYygydFO
extra : rebase_source : 4e1fe56d12bfc019f079ba297f52070ed1b13d5b
2015-09-30 17:50:48 -04:00