Commit Graph

135975 Commits

Author SHA1 Message Date
Gregory Szorc
fad7743b3f Bug 885572 - Fix upgrade_mercurial() in bootstrapper; r=khuey
DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 3aa99eb3b3d2d273e4882779bb527ac96f757ef6
2013-06-24 10:23:14 -07:00
Nick Alexander
0aec49720d Merge m-c to s-c 2013-06-24 10:19:38 -07:00
Nick Alexander
5dea3e088b Bug 873569 - Follow-up: don't delete assets/omni.ja during unpack. r=me
The issue is that in INNER_UNMAKE_PACKAGE I was deleting
assets/omni.ja, which is needed in INNER_MAKE_PACKAGE.  This breaks
language repacks.  This fix should at least allow repacks to proceed
further.
2013-06-24 09:55:21 -07:00
Richard Newman
384b86cf52 Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial 2013-06-24 08:40:35 -07:00
Benjamin Smedberg
c45f618df8 Bug 880735 part S followup review comment - put the plugin doorhanger styles into shared/ 2013-06-24 10:40:26 -04:00
Benjamin Smedberg
a8d5039490 Bug 880735 part D followup: flod pointed out that I changed these strings without changing the key, and since changing the key is hard I'm just going to revert them for now and do something better in a followup. 2013-06-24 10:16:30 -04:00
Benjamin Smedberg
4d2e11188a Bug 880735 part S - Basic styling so that this can land - add classes to the binding for styling hooks and fix space handling. Make the buttons fill the space, limit the doorhanger size, and add whitespace/separators for the multi-plugin UI, r=jaws 2013-06-24 08:51:08 -04:00
Benjamin Smedberg
d0ea1dfb67 Bug 880735 test fixups:
* Add a test-only setter to the center-item XBL binding
* add a head.js function to remove plugin permissions for use in cleanup functions
* browser_pluginnotification.js - lots of fixes for the core feature tests
* Alter test_bug751809 not to assume that clicking the page overlay will directly activate the plugin
* Alter browser_CTP_plugins.js because disabled plugins now do show up in the plugin doorhanger
* remove browser_CTPScriptPlugin.js and supporting files because we no longer auto-pop based on scripting
* fix browser_CTP_drag_drop.js so that active plugins still show the doorhanger icon, and other fixup
* fix browser_bug743421.js to expect the doorhanger all the time and activate it correctly
* fix browser_bug752516.js to check for doorhanger activation instead of plugin activation
* remove browser_bug818009.js and supporting files because they are testing something that no longer exists
* alter browser_bug820497.js so that it shows the popup notification before checking .centerActions, since we populate that data lazily now
* browser_plugins_added_dynamically.js: remove the "activate all" tests which are no longer relevant and fix the rest to match the new doorhanger structure.
2013-06-24 08:51:07 -04:00
Benjamin Smedberg
45a6cc401e Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
5e06298e31 Bug 880735 part D - New doorhanger frontend code. Removes all logic which shows the plugin doorhanger automatically, including on scripting. Always show the doorhanger when there is a plugin present on the page, even if that plugin is currently enabled. Make the "always" choices clear to the user. r=jaws 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
71c97abfa3 Bug 880735 part E - Use the new permissionmanager.updateExpireTime method to make sure that plugin permissions are renewed properly, r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
02de42afbc Bug 883420 - Add an API to set a new expireTime for an existing permission, r=ehsan sr=mounir 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
d2813956df Bug 880735 part C - Disabled plugins should be always disabled, site-specific permissions do not override them. I'm sorry for the churn from bug 875454. At least the logic is in one place and easy to fix! r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
84e3611c1a Bug 880735 part B - add .getPluginTagForType and make .getBlocklistStateForType scriptable, r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
35c0784726 Bug 880735 part A - Add a .defaultFallbackType to plugins so that we can avoid re-implementing the ShouldPlay logic in the frontend code. r=johns 2013-06-24 08:51:07 -04:00
Ed Morley
01c97440e9 Merge latest green birch changeset and mozilla-central 2013-06-24 13:36:45 +01:00
Gaia Pushbot
2ca38da36d Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d816bb323b9c
Author: crh0716 <crh0716@gmail.com>
Desc: Revert "Bug 872976 - Delay the timing of restoring connection to decrease the failure rate"

This reverts commit 9db0247970e19fb0d57e3eed4fa5bbbfd79f1ebe.

========

https://hg.mozilla.org/integration/gaia-central/rev/0f1e25090cbb
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10501 from crdlc/bug-884728

Bug 884728 - [Facebook] Linking feature is broken deleting all local inf...

========

https://hg.mozilla.org/integration/gaia-central/rev/b150f7f1e531
Author: crdlc <crdlc@tid.es>
Desc: Bug 884728 - [Facebook] Linking feature is broken deleting all local information for a contact
2013-06-24 03:25:22 -07:00
Gaia Pushbot
13e5d8af81 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/aa565b81260a
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10397 from ednapiranha/bug883148

Bug 883148 - Refactor to a constant; fixed typo

========

https://hg.mozilla.org/integration/gaia-central/rev/23c63ce291cd
Author: Jen Fong-Adwent <jen@ednapiranha.com>
Desc: Bug 883148 - Refactor to a constant; fixed typo
2013-06-24 02:45:25 -07:00
Robert Longson
fd050c27d1 Bug 601131 - Hang with feTurbulence with huge numOctaves. r=roc 2013-06-24 10:42:22 +01:00
Gaia Pushbot
9f757674fc Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/20e2e86553d5
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10400 from pivanov/bug-829023

Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/9b4b4948696f
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch
2013-06-24 01:35:23 -07:00
David Zbarsky
e438b2ce3d Bug 788549 Part 14: Add a test for async opacity animations r=dbaron 2013-06-24 01:09:40 -07:00
Gaia Pushbot
c69904465d Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/bc36d7553ee6
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10435 from dominickuo/bug-880571

Bug 880571 - [video] handle error codes for video element. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/9eb8fb8941b2
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 880571 - [video] handle error codes for video element
2013-06-24 01:05:24 -07:00
Phil Ringnalda
496a4e4861 Back out 9661a68f0bff (bug 872605) for browser-chrome failures 2013-06-23 23:41:33 -07:00
Richard Newman
3822daf1e5 Bug 886155 - GeckoSubdocumentScrollHelper logspew. r=kats 2013-06-23 23:39:14 -07:00
Matt Woodrow
c68c9da465 Bug 871150 - Call IdentifyTextureHost on ImageBridgeChild so that we create appropriate textures for the compositor. r=nical 2013-06-24 17:28:22 +12:00
Matt Woodrow
48aa80f20f Bug 885573 - Stop forcing layers acceleration when we have OMTC enabled. r=nrc 2013-06-24 17:27:29 +12:00
Matt Woodrow
51f9152466 Bug 885634 - Mark test as failing on OSX. r=roc 2013-06-24 17:27:03 +12:00
Justin Wood
ce065ee7e3 Bug 886209 - SHT_ARM_EXIDX not defined on older glibc versions. r=glandium
(fixes SeaMonkey building on CentOS5.x)
2013-06-24 01:00:39 -04:00
Ethan Hugg
cfb015452b Bug 884071 Signaling - stop setting video prefs when in SDP mode r=jesup 2013-06-22 19:59:25 -07:00
Brian Hackett
0627a32e04 Bug 883154 - Add runtime wide cache for compiled lazy scripts, r=billm. 2013-06-23 20:37:42 -06:00
Shane Caraveo
58421fa282 bug 872605 add ability to update provider manifest, r=markh 2013-06-23 16:02:07 -04:00
Ehsan Akhgari
c574bc3e98 Bug 579517 follow-up: Remove NSPR types that crept in 2013-06-23 20:58:53 -04:00
Guillaume Abadie
47c2d77d27 Bug 882890 - Add fake vertex attribute 0 disabling to the getVertexAttrib function to improve WebGL compatibility with driver limitations. r=bjacob 2013-06-23 20:40:12 -04:00
Ehsan Akhgari
9c3393692c Remove two unused variables in nsNSSCertificateDB.cpp, no bug 2013-06-23 20:24:03 -04:00
Ehsan Akhgari
749ee17f18 Merge mozilla-central into mozilla-inbound 2013-06-23 20:18:09 -04:00
Ehsan Akhgari
08ed61c0f0 Bug 885583 - Enable Web Audio unconditionally across mochitests; r=roc 2013-06-23 19:23:02 -04:00
Ehsan Akhgari
cbebfc17c9 Bug 886165 - Hide the alternate names in the spec behind prefs which are turned off by default; r=roc
This patch uses one pref per interface, to allow us finer grain control over
which ones we might need to turn on in the future.
2013-06-23 19:22:10 -04:00
Phil Ringnalda
fcf0bd180b Merge m-i to m-c 2013-06-23 15:10:04 -07:00
Nick Fitzgerald
9a78048baa Bug 885597 - absolute urls not working with sourcesContent and source maps in file:// urls; r=dcamp 2013-06-23 09:44:29 -07:00
Victor Porof
1dfc9dd271 Merge fx-team to m-c 2013-06-23 19:00:17 +03:00
Till Schneidereit
cff530b60e Bug 886094 - Make js::BooleanGetPrimitiveValueSlow assert isProxy instead of the narrower isCrossCompartmentWrapper. rs=Ms2ger 2013-06-23 15:05:26 +02:00
Ms2ger
313ff55fd6 Merge m-c to m-i. 2013-06-23 13:44:01 +02:00
Ms2ger
5a63e5bff8 Bug 882848 - Use MOCHITEST_BROWSER_FILES more; r=gps 2013-06-23 09:16:19 +02:00
Ms2ger
bfc2c786bb Bug 766546 - Undisable test on non-mac platforms; r=edmorley 2013-06-23 09:16:10 +02:00
Ms2ger
72a5c4868f No bug - Don't spam lists of files during the build in toolkit/mozapps/extensions/test makefiles; r=ted 2013-06-23 09:16:06 +02:00
Ms2ger
0b036f4010 Bug 884951 - Use XPCWrappedNative::Get more; r=bholley 2013-06-23 09:15:55 +02:00
Ms2ger
bdde992174 Bug 884268 - Part c: Stop including nsWrapperCache.h in nsContentUtils.h; r=smaug 2013-06-23 09:15:49 +02:00
Ms2ger
ff63d2149b Bug 884268 - Part b: Move nsContentUtils::PreserveWrapper to nsWrapperCache; r=smaug 2013-06-23 09:15:42 +02:00
Ms2ger
84041fd5c0 Bug 884268 - Part a: Move nsContentUtils::CheckCCWrapperTraversal to nsWrapperCache; r=smaug 2013-06-23 09:15:10 +02:00
Ms2ger
c64ea32d96 Bug 882616 - Fix build warnings in docshell/base; r=bz 2013-06-23 09:15:05 +02:00