fe684609e72a21a24d4ddc66d3fda7ea8a5d168f: Merge inbound and m-c.
Ryan VanderMeulen <ryanvm@gmail.com> - Mon, 24 Jun 2013 14:00:41 -0400 - rev 143374
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Merge inbound and m-c.
8a9410b02e6e31d8eedcaa82279e6fbfac055aa4: Merge mozilla-central and inbound
Ed Morley <emorley@mozilla.com> - Mon, 24 Jun 2013 13:41:39 +0100 - rev 143373
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Merge mozilla-central and inbound
08c202fef05914597a34500ae2cf03cbaf924560: Bug 829841 - Add an option to enable eager compilation in the browser. r=dvander
Nicolas B. Pierron <nicolas.b.pierron@mozilla.com> - Mon, 24 Jun 2013 05:10:55 -0700 - rev 143372
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 829841 - Add an option to enable eager compilation in the browser. r=dvander
d53ba2cc53370cebabb8d87bda8d894454212476: Bug 865901 - make nsSVGTextFrame2::mPositioningDirty and mPositioningUsesPercentages SVG frame state bits. r=cam
Robert Longson <longsonr@gmail.com> - Mon, 24 Jun 2013 12:20:38 +0100 - rev 143371
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 865901 - make nsSVGTextFrame2::mPositioningDirty and mPositioningUsesPercentages SVG frame state bits. r=cam
19c05a3d7d3cc7a4395435b579d359af37a440be: Bug 885855 - [Build bustage] gfx\2d\RadialGradientEffectD2D1.h(9) : fatal error C1083: Cannot open include file: 'd2d1_1.h': No such file or directory. r=gps, f=InvisibleSmiley, f=Bas
Justin Wood <Callek@gmail.com> - Mon, 24 Jun 2013 13:29:09 -0400 - rev 143370
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 885855 - [Build bustage] gfx\2d\RadialGradientEffectD2D1.h(9) : fatal error C1083: Cannot open include file: 'd2d1_1.h': No such file or directory. r=gps, f=InvisibleSmiley, f=Bas
e872cb70e71943d67d03bce5bf8e494fc230c988: Bug 885572 - Fix upgrade_mercurial() in bootstrapper; r=khuey
Gregory Szorc <gps@mozilla.com> - Mon, 24 Jun 2013 10:23:14 -0700 - rev 143369
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 885572 - Fix upgrade_mercurial() in bootstrapper; r=khuey DONTBUILD (NPOTB)
25d1683000014cd8cf3b97b92c40aaa4b01624f8: Merge m-c to s-c
Nick Alexander <nalexander@mozilla.com> - Mon, 24 Jun 2013 10:19:38 -0700 - rev 143368
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Merge m-c to s-c
d4b39b7a0c5afd1c9716b0ea1f150421e8fd3667: Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial
Richard Newman <rnewman@mozilla.com> - Mon, 24 Jun 2013 08:40:35 -0700 - rev 143367
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial
82c439461ec54f971569ef1589f67c97f2e5b6e4: Bug 873569 - Follow-up: don't delete assets/omni.ja during unpack. r=me
Nick Alexander <nalexander@mozilla.com> - Mon, 24 Jun 2013 09:55:21 -0700 - rev 143366
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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.
1da2051be4574296df6a32ec186a46e8a062d1b7: Bug 880735 part S followup review comment - put the plugin doorhanger styles into shared/
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 10:40:26 -0400 - rev 143365
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 880735 part S followup review comment - put the plugin doorhanger styles into shared/
1bc0960d55fb25cac769170bac7c470539afe3fe: 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.
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 10:16:30 -0400 - rev 143364
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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.
50332b66c7a16858f074ee71218a497b06d814b2: 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
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:08 -0400 - rev 143363
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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
3da4f4ddc8334c0475b9603b22d44faf3a3f5225: Bug 880735 test fixups:
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143362
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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.
501a4ba3506a93225fba24655c3e5f2b95ea9d5e: Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143361
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws
d317e0e8afb78cba3435470bd72bbdfdc4843f7c: 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
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143360
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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
e32abcc03d444ffcfd521f0cf59ce370b2732c0f: Bug 880735 part E - Use the new permissionmanager.updateExpireTime method to make sure that plugin permissions are renewed properly, r=johns
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143359
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 880735 part E - Use the new permissionmanager.updateExpireTime method to make sure that plugin permissions are renewed properly, r=johns
7e3e7014456cc8ad8f6034cdb56acfcb45e04d60: Bug 883420 - Add an API to set a new expireTime for an existing permission, r=ehsan sr=mounir
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143358
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 883420 - Add an API to set a new expireTime for an existing permission, r=ehsan sr=mounir
fa7166cddea213ecb5e65e818a7473451f2f176e: 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
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143357
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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
4ae14fad4744ac95a4e11f5c23539ec24926ce97: Bug 880735 part B - add .getPluginTagForType and make .getBlocklistStateForType scriptable, r=johns
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143356
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
Bug 880735 part B - add .getPluginTagForType and make .getBlocklistStateForType scriptable, r=johns
051b257f38ca1c283059d66558763469709f8af7: 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
Benjamin Smedberg <benjamin@smedbergs.us> - Mon, 24 Jun 2013 08:51:07 -0400 - rev 143355
Push 3911 by akeybl@mozilla.com at Mon, 24 Jun 2013 20:17:26 +0000
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
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 tip