Commit Graph

209401 Commits

Author SHA1 Message Date
Wes Kocher
a83d9abd99 Merge m-c to inbound a=merge CLOSED TREE 2014-10-09 17:08:37 -07:00
Wes Kocher
b352543e1a Merge fx-team to m-c a=merge CLOSED TREE 2014-10-09 16:46:51 -07:00
Wes Kocher
8adfeb52f3 Merge b2g-inbound to m-c a=merge CLOSED TREE 2014-10-09 16:37:20 -07:00
Wes Kocher
5b7ad066cb Backed out changeset cde9ebf247be (bug 1076314) so it doesn't ship in a Nightly on friday or over the weekend CLOSED TREE a=me 2014-10-09 16:24:35 -07:00
Timothy Nikkel
1bcfc0aa17 Bug 1076447. When building the display list for scrollbars and we have a display port just use the whole scrollbar rect as the dirty rect. r=mattwoodrow
When we have a display port the dirty rect for root scroll frames is going to be the display port already when it is passed in. The display port can contain a somewhat arbitrary area of the scroll frame, there is no reason is has to include the scrollbars, which are laid out at the desktop scrollport (and adjusted as necessary in the compositor).

As well as BuildDisplayListForChild, we need the dirty rect to be set for the creation of the nsDisplayWrapList or nsDisplayOwnLayer in AppendToTop.
2014-10-09 15:10:01 -05:00
Andrew McCreight
871a96850c Back out afecbcdbe6d5 (bug 1064706 part 2) for leaking windows with e10s. 2014-10-09 13:02:18 -07:00
Andrew McCreight
1bda485eec Back out 30e935a33442 (bug 1064706, part 3), because it probably depends on part 2.
This reverts commit 0b3cc3d4acee2cf3ad7f3e2f578e20a802633969.
2014-10-09 13:02:17 -07:00
Jeff Muizelaar
581b00842e Bug 1076020. Update to ANGLE 2182 + fixes.
This corresponds to ANGLE commit 9a2e6ac98a10907b1241bd5709597912e08f63fb

It vastly improves D3D11 performance on Intel GPUs by
avoiding write to multiple render targets when unneeded.
2014-10-09 15:08:59 -04:00
Ryan VanderMeulen
0178acffdb Backed out changeset 012853bd80b7 (bug 844457) for likely being the real cause of the mochitest-dt failures.
CLOSED TREE
2014-10-09 13:39:14 -04:00
Ryan VanderMeulen
2efd661f5b Backed out changeset 28f0136d5ea9 (bug 1080358) for mochitest-dt orange.
CLOSED TREE
2014-10-09 13:33:24 -04:00
Ryan VanderMeulen
3754733bed Backed out changeset 0f7fe4800ace (bug 1027631) for non-unified bustage.
CLOSED TREE
2014-10-09 13:16:32 -04:00
Ryan VanderMeulen
43f6827524 Backed out changeset 61b3f3d9bffe (bug 1079826) for jit-test failures.
--HG--
extra : rebase_source : e55e7c6fcf2f1f116175d33b0fe0f12f266b5f0d
2014-10-09 12:17:12 -04:00
Ryan VanderMeulen
ac521ef58b Backed out changesets 3ad7043d2116, 774f695d8c0a, c7d7762d5e27, and 87cd44cd57b7 (bug 1058397) for non-unified bustage. 2014-10-09 12:13:35 -04:00
B2G Bumper Bot
8dd8186ab5 Bumping manifests a=b2g-bump 2014-10-09 09:02:00 -07:00
B2G Bumper Bot
5abfb695b0 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ce7bf759bbf4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24639 from KevinGrandon/bug_1076454_browser_chrome_failing_test

Bug 1076454 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/browser_chrome_share_web_result_test.js | Browser Chrome - Share Web Result share web result via e-mail

========

https://hg.mozilla.org/integration/gaia-central/rev/a85c1578bc52
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1076454 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/browser_chrome_share_web_result_test.js | Browser Chrome - Share Web Result share web result via e-mail r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/9845c6c67982
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24970 from KevinGrandon/bug_1080344_keyboard_unit_test_sizing

Bug 1080344 - [Keyboard] Take into account bounding client rect to handle difference in test-runner resolutions

========

