Commit Graph

1277 Commits

Author SHA1 Message Date
L. David Baron
05d656bf0a Bug 404077: Adjust annotations of expected assertions. 2013-02-28 12:44:57 -08:00
Ms2ger
c6832bb745 Merge m-i to b-s. 2013-02-28 14:46:10 +01:00
Henri Sivonen
d09f84d087 Bug 840476 - Add telemetry probe for character encoding override situation. r=smaug. 2013-02-28 10:44:57 +02:00
L. David Baron
1e95975352 Bug 404077: Adjust annotations of expected assertions. 2013-02-27 23:41:31 -08:00
Gregory Szorc
27c42e83c6 Merge mozilla-central into build-system
The 3 merged files had no conflicts and were manually verified to ensure
no incompatible changes crept in.
2013-02-27 21:02:02 -08:00
Gregory Szorc
803629b9c6 Merge mozilla-central into build-system
There were merges in configure.in and some Makefile.in. None had any
conflicts. I spot verified the Makefile.in changes and confirmed that
the changes did not touch any DIRS* variables.
2013-02-27 10:03:52 -08:00
L. David Baron
75dd27cb1a Bug 404077: Adjust annotations of expected assertions. 2013-02-27 20:14:02 -08:00
Ms2ger
2801c25ab8 Merge m-c to b-s. 2013-02-26 19:09:25 +01:00
Gregory Szorc
d3bd7b2819 Bug 784841 - Part 18h: Convert /docshell; r=glandium f=Ms2ger 2013-02-25 12:47:19 -08:00
Trevor Saunders
cf419a365c bug 842078 - fix iteration of mChildrenList r=smaug 2013-02-20 16:33:44 -05:00
L. David Baron
ff34707a75 Bug 404077: Adjust annotations of expected assertions. 2013-02-27 10:37:19 -08:00
L. David Baron
9fd9672955 Bug 404077: Adjust annotations of expected assertions. CLOSED TREE 2013-02-27 18:12:17 -08:00
L. David Baron
05d5d9dfa9 Bug 404077: Use navigator.platform.startsWith rather than navigator.platform.indexOf, at Jesse's suggestion. 2013-02-26 22:23:08 -08:00
Daniel Holbert
9c0afcd72e Bug 845429: Cast a known-nonnegative index to be unsigned for comparison vs. nsTArray::Length(), in nsDocShell::GetChildAt. r=tbsaunde 2013-02-26 14:09:55 -08:00
Bobby Holley
784a476fb8 Bug 834732 - Remove PushBehavior. r=mrbkap
Now that we only have ALWAYS_PUSH and ASSERT_SCRIPT_CONTEXT, we have uniform
release-mode behavior everywhere. Remove the crap.
2013-02-26 11:04:11 -08:00
Bobby Holley
cfbc405fc8 Bug 834732 - Make nsDocShell::AddState push the JSContext if it grabs one, and remove push in nsStructuredCloneContainer. r=mrbkap
This gets rid of one of the last consumers of REQUIRE_SCRIPT_CONTEXT.
2013-02-26 11:04:10 -08:00
L. David Baron
4f4296979b Bug 404077: Annotate known assertions in mochitests. 2013-02-25 18:39:21 -08:00
Trevor Saunders
3e6a6deadc bug 841430 - nuke nsIEditorDocShell r=bz 2013-02-13 17:39:30 -05:00
Trevor Saunders
c57f5ec28b bug 841434 - use a TArray for nsDocLoader::mChildList r=bz 2013-02-13 01:23:14 -05:00
Trevor Saunders
169a18c6bc bug 841436 - make nsIDocShell inherit from nsIDocShellTreeItem r=bz 2013-02-11 20:31:43 -05:00
Gregory Szorc
ddad85b037 Bug 840177 - Part 5: Add observer notification for keyword searches; r=gavin
The intent is for this to be captured by Firefox Health Report.
2013-02-14 14:47:47 -08:00
Ryan VanderMeulen
0e981ca346 Backed out 12 changesets (bug 834732) for b2g bustage and OSX mochitest-1 crashes on a CLOSED TREE. 2013-02-12 20:54:48 -05:00
Bobby Holley
5a1f2c3927 Bug 834732 - Remove PushBehavior. r=mrbkap
Now that we only have ALWAYS_PUSH and ASSERT_SCRIPT_CONTEXT, we have uniform
release-mode behavior everywhere. Remove the crap.
2013-02-13 00:22:26 +01:00
Bobby Holley
ff5850f236 Bug 834732 - Make nsDocShell::AddState push the JSContext if it grabs one, and remove push in nsStructuredCloneContainer. r=mrbkap
This gets rid of one of the last consumers of REQUIRE_SCRIPT_CONTEXT.
2013-02-13 00:22:26 +01:00
Matthew Noorenberghe
7615bc2eb0 Bug 587780 - Part 3 - Switch consumers from using a special content-type to the purpose argument. r=rnewman,gavin
--HG--
extra : rebase_source : 0803327b33f416fb0c679015495d376f6bce19a0
2012-04-04 02:50:39 -07:00
Tanvi Vyas
a013b7a360 Bug 837075 - Without a rootDoc, we don't have a rootUri to check if the root is https and we don't have the channel to see whether mixed content was allowed on the page. Set aRootHasSecureConnection to true by default instead of false by default. r=smaug 2013-02-06 18:29:20 -08:00
Marco Bonardo
d00a2f4554 Bug 826409 - Remove onBeforeDeleteURI and onBeforeItemRemoved notifications.
r=Mano sr=gavin
2013-02-06 20:48:56 +01:00
Daniel Holbert
8c26aedcce Bug 837956: Mark docshell/shistory/src/ as FAIL_ON_WARNINGS. r=smaug 2013-02-05 16:54:42 -08:00
Daniel Holbert
213e81ba0c Bug 837955: In builds without PR_LOGGING, define away the already-neutered logging macros in nsSHistory.cpp. r=smaug 2013-02-05 08:18:47 -08:00
Andres Hernandez
84d8471f54 Bug 739217 - Part 2: docshell replacement of synchronous isVisited with asynchronous isURIVisited. r=mak
--HG--
rename : docshell/test/bug94514-postpage.html => toolkit/components/places/tests/mochitest/bug94514-postpage.html
rename : docshell/test/test_bug94514.html => toolkit/components/places/tests/mochitest/test_bug_94514.html
2013-02-01 10:36:28 -06:00
Daniel Holbert
20ed38b814 Bug 837801: Remove unused-since-it-was-added-in-2005 variable 'rv' from nsSHistory::Reload. r=smaug 2013-02-05 00:39:24 -08:00
Kartikaya Gupta
beed5c982d Bug 827836 - Apply a hack to a test that fails intermittently. r=jmaher 2013-02-04 10:02:11 -05:00
Ryan VanderMeulen
2c5ff7e196 Backed out 7 changesets (bug 739217) for mochitest-1 orange on a CLOSED TREE.
--HG--
rename : toolkit/components/places/tests/mochitest/bug94514-postpage.html => docshell/test/bug94514-postpage.html
rename : toolkit/components/places/tests/mochitest/test_bug_94514.html => docshell/test/test_bug94514.html
2013-01-31 19:36:04 -05:00
Andres Hernandez
1e393c488c Bug 739217 - Part 2: docshell replacement of synchronous isVisited with asynchronous isURIVisited. r=mak
--HG--
rename : docshell/test/bug94514-postpage.html => toolkit/components/places/tests/mochitest/bug94514-postpage.html
rename : docshell/test/test_bug94514.html => toolkit/components/places/tests/mochitest/test_bug_94514.html
2013-01-17 14:52:44 -06:00
Tanvi Vyas
291a1c1eaf Bug 822367 - Add mixed display flags to the document. Add mixed display and mixed active states to nsIWebProgressListener and use them in nsMixedContentBlocker. r=smaug 2013-01-30 00:04:41 -08:00
Tanvi Vyas
1e6b543ee3 Bug 822367 - Since document.open() creates a new channel, set nsDocShell:mMixedContentChannel to the newly created channel if the user has decided to allow mixed content on the page. r=smaug 2013-01-30 00:04:34 -08:00
Tanvi Vyas
8e3da960cf Bug 822367 - Plumbing needed to show user Mixed Content Blocker Doorhanger when Mixed Active Content is Blocked and allow user an option to load the inseucre content anyway. r=smaug 2013-01-30 00:04:31 -08:00
Ehsan Akhgari
32d278987e Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Ehsan Akhgari
d068d66cf2 Bug 829383 follow-up: make the test only run in per-window private browsing builds 2013-01-24 18:53:14 -05:00
Ehsan Akhgari
b3849129ac Backed out changeset 70baa7e07838 (bug 833915) since one day has passed 2013-01-24 11:12:24 -05:00
Ehsan Akhgari
c30aff9acb Bug 833915 - Turn off PGO and LTCG on Windows Nightly for one day; r=glandium 2013-01-23 16:13:50 -05:00
Josh Matthews
226f5c2465 Bug 829383 - Ensure hidden private window docshells aren't counted towards private session lifetime. r=bz 2013-01-22 18:06:30 +00:00
Josh Matthews
c0e3542fc9 Backed out changeset cc665373ff61 (bug 829383). CLOSED TREEs don't bother me. 2013-01-21 16:22:38 +00:00
Josh Matthews
0b1ed8ae63 Bug 829383 - Ensure hidden private window docshells aren't counted towards private session lifetime. r=bz 2013-01-21 14:42:16 +00:00
Henri Sivonen
73572ee819 Bug 234628 part 4 - Test cases for character encoding override code. r=bzbarsky.
--HG--
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-1.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-10.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-11.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-2.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-3.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-4.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-5.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-6.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-7.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-8.js
rename : docshell/test/browser/browser_bug134911.js => docshell/test/browser/browser_bug234628-9.js
2013-01-18 16:27:03 +02:00
Henri Sivonen
10a04a0909 Bug 234628 part 2 - Make manual encoding overrides not apply to internal URL schemes or to docs declared as UTF-16 on the HTTP level; make docshells able to report when the encoding menu should be disabled. r=bzbarsky. 2013-01-18 16:27:03 +02:00
Frank Yan
076d88e6c1 No bug - Fix nsIURI typos in comments. r=me 2013-01-17 22:05:28 -08:00
Ehsan Akhgari
8ffeafeacf Merge mozilla-central into mozilla-inbound 2013-01-15 09:10:19 -05:00
Olli Pettay
18534b4fb8 Bug 825544: backout Bug 825544, Bug 825544, Bug 765192 and Bug 808035 to bring back the old .location=val behavior, r=bz 2013-01-15 13:46:35 +02:00
Mats Palmgren
d5826be6d7 Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan 2013-01-15 13:22:03 +01:00