900c693e30
Merge m-c to m-i
2015-07-03 19:15:06 -07:00
258ad59e3f
Bug 1171931 - Refactor duplicated code using XRE_IsParent/ContentProcess. r=froydnj
2015-07-03 18:29:00 -07:00
8d6aa6ae83
Bug 1179262 - Remove PlayPreview usage from PDF viewer. r=bz
...
--HG--
extra : rebase_source : ecdd1e516e1fc842169454161614f65d26462662
2015-07-02 11:09:45 -05:00
2fead310bb
Bug 1177565 - Stop warning if EnsureScriptEnvironment returns NS_ERROR_NOT_AVAILABLE. r=smaug
2015-06-29 17:16:31 -07:00
90ccc67e4e
merge mozilla-inbound to mozilla-central a=merge
2015-06-29 14:17:02 +02:00
43fb37cc29
Bug 1177621 - SharedWorkers should not be shared between a private and a non-private documents, r=nsm
2015-06-26 11:18:18 -07:00
5f5c327690
Backed out changeset 8b4e4083639e (bug 1171931) for B2G debug emulator bustage.
2015-06-25 19:48:42 -04:00
fb7c08fefa
Bug 1118285 - The browser.newtab.url preference is abused and should be removed.
2015-05-27 17:35:03 -07:00
b4745b397a
Bug 110567 - Remove nsIDocShell::GetURLSearchParams(), r=smaug
2015-06-24 06:49:07 -07:00
0db24a2c7c
Bug 1173389 - Disable ServiceWorker network interception by default. r=ehsan
...
--HG--
extra : rebase_source : 6309f011f978f08c4f104123910f7d8d9e56045a
2015-06-12 16:28:13 -07:00
6401cd5977
Bug 1170488 - Document URI should be updated before sending out onLocationChange. r=smaug
...
--HG--
extra : commitid : G1j77ljzh7a
extra : rebase_source : 93ba52598fd5b1b79a63e3903feaeab4b957d6d4
2015-06-17 10:26:28 -04:00
10fa76166d
Bug 1152899 - Disallow the interception of third-party iframes using service workers when the third-party cookie preference is set. r=smaug,baku
2015-06-11 15:32:54 +02:00
f9bd8dc5de
Bug 1141614 - Part 2: Add mozilla::AutoGlobalTimelineMarker; r=smaug
2015-06-10 14:05:53 -07:00
9a58f89b9d
Bug 1141614 - Part 1: Maintain a list of docshells whose timeline markers are being observed; r=smaug
2015-06-10 14:05:52 -07:00
dcdcd94a06
Bug 1155153 - about:serviceworkers should work in e10s mode, r=nsm, r=bholley
2015-06-04 19:51:57 +01:00
9a2838c071
Backed out 5 changesets (bug 1141614) for browser_timelineMarkers-02.js failures.
...
Backed out changeset 1db2b848699a (bug 1141614)
Backed out changeset 9becec7879dc (bug 1141614)
Backed out changeset fff492fc48ce (bug 1141614)
Backed out changeset f49e64db4a66 (bug 1141614)
Backed out changeset 63199013dac2 (bug 1141614)
CLOSED TREE
2015-06-09 13:20:24 -04:00
e3176f3516
Bug 1141614 - Part 2: Add mozilla::AutoGlobalTimelineMarker; r=smaug
2015-06-08 12:40:07 -07:00
ac6fdc2468
Bug 1141614 - Part 1: Maintain a list of docshells whose timeline markers are being observed; r=smaug
2015-06-08 12:40:07 -07:00
983c6000d6
Bug 1172224 - Ensure that docshells return an appropriate value for APZ-enabled even if they don't have a presShell. r=dvander
2015-06-08 14:46:47 -04:00
702a59d135
Bug 1171931 - Refactor duplicated code using XRE_IsParent/ContentProcess. r=froydnj
...
--HG--
extra : rebase_source : 2ecbe6c1dd8a7ad8dc529b53349ad431cf1116c9
2015-06-24 14:11:00 -04:00
e7e949f08a
Backed out changeset bc305c9b5d05 (bug 1155153) for b2g xpshell test failure on a CLOSED TREE
2015-06-05 13:07:51 +02:00
42cd5b397c
Bug 1155153 - about:serviceworkers should work in e10s mode, r=nsm, r=bholley
2015-06-04 19:51:57 +01:00
b2eb29a9c5
Use widgets for APZ checks, rather than gfxPrefs. (bug 1162064, r=kats,mstange)
2015-06-04 16:51:10 -04:00
75c4bebb79
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00
f50b813989
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-03 15:22:28 -07:00
326b2476af
Bug 1170534 - Remove Visual Event Tracer. r=dougt
2015-06-02 11:44:00 -04:00
ecb8f8af70
Merge mozilla-central to mozilla-inbound
2015-06-03 13:54:38 +02:00
a293db6727
Bug 1170671 - ProfileTimelineMarkers that use TRACING_TIMESTAMP should capture stack information. r=smaug
2015-06-02 16:16:32 -07:00
a71e717b67
Bug 1162088 - patch 1 - ServiceWorkerManager should use OriginAttributes from the principal as scopeKey, r=nsm, r=bholley
2015-06-03 09:43:43 +01:00
4e9f80ed2e
Backed out 14 changesets (bug 1165515) for b2g mochitest-6 permafail CLOSED TREE
...
Backed out changeset 9b97e2aa2ed9 (bug 1165515)
Backed out changeset 150606c022a2 (bug 1165515)
Backed out changeset 4e875a488349 (bug 1165515)
Backed out changeset 467e7feeb546 (bug 1165515)
Backed out changeset d6b6cc373197 (bug 1165515)
Backed out changeset 0615265b593c (bug 1165515)
Backed out changeset fafd1dce9f08 (bug 1165515)
Backed out changeset d1df869245f9 (bug 1165515)
Backed out changeset 6876a7c63611 (bug 1165515)
Backed out changeset b7841c94a9a3 (bug 1165515)
Backed out changeset e5e3617f7c73 (bug 1165515)
Backed out changeset 39be3db95978 (bug 1165515)
Backed out changeset 0ec74176f8de (bug 1165515)
Backed out changeset 5b928dd10d71 (bug 1165515)
2015-06-01 17:57:58 -07:00
f82c0e7caf
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 14:31:01 -07:00
dc090e3fe5
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 14:31:00 -07:00
568c39b3ce
Bug 1157619 P1 Network requests should not be intercepted when force-refreshed. r=smaug
2015-06-01 10:53:18 -04:00
12dee809d5
Bug 1107883 - support ipv6 URLs in the awesomebar with unified autocomplete enabled. r=mak, r=smaug
2015-05-28 17:21:58 +10:00
8a14d23ca5
Bug 1050500 - add fields to ProfileTimelineStackFrame; r=smaug
2015-05-26 10:52:52 -07:00
8556f54b04
Merge m-c to fx-team. a=merge
2015-05-22 14:21:30 -04:00
13be65d0c5
Bug 1050500 - Add callee information to Javascript timeline markers. r=smaug
...
--HG--
extra : rebase_source : dbd9e09496ca7c0e4f9798adf1f8f72749537d1a
2015-05-20 05:28:00 -04:00
3925a960aa
Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj
2015-05-21 13:22:04 -07:00
5471309381
Backed out 14 changesets (bug 1165515) for linux x64 e10s m2 test failures
...
Backed out changeset d68dcf2ef372 (bug 1165515)
Backed out changeset 7c3b45a47811 (bug 1165515)
Backed out changeset b668b617bef2 (bug 1165515)
Backed out changeset d0916e1283a2 (bug 1165515)
Backed out changeset ac4dc7489942 (bug 1165515)
Backed out changeset e9632ce8bc65 (bug 1165515)
Backed out changeset c16d215cc7e4 (bug 1165515)
Backed out changeset e4d474f3c51a (bug 1165515)
Backed out changeset d87680bf9f7c (bug 1165515)
Backed out changeset b3c0a45ba99e (bug 1165515)
Backed out changeset 9370fa197674 (bug 1165515)
Backed out changeset 50970d668ca1 (bug 1165515)
Backed out changeset ffa4eb6d24b9 (bug 1165515)
Backed out changeset 5fcf1203cc1d (bug 1165515)
--HG--
extra : rebase_source : 6fb850d063cbabe738f97f0380302153e3eae97a
2015-06-02 13:05:56 +02:00
a9afd68cef
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-01 22:17:33 -07:00
141e0ff4a2
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 22:17:19 -07:00
4879ae86f4
Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj
2015-05-19 11:15:34 -07:00
e1ee0d7597
Backed out changeset f0af05d88416 (bug 1162088) for various web-platform-test failures.
...
CLOSED TREE
2015-05-19 15:20:15 -04:00
1d31da42fd
Bug 1162088 - ServiceWorkerManager should use the principal+scope for the initialization of ServiceWorkers, r=nsm,ehsan
2015-05-19 17:53:36 +01:00
f7950798e0
Back out 530555a2d6d4 (bug 1162064) for debug b2g emulator assertions and failure to thrive
...
CLOSED TREE
2015-05-17 22:42:05 -07:00
4b20fa6b94
Use widgets for APZ checks, rather than gfxPrefs. (bug 1162064, r=kats,mstange)
2015-05-17 23:11:44 -04:00
cadd78802e
Backout changeset e5d045d49b40 for bustage on an a=CLOSED TREE
2015-05-17 21:46:30 -04:00
e57bdf9303
Bug 1164706 - Flatten docshell/shistory/src/ directory. r=smaug
...
--HG--
rename : docshell/shistory/src/nsSHEntry.cpp => docshell/shistory/nsSHEntry.cpp
rename : docshell/shistory/src/nsSHEntry.h => docshell/shistory/nsSHEntry.h
rename : docshell/shistory/src/nsSHEntryShared.cpp => docshell/shistory/nsSHEntryShared.cpp
rename : docshell/shistory/src/nsSHEntryShared.h => docshell/shistory/nsSHEntryShared.h
rename : docshell/shistory/src/nsSHTransaction.cpp => docshell/shistory/nsSHTransaction.cpp
rename : docshell/shistory/src/nsSHTransaction.h => docshell/shistory/nsSHTransaction.h
rename : docshell/shistory/src/nsSHistory.cpp => docshell/shistory/nsSHistory.cpp
rename : docshell/shistory/src/nsSHistory.h => docshell/shistory/nsSHistory.h
2015-05-15 15:25:39 -07:00
502eb5d3ca
Use widgets for APZ checks, rather than gfxPrefs. (bug 1162064, r=kats,mstange)
2015-05-17 20:44:43 -04:00
f994d03624
Bug 1017758 - Use infallible getters for appId/isInBrowserElement/unknownAppId; r=bz
2015-05-13 17:59:08 +02:00
Phil Ringnalda
Juan Gomez
Yury Delendik
Eric Rahm
Carsten "Tomcat" Book
Andrea Marchesini
Ryan VanderMeulen
Nihanth Subramanya
Nikhil Marathe
Mike Conley
Fernando Jimenez
Nick Fitzgerald
Kartikaya Gupta
David Anderson
Honza Bambas
Jordan Santell
Wes Kocher
Ben Kelly
Mark Hammond
Tom Tromey
Birunthan Mohanathas
Ms2ger