https://hg.mozilla.org/integration/gaia-central/rev/35c774f095d7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1080344 - [Keyboard] Take into account bounding client rect to handle difference in test-runner resolutions r=rudyl
2014-10-09 08:55:47 -07:00
Nick Alexander
f33a1a0d82 Bug 1080326 - Move Search Activity resources and stop building org.mozilla.search.R. r=rnewman
Since we no longer build the Search Activity stand-alone, we don't need
the complication of the extra search-only resources package.  Without
the stand-alone build and repository, the probability of search
resources being added to the Fennec resources (or being used in both
places) approaches 1, so lets protect against that.

--HG--
rename : mobile/android/search/res/color/facet_button_text_color.xml => mobile/android/base/resources/color/facet_button_text_color.xml
rename : mobile/android/search/res/drawable-hdpi/ic_action_settings.png => mobile/android/base/resources/drawable-hdpi/ic_action_settings.png
rename : mobile/android/search/res/drawable-hdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-hdpi/ic_widget_new_tab.png
rename : mobile/android/search/res/drawable-hdpi/ic_widget_search.png => mobile/android/base/resources/drawable-hdpi/ic_widget_search.png
rename : mobile/android/search/res/drawable-hdpi/network_error.png => mobile/android/base/resources/drawable-hdpi/network_error.png
rename : mobile/android/search/res/drawable-hdpi/search_clear.png => mobile/android/base/resources/drawable-hdpi/search_clear.png
rename : mobile/android/search/res/drawable-hdpi/search_fox.png => mobile/android/base/resources/drawable-hdpi/search_fox.png
rename : mobile/android/search/res/drawable-hdpi/search_history.png => mobile/android/base/resources/drawable-hdpi/search_history.png
rename : mobile/android/search/res/drawable-hdpi/search_icon_active.png => mobile/android/base/resources/drawable-hdpi/search_icon_active.png
rename : mobile/android/search/res/drawable-hdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-hdpi/search_icon_inactive.png
rename : mobile/android/search/res/drawable-hdpi/search_launcher.png => mobile/android/base/resources/drawable-hdpi/search_launcher.png
rename : mobile/android/search/res/drawable-hdpi/search_plus.png => mobile/android/base/resources/drawable-hdpi/search_plus.png
rename : mobile/android/search/res/drawable-hdpi/widget_bg.9.png => mobile/android/base/resources/drawable-hdpi/widget_bg.9.png
rename : mobile/android/search/res/drawable-mdpi/ic_action_settings.png => mobile/android/base/resources/drawable-mdpi/ic_action_settings.png
rename : mobile/android/search/res/drawable-mdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-mdpi/ic_widget_new_tab.png
rename : mobile/android/search/res/drawable-mdpi/ic_widget_search.png => mobile/android/base/resources/drawable-mdpi/ic_widget_search.png
rename : mobile/android/search/res/drawable-mdpi/network_error.png => mobile/android/base/resources/drawable-mdpi/network_error.png
rename : mobile/android/search/res/drawable-mdpi/search_clear.png => mobile/android/base/resources/drawable-mdpi/search_clear.png
rename : mobile/android/search/res/drawable-mdpi/search_fox.png => mobile/android/base/resources/drawable-mdpi/search_fox.png
rename : mobile/android/search/res/drawable-mdpi/search_history.png => mobile/android/base/resources/drawable-mdpi/search_history.png
rename : mobile/android/search/res/drawable-mdpi/search_icon_active.png => mobile/android/base/resources/drawable-mdpi/search_icon_active.png
rename : mobile/android/search/res/drawable-mdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-mdpi/search_icon_inactive.png
rename : mobile/android/search/res/drawable-mdpi/search_launcher.png => mobile/android/base/resources/drawable-mdpi/search_launcher.png
rename : mobile/android/search/res/drawable-mdpi/search_plus.png => mobile/android/base/resources/drawable-mdpi/search_plus.png
rename : mobile/android/search/res/drawable-mdpi/widget_bg.9.png => mobile/android/base/resources/drawable-mdpi/widget_bg.9.png
rename : mobile/android/search/res/drawable-xhdpi/ic_action_settings.png => mobile/android/base/resources/drawable-xhdpi/ic_action_settings.png
rename : mobile/android/search/res/drawable-xhdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-xhdpi/ic_widget_new_tab.png
rename : mobile/android/search/res/drawable-xhdpi/ic_widget_search.png => mobile/android/base/resources/drawable-xhdpi/ic_widget_search.png
rename : mobile/android/search/res/drawable-xhdpi/network_error.png => mobile/android/base/resources/drawable-xhdpi/network_error.png
rename : mobile/android/search/res/drawable-xhdpi/search_clear.png => mobile/android/base/resources/drawable-xhdpi/search_clear.png
rename : mobile/android/search/res/drawable-xhdpi/search_fox.png => mobile/android/base/resources/drawable-xhdpi/search_fox.png
rename : mobile/android/search/res/drawable-xhdpi/search_history.png => mobile/android/base/resources/drawable-xhdpi/search_history.png
rename : mobile/android/search/res/drawable-xhdpi/search_icon_active.png => mobile/android/base/resources/drawable-xhdpi/search_icon_active.png
rename : mobile/android/search/res/drawable-xhdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-xhdpi/search_icon_inactive.png
rename : mobile/android/search/res/drawable-xhdpi/search_launcher.png => mobile/android/base/resources/drawable-xhdpi/search_launcher.png
rename : mobile/android/search/res/drawable-xhdpi/search_plus.png => mobile/android/base/resources/drawable-xhdpi/search_plus.png
rename : mobile/android/search/res/drawable-xhdpi/widget_bg.9.png => mobile/android/base/resources/drawable-xhdpi/widget_bg.9.png
rename : mobile/android/search/res/drawable-xxhdpi/ic_action_settings.png => mobile/android/base/resources/drawable-xxhdpi/ic_action_settings.png
rename : mobile/android/search/res/drawable-xxhdpi/ic_widget_new_tab.png => mobile/android/base/resources/drawable-xxhdpi/ic_widget_new_tab.png
rename : mobile/android/search/res/drawable-xxhdpi/ic_widget_search.png => mobile/android/base/resources/drawable-xxhdpi/ic_widget_search.png
rename : mobile/android/search/res/drawable-xxhdpi/network_error.png => mobile/android/base/resources/drawable-xxhdpi/network_error.png
rename : mobile/android/search/res/drawable-xxhdpi/search_clear.png => mobile/android/base/resources/drawable-xxhdpi/search_clear.png
rename : mobile/android/search/res/drawable-xxhdpi/search_fox.png => mobile/android/base/resources/drawable-xxhdpi/search_fox.png
rename : mobile/android/search/res/drawable-xxhdpi/search_history.png => mobile/android/base/resources/drawable-xxhdpi/search_history.png
rename : mobile/android/search/res/drawable-xxhdpi/search_icon_active.png => mobile/android/base/resources/drawable-xxhdpi/search_icon_active.png
rename : mobile/android/search/res/drawable-xxhdpi/search_icon_inactive.png => mobile/android/base/resources/drawable-xxhdpi/search_icon_inactive.png
rename : mobile/android/search/res/drawable-xxhdpi/search_launcher.png => mobile/android/base/resources/drawable-xxhdpi/search_launcher.png
rename : mobile/android/search/res/drawable-xxhdpi/search_plus.png => mobile/android/base/resources/drawable-xxhdpi/search_plus.png
rename : mobile/android/search/res/drawable-xxxhdpi/search_launcher.png => mobile/android/base/resources/drawable-xxxhdpi/search_launcher.png
rename : mobile/android/search/res/drawable/edit_text_default.xml => mobile/android/base/resources/drawable/edit_text_default.xml
rename : mobile/android/search/res/drawable/edit_text_focused.xml => mobile/android/base/resources/drawable/edit_text_focused.xml
rename : mobile/android/search/res/drawable/facet_button_background.xml => mobile/android/base/resources/drawable/facet_button_background.xml
rename : mobile/android/search/res/drawable/facet_button_background_default.xml => mobile/android/base/resources/drawable/facet_button_background_default.xml
rename : mobile/android/search/res/drawable/facet_button_background_pressed.xml => mobile/android/base/resources/drawable/facet_button_background_pressed.xml
rename : mobile/android/search/res/drawable/progressbar.xml => mobile/android/base/resources/drawable/progressbar.xml
rename : mobile/android/search/res/drawable/search_row_background.xml => mobile/android/base/resources/drawable/search_row_background.xml
rename : mobile/android/search/res/drawable/widget_button_left.xml => mobile/android/base/resources/drawable/widget_button_left.xml
rename : mobile/android/search/res/drawable/widget_button_left_default.xml => mobile/android/base/resources/drawable/widget_button_left_default.xml
rename : mobile/android/search/res/drawable/widget_button_left_pressed.xml => mobile/android/base/resources/drawable/widget_button_left_pressed.xml
rename : mobile/android/search/res/drawable/widget_button_middle.xml => mobile/android/base/resources/drawable/widget_button_middle.xml
rename : mobile/android/search/res/drawable/widget_button_middle_pressed.xml => mobile/android/base/resources/drawable/widget_button_middle_pressed.xml
rename : mobile/android/search/res/drawable/widget_button_right.xml => mobile/android/base/resources/drawable/widget_button_right.xml
rename : mobile/android/search/res/drawable/widget_button_right_pressed.xml => mobile/android/base/resources/drawable/widget_button_right_pressed.xml
rename : mobile/android/search/res/layout/keyguard_widget.xml => mobile/android/base/resources/layout/keyguard_widget.xml
rename : mobile/android/search/res/layout/search_activity_main.xml => mobile/android/base/resources/layout/search_activity_main.xml
rename : mobile/android/search/res/layout/search_bar.xml => mobile/android/base/resources/layout/search_bar.xml
rename : mobile/android/search/res/layout/search_empty.xml => mobile/android/base/resources/layout/search_empty.xml
rename : mobile/android/search/res/layout/search_fragment_post_search.xml => mobile/android/base/resources/layout/search_fragment_post_search.xml
rename : mobile/android/search/res/layout/search_fragment_pre_search.xml => mobile/android/base/resources/layout/search_fragment_pre_search.xml
rename : mobile/android/search/res/layout/search_history_row.xml => mobile/android/base/resources/layout/search_history_row.xml
rename : mobile/android/search/res/layout/search_sugestions.xml => mobile/android/base/resources/layout/search_sugestions.xml
rename : mobile/android/search/res/layout/search_suggestions_row.xml => mobile/android/base/resources/layout/search_suggestions_row.xml
rename : mobile/android/search/res/layout/search_widget.xml => mobile/android/base/resources/layout/search_widget.xml
rename : mobile/android/search/res/values-v13/search_styles.xml => mobile/android/base/resources/values-v13/search_styles.xml
rename : mobile/android/search/res/values-v16/search_styles.xml => mobile/android/base/resources/values-v16/search_styles.xml
rename : mobile/android/search/res/values/search_attrs.xml => mobile/android/base/resources/values/search_attrs.xml
rename : mobile/android/search/res/values/search_colors.xml => mobile/android/base/resources/values/search_colors.xml
rename : mobile/android/search/res/values/search_dimens.xml => mobile/android/base/resources/values/search_dimens.xml
rename : mobile/android/search/res/values/search_styles.xml => mobile/android/base/resources/values/search_styles.xml
rename : mobile/android/search/res/xml/search_preferences.xml => mobile/android/base/resources/xml/search_preferences.xml
rename : mobile/android/search/res/xml/search_widget_info.xml => mobile/android/base/resources/xml/search_widget_info.xml
2014-10-08 21:07:41 -07:00
Jared Wein
fc1716c51f Backed out changeset 047060a5b1dc (bug 1078309) for failing browser_LoopContacts.js 2014-10-08 23:44:10 -04:00
Terrence Cole
cdef43f816 Bug 1074961 - Part 3: simplify refillFreeList by splitting on context type; r=sfink 2014-10-08 15:35:19 -07:00
Neil Deakin
d1b7452e4e Bug 1061147, embedding/content process tooltips shouldn't autohide, r=neil 2014-10-09 12:21:15 -04:00
Mike de Boer
8ffd08eccf Bug 1078309: use a different database for each Loop Fx Account. r=paolo 2014-10-08 17:40:38 +02:00
Jared Wein
8f2a1ecdf2 Bug 1047133 - Persist FxA OAuth token between browser sessions. r=MattN 2014-10-08 20:49:47 -04:00
Michael Comella
82c59eac3e Bug 1071267 - Part 3: Create large tappable margin for site security. 2014-10-08 17:48:32 -07:00
Michael Comella
ab6f3452b4 Bug 1071267 - Part 2: Always display site security icon on new tablet. 2014-10-08 17:48:29 -07:00
Michael Comella
239e255f7b Bug 1071267 - Part 1: Remove padding inside site security assets. 2014-10-08 17:48:21 -07:00
Mark Capella
1ba8bf5e48 Bug 1080016 - Display favicons properly after interrupted page loads, r=ckitching 2014-10-08 20:41:15 -04:00
Wes Kocher
fdacece326 Merge m-c to fx-team a=merge 2014-10-08 17:18:48 -07:00
Chenxia Liu
1d0f51f865 Bug 1059792 - Launching Firefox for the first time through an external intent should not display First Run experience. r=margaret 2014-10-08 17:10:03 -07:00
Nicolas Perriault
f096dd1ea2 Bug 1074672 Part 1 - Implement a room list view for Loop, r=mikedeboer. 2014-10-08 16:59:56 -07:00
Wes Kocher
eec55b928f Merge b2g-inbound to m-c a=merge 2014-10-08 16:49:26 -07:00
Wes Kocher
b2cbe8c0b3 Merge fx-team to m-c a=merge 2014-10-08 16:46:52 -07:00
Lucas Rocha
e2e48d74cc Bug 1079629 - Fix build error when new tablet UI is disabled. r=rnewman 2014-10-08 15:18:59 -07:00
Adam Roach [:abr]
9753aaf0bc Bug 1080094 - Google import fails if a contact contains an org but no title r=dmose 2014-10-08 18:30:45 -05:00
Randall Barker
eca0519451 Bug 1080012 - Fennec no longer able to mirror tabs on chromecast r=mfinkle on a CLOSED TREE 2014-10-08 15:50:29 -07:00
B2G Bumper Bot
cb4b7c8c30 Bumping manifests a=b2g-bump 2014-10-08 13:41:54 -07:00
B2G Bumper Bot
7662ebb0e0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9d8c254abad2
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #24888 from azasypkin/bug-1068618-activity-double-escaping

Bug 1068618 - [Loop] The shared link sms message is wrong. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/5c3f408f28a2
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1068618 - [Loop] The shared link sms message is wrong. r=julien
2014-10-08 13:35:47 -07:00
wesj
c9b8e98eae Bug 1074340 - Keep proguard from changing the access level of createGuestProfile. r=bustage CLOSED TREE 2014-10-08 13:30:38 -07:00
B2G Bumper Bot
1cd9f7d9ce Bumping manifests a=b2g-bump 2014-10-08 13:26:56 -07:00
B2G Bumper Bot
55c7c03b10 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c1c366c0da96
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24792 from KevinGrandon/bug_971469_system2_instantiable_battery_manager

Bug 971469 - [System2] Instantiable BatteryOverlay

========

https://hg.mozilla.org/integration/gaia-central/rev/85434981c8e2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 971469 - [System2] Instantiable BatteryManager r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f887803f5ebb
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #24910 from davidflanagan/bug1063658

Bug 1063658: workaround memory-backed blob bug 1079546 by ensuring that ... r=asuth,pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/dfece0f292c0
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1063658: workaround memory-backed blob bug 1079546 by ensuring that pick and share activities always use files
2014-10-08 13:20:49 -07:00
Eric Rahm
37b7afe002 Bug 806819 - Part 5: Update webrtc moz.build. r=jesup, r=gps 2014-10-08 13:19:55 -07:00
Eric Rahm
96050f224f Bug 806819 - Part 4: Add files that were excluded from unified builds back in. r=ehsan 2014-10-08 13:19:14 -07:00
Eric Rahm
f6bb65afb3 Bug 806819 - Part 3: Remove redundant FORCE_PR_LOG entries. r=ehsan 2014-10-08 13:17:32 -07:00
Eric Rahm
46ba903bec Bug 806819 - Part 2: Enable FORCE_PR_LOG globally. r=ted 2014-10-08 13:17:29 -07:00
Eric Rahm
e3149f012f Bug 806819 - Part 1: Remove FORCE_PR_LOG unified build restriction. r=gps 2014-10-08 13:17:27 -07:00
Chris AtLee
5589a69540 Bug 1075675: Fix configure options for oauth r=rail 2014-10-08 16:15:05 -04:00
Ryan VanderMeulen
c04a97ecc3 Backed out changeset 4205a47f317c (bug 1037235) for xpcshell orange.
CLOSED TREE
2014-10-08 15:45:56 -04:00
Andrew McCreight
d73e367136 Bug 1047483 - Fix Windows non-unified build bustage again.
CLOSED TREE a=RyanVM
2014-10-08 12:39:25 -07:00
David Keeler
2365116a20 backout 9815045d0c5a (bug 1058812 1/3) for mochitest orange on a CLOSED TREE 2014-10-08 12:10:46 -07:00
David Keeler
b0402cdef6 backout 9692998f547e (bug 1058812 2/3) for mochitest orange on a CLOSED TREE 2014-10-08 12:10:10 -07:00
David Keeler
18c65fce36 backout 0097b4ffaf33 (bug 1058812 3/3) for mochitest orange on a CLOSED TREE 2014-10-08 12:09:26 -07:00
Richard Newman
475aadc119 Bug 1074340 - Don't initialize guest profile more than once. r=wesj 2014-10-08 11:43:14 -07:00