Commit Graph

1523 Commits

Author SHA1 Message Date
Marina Samuel
56d578e815 Bug 715794 - Adjust syncResult delay to implement client-count-based sync interval. r=rnewman 2012-04-03 16:43:07 -07:00
Nick Alexander
ff3d49f7e3 Bug 738067 - Set TTLs on outbound records. r=rnewman 2012-04-03 16:43:07 -07:00
Marina Samuel
ed98da02da Bug 740247 - Follow up: HTTP 412 Error due to inconsistent server & local timestamps. r=rnewman 2012-04-03 16:43:07 -07:00
Chenxia Liu
fae99e1ddd Bug 738515 - Null credentials in setup. r=rnewman 2012-04-03 16:43:06 -07:00
Richard Newman
f647ced7ae Bug 741165 - Correct SyncResponse.jsonBody. r=msamuel 2012-04-03 16:43:06 -07:00
Sriram Ramasubramanian
b00c4a27e5 Bug 739747: Add application level onPause and onResume. [r=mfinkle, r=blassey] 2012-04-03 11:58:01 -07:00
Wes Johnston
de4e6fb482 Bug 739514 - Fix bad history entries created by default bookmarks creation. r=lucasr 2012-04-02 17:38:51 -07:00
Brian Nicholson
cc4c0212e6 Bug 741010 - Don't save favicon if loaded from DB. r=mfinkle 2012-04-02 17:36:13 -07:00
Margaret Leibovic
8663055d7b Bug 740118 - Door-hangers de-attach from directional arrow when scrolling through list. r=mfinkle 2012-04-02 12:16:28 -07:00
Kartikaya Gupta
b698486bcd Bug 737577 - Set the display port before bouncing rather than after. r=Cwiiis 2012-04-02 17:14:33 -04:00
Sriram Ramasubramanian
5ffc45764c Bug 721344: Unregister Connectivity Receiver in only if it has been initialized. [r=mfinkle] 2012-04-02 13:50:03 -07:00
Joe Drew
16e6932efe Bug 741166 - Add clarifying comment. DONTBUILD
--HG--
extra : rebase_source : 4d2e524732e6a02d99f3c2b68d4ac066399b61b3
2012-04-02 15:57:53 -04:00
Joe Drew
110c76a0cf Bug 741166 - Restore waitForValidSurface, removed in error in bug 737949. r=ajuma 2012-04-02 15:43:21 -04:00
Margaret Leibovic
3516f3f317 Bug 737896 - Put desktop bookmark folders under a "Desktop Bookmarks" folder. r=lucasr 2012-04-02 11:56:53 -07:00
Margaret Leibovic
00c241d2bd Bug 738961 - Awesomebar filter should treat space-separated words as separate filters. r=lucasr 2012-04-02 11:56:48 -07:00
Margaret Leibovic
b8d414d4d2 Bug 738961 - Add spaces to KNOWN_PREFIX in testBrowserProviderPerf. r=lucasr 2012-04-02 11:56:43 -07:00
Geoff Brown
487c80efc5 Bug 740146 - Remove unused screenshot code. r=blassey 2012-04-01 15:17:32 -04:00
Kartikaya Gupta
a97511483d Bug 740539 - Account for possible mismatch in zoom levels when handling Viewport:PageSize. r=Cwiiis 2012-04-01 14:30:35 -04:00
Kartikaya Gupta
db8c7af5aa Bug 730899 - Drop sending of scroll events where we don't actually scroll. r=Cwiiis 2012-04-01 02:42:35 -04:00
Jeff Muizelaar
4062986b9e Bug 740061. Remove unused skip functionality. r=kats
mSkipTextureUpdate is never set to true.
2012-03-31 13:36:42 -04:00
Jeff Muizelaar
26401e5f90 Bug 740061. Remove support for subuploads. r=kats
Since, the dirtyRect is either the size of the buffer
or empty we don't need to support subuploads anymore.
2012-03-31 13:30:11 -04:00
Jeff Muizelaar
b049831818 Bug 740061. Remove unused isDirty. r=kats 2012-03-31 13:05:05 -04:00
Jeff Muizelaar
3bbd39d3dd Bug 740061. Use set() instead of union(). r=kats
mBufferrRect is either new Rect(0, 0, bufferSize.width, bufferSize.height)
or Rect() so we can just set() instead of unioning. This is cheaper
and avoids an allocation.
2012-03-31 13:04:14 -04:00
Jeff Muizelaar
aaa63d8381 Bug 740061. Remove unused invalidate(rect). r=kats 2012-03-31 13:02:37 -04:00
Jeff Muizelaar
55780e3e28 Bug 740983. Remove unneeded invalidate from scrollbar layers. r=kats
We used to fade the scrollbars by reuploading textures
rather than using a shader. Since the textures don't change anymore
the invalidate is unneeded.
2012-03-30 17:22:59 -04:00
Ed Morley
c7a3740e33 Merge mozilla-central to mozilla-inbound 2012-03-31 15:28:55 +01:00
Mounir Lamouri
70c4e81387 Bug 740190 - Screen Orientation API: implement locking in Android. r=dougt 2012-03-29 23:31:12 -07:00
Wes Johnston
215770c942 Bug 735912 - Update tests for new behavior. r=mfinkle 2012-03-30 11:01:45 -07:00
Margaret Leibovic
85e3f86616 Bug 740306 - Back button does not dismiss the keyboard in awesomebar. r=mfinkle 2012-03-30 17:00:41 -07:00
Joe Drew
380cd4cd8b Bug 737949 - Don't initialize EGL from Fennec java code, and remove GLThread altogether. r=pcwalton,jrmuizel 2012-03-30 10:50:54 -07:00
Wes Johnston
b0c9244edd Bug 740291 - Add a missing brace in the makefile. r=blassey 2012-03-30 13:00:45 -07:00
Richard Newman
76007d5a55 Bug 740637 - Better handling of unexpected failures during info/collections fetch. r=liuche,nalexander 2012-03-29 16:48:55 -07:00
Chris Peterson
c0c958b5b5 Bug 739418 - When reporting a rethrown exception, report the original exception's stack trace. r=blassey
--HG--
extra : rebase_source : faff07d7900191e61fb2f287be9b3546809e8ec1
2012-03-28 17:51:02 -07:00
Richard Newman
93f6b368d3 Bug 740326 - Fix over-long log tag. all credit,r=nalexander 2012-03-29 12:14:17 -07:00
Margaret Leibovic
794caf9b0b Bug 736278 - (1/2) Add support for checkbox in doorhanger message. r=mfinkle 2012-03-27 14:36:20 -07:00
Richard Newman
f46299128c Merge m-c to m-i. 2012-03-28 20:48:37 -07:00
Richard Newman
56f981708b Bug 739519 - Part 2: logging. r=trivial 2012-03-28 17:25:24 -07:00
Marina Samuel
8ee74bb900 Bug 739519 - Part 1: quickfix. r=rnewman 2012-03-28 17:25:24 -07:00
Phil Ringnalda
ee201831b3 Back out 47afa45afdfb and ccb20a1169f1 (bug 697309) and c30bdfd14362 and 618b680315ee (bug 736278) for Android native Talos bustage 2012-03-28 00:09:25 -07:00
Richard Newman
6996ba5748 Remove forgotten stale file. NO BUG, r=trivial 2012-03-27 20:09:15 -07:00
Marina Samuel
95fbe9cf81 Bug 732147 - Send tab to device: receiving pushed tabs on Android. r=rnewman 2012-03-27 20:09:14 -07:00
Jeff Muizelaar
56b876fb67 Bug 738188. Avoid crashing by disabling the screenshot drawing code. r=kats
The crashes seem to be caused by SurfaceChange breaking any future
onDrawFrame calls. We don't seem to handle renewing the context at all. I added
mController.disposeGLContext(); mController.initGLContext(); to the
SizeChange::run() but that doesn't seem to fix it.

Bug 739867 will add this support back.

--HG--
extra : rebase_source : a4f71b22f381756c4285311cd3288b3ef46d5543
2012-03-27 21:43:56 -04:00
Nick Alexander
43bafca2f7 Bug 709310 - Implement Handling of 5xxs, X-Weave-Backoff, Retry-After. r=rnewman 2012-03-27 18:41:34 -07:00
Margaret Leibovic
76f8d24320 Bug 736278 - Add support for checkbox in doorhanger message. r=mfinkle 2012-03-27 13:02:13 -07:00
Jared Wein
63540b0cd1 Backed out changeset 6e5e46023094 (bug 736278) 2012-03-27 15:20:39 -07:00
Margaret Leibovic
4b37cde6fc Bug 736278 - (1/2) Add support for checkbox in doorhanger message. r=mfinkle 2012-03-27 14:36:20 -07:00
Sriram Ramasubramanian
6657f6f4d3 Bug 736296: Avoid managed query while loading top sites. [r=mfinkle] 2012-03-27 14:31:29 -07:00
Margaret Leibovic
9b985e0fb0 backout cecf156d7869 because of talos fail 2012-03-28 16:18:16 -07:00
Ali Juma
6535865665 Bug 735230 - Part 3: Use the new compositor pause/resume events. r=kats 2012-03-28 18:00:38 -04:00
Ali Juma
e7e968bb4b Bug 735230 - Part 2: Add compositor pause/resume events to Gecko. r=kats 2012-03-28 18:00:32 -04:00
Margaret Leibovic
0ebce7ac40 Bug 740094 - Folder icon doesn't appear anymore. r=lucasr 2012-03-28 14:14:30 -07:00
Margaret Leibovic
340ee63032 Bug 736278 - (1/2) Add support for checkbox in doorhanger message. r=mfinkle 2012-03-27 14:36:20 -07:00
Mounir Lamouri
97da158fc7 Bug 733142 - Attempt to fix crash in GeckoNetworkManager when onDestroy() is called. r=dougt 2012-03-28 13:29:41 -07:00
Brian Nicholson
62966f71fd Bug 726001 - Use BufferedHttpEntity for fetching favicons. r=mfinkle 2012-03-28 11:14:19 -07:00
Geoff Brown
0fcbfbb474 Bug 739807 - Robocop: avoid character encoding warning; r=jmaher 2012-03-28 11:53:59 -04:00
Lucas Rocha
a16855b653 Bug 739066 - Don't include delete bookmarks/history in Combined view (r=margaret) 2012-03-30 17:31:31 +01:00
Lucas Rocha
5725e7cae7 Bug 735636 - Factor out checked state update into separate method (r=wesj) 2012-03-30 17:31:31 +01:00
Lucas Rocha
342eddda08 Bug 735636 - Factor out icon update into separate method (r=wesj) 2012-03-30 17:31:31 +01:00
Lucas Rocha
3df01e56dd Bug 735636 - Correctly use recycled view and apply ViewHolder pattern (r=wesj) 2012-03-30 17:31:31 +01:00
Kartikaya Gupta
e9436816e4 Bug 740569 - Make the display port strategy preffable. r=Cwiiis 2012-03-30 09:57:39 -04:00
Kartikaya Gupta
9fdc703bd0 Bug 737553 - Refactor much of the code in DisplayPortCalculator and tune some of the behaviour. r=Cwiiis
Commonly reused pieces of code are pulled out into reusable functions in DisplayPortCalculator.
Reusing these functions makes the individual strategies' code much clearer and the similarities
between them more apparent. One actual bug was fixed, where the display port resolution was
incorrectly calculated in the DynamicResolutionStrategy. Prior to this change, it did not apply
the reshaping algorithm to the pre-velocity display port size, resulting in a different resolution
in some cases which would leave the content blurry. Additionally, the FixedMarginStrategy was
modified so that its margins are a multiple of the view size rather than constant pixel values.
2012-03-30 09:47:22 -04:00
Kartikaya Gupta
a337361ec8 Bug 737553 - Fix null handling in DisplayPortCalculator. r=Cwiiis 2012-03-30 09:46:27 -04:00
Kartikaya Gupta
697ab20157 Bug 739415 - Add a talos test that replays a sequence of captured MotionEvents to simulate user behaviour. r=jmaher 2012-03-27 16:16:14 -04:00
Kartikaya Gupta
d0da20efa2 Bug 739415 - Add ability to have raw files as test assets. r=jmaher 2012-03-27 16:16:13 -04:00
Brian Nicholson
56ce0e0c93 Bug 738859 - Increment mActivityDepth for all activities launched from GeckoApp. r=blassey
--HG--
extra : rebase_source : f336548259f18347e0592329c2e5e678abbc8c43
2012-03-27 12:25:26 -07:00
Richard Newman
647d01776d Bug 731024 - Part 5: Safer handling of deleted items. r=nalexander 2012-03-27 10:47:26 -07:00
Richard Newman
e9e87ba8ed Bug 731024 - Part 4: Handle additional types. Test for livemarks. r=nalexander 2012-03-27 10:47:26 -07:00
Richard Newman
fe13627f8a Bug 739515 - Defensive coding for Fennec history entries. r=emtwo,nalexander 2012-03-27 10:47:26 -07:00
Lucas Rocha
5601a2edc1 Bug 737867 - Share same LayoutInflater instance in AwesomeBarTabs (r=mfinkle) 2012-03-27 18:05:41 +01:00
Lucas Rocha
0e65aabc5d Bug 737867 - Apply ViewHolder pattern on AwesomeBar's History tab (r=mfinkle) 2012-03-27 18:05:41 +01:00
Lucas Rocha
1bd52abc32 Bug 737867 - Apply ViewHolder pattern in AwesomeBar's All/Bookmarks tabs (r=mfinkle) 2012-03-27 18:05:41 +01:00
Mark Finkle
2919615e28 Bug 738976 - java.lang.NullPointerException at org.mozilla.gecko.db.LocalBrowserDB.updateFaviconForUrl r=blassey 2012-03-27 08:47:14 -04:00
Chris Peterson
51ba3dd231 Bug 738695 - Part 2: Unify redundant IME mComposing and mCompositionStart variables. r=blassey 2012-03-23 10:32:42 -07:00
Chris Peterson
716ee54f9c Bug 738695 - Part 1: Remove Native Fennec's unused returnIMEQueryResult() (but not XUL Fennec's half). r=blassey 2012-03-23 14:00:19 -07:00
Chris Peterson
0a25879c97 Bug 720300 - Don't submit AwesomeBar text when there is an active composition string. r=blassey, m_kato 2012-03-22 17:37:32 -07:00
Margaret Leibovic
3331c4cf83 Bug 715274 - Fix testBookmark now that we remove the folder header instead of hide it. [r=wesj] 2012-03-26 16:38:52 -07:00
Brad Lassey
1f7f201cdc bug 728224 - Create default bookmarks on local DB creation, follow up to correct issue with relative objdirs r=mfinkle 2012-03-26 15:50:27 -04:00
Sriram Ramasubramanian
02e7a6df5a Bug 739334: Cleanup bookmarks' AsyncTasks. [r=mfinkle, r=margaret] 2012-03-26 14:43:35 -07:00
Sriram Ramasubramanian
12a62aa657 Bug 715274: Fix lists in AwesomeScreen. [r=mfinkle, r=margaret] 2012-03-26 14:39:24 -07:00
Gian-Carlo Pascutto
78e06ad3e8 Bug 729532 - Rename changed strings so translators will pick them up. r=mfinkle 2012-03-26 19:36:40 +02:00
Wes Johnston
048e1df36f Bug 738890 - Disable testJarReader until we have a fix for it. r=mfinkle 2012-03-26 10:35:34 -07:00
Kartikaya Gupta
1aa4458a8a Bug 729528 - Delete some unneeded things. r=Cwiiis 2012-03-26 13:15:50 -04:00
Kartikaya Gupta
83e8404b16 Bug 729528 - Add an alternate strategy with a margin that is a multiple of view-size and shifts it with velocity bias. r=Cwiiis 2012-03-26 13:15:50 -04:00
Kartikaya Gupta
c7fb70b37d Bug 729528 - Add an alternate strategy where we have no display port, to better isolate problems in layout/draw code. r=Cwiiis 2012-03-26 13:15:50 -04:00
Kartikaya Gupta
9ec788a1a2 Bug 729528 - Add an alternate code path (selected at compile-time) to render low-res content while panning. r=Cwiiis 2012-03-26 13:15:50 -04:00
Kartikaya Gupta
53cd348221 Bug 729528 - Move displayport calculation and comparison code into a DisplayPortCalculator class. No functional changes intended. r=Cwiiis 2012-03-26 13:15:50 -04:00
Kartikaya Gupta
e01c4001a4 Bug 729528 - Add a DisplayPortMetrics to track the requested display resolution along with the area. r=Cwiiis 2012-03-26 13:15:49 -04:00
Gian-Carlo Pascutto
38b8afccb1 Bug 716729 - Consider deleted entries when looking whether to insert or update. r=lucasr 2012-03-26 19:06:51 +02:00
Wes Johnston
a3ca385595 Bug 739257 - Default bookmarks with no favicon should log a message, but no stack track. r=mfinkle 2012-03-26 09:52:35 -07:00
Gian-Carlo Pascutto
80cfd5115d Bug 729532 - New layout and text on "Setting up" screen. r=mfinkle 2012-03-26 17:40:54 +02:00
Wes Johnston
f3fd4ba412 Bug 728224 - Update tests to expect default bookmarks. r=mfinkle 2012-03-23 17:38:50 -07:00
Wes Johnston
6e81aefe9a Bug 728224 - Create deafult bookmarks in Fennec. r=mfinkle 2012-03-23 17:38:49 -07:00
Wes Johnston
dcae9e3a8c Bug 738421 - Close up ZipReader. r=cpeterson 2012-03-23 17:07:10 -07:00
Margaret Leibovic
34eacf370c Bug 721731 - Tests for new combined view. r=lucasr 2012-03-23 15:53:03 -07:00
Margaret Leibovic
479ee49724 Bug 721731 - Create combined bookmarks/history view for top sites/awesomebar queries. r=mfinkle 2012-03-23 15:52:42 -07:00
Margaret Leibovic
8406c5f571 Bug 721731 - Add bookmark entries to testBrowserProviderPerf. r=gbrown 2012-03-23 15:52:20 -07:00
Ehsan Akhgari
6711cf7582 Bug 734302 - Part 3: Add a menu item for toggling the profiler on mobile; r=BenWa,dougt
--HG--
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml => mobile/android/base/resources/menu-v11/gecko_menu.xml.in
rename : mobile/android/base/resources/menu/gecko_menu.xml => mobile/android/base/resources/menu/gecko_menu.xml.in
2012-03-16 14:08:03 -04:00
James Willcox
f768df4a29 Bug 725167 - Don't reposition Android plugin views that aren't in view hierarchy r=blassey 2012-03-23 16:19:15 -04:00
Sriram Ramasubramanian
35a4ec6ff7 Bug 738049: Using LayoutInflater.Factory improves performance. [r=mfinkle] 2012-03-23 12:00:17 -07:00
Ehsan Akhgari
62c70a9478 Backout changeset 11b6f37603ce (bug 734302) for Android bustage 2012-03-23 15:01:14 -04:00
Ehsan Akhgari
63b59609ed Bug 734302 - Part 3: Add a menu item for toggling the profiler on mobile; r=BenWa,dougt
--HG--
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml => mobile/android/base/resources/menu-v11/gecko_menu.xml.in
rename : mobile/android/base/resources/menu/gecko_menu.xml => mobile/android/base/resources/menu/gecko_menu.xml.in
2012-03-16 14:08:03 -04:00
Richard Newman
957fb3bce7 Bug 738516 - Auth cache should be set for all requests, not just authenticated requests. r=msamuel 2012-03-23 11:03:48 -07:00
Nick Alexander
bed5e12d59 Bug 709402 preparation. r=rnewman 2012-03-23 11:03:48 -07:00
Marina Samuel
42310ccae9 Bug 715792 - Process client record commands (but don't act on them). r=rnewman 2012-03-23 11:03:48 -07:00
Richard Newman
dfdeb24b2a Bug 731024 - Part 1: Unsupported record types causes Android Sync to reorder folders containing livemarks/queries/separators…. r=nalexander 2012-03-23 11:03:47 -07:00
Kartikaya Gupta
afd6aa338a Bug 738556 - Improve testCheck to use a variety of scroll amounts and more reliable dragging code. r=Cwiiis 2012-03-23 11:58:06 -04:00
Kartikaya Gupta
419b7f3cce Bug 738554 - Fix a couple of race conditions where we could start listening for events after they occur. r=mfinkle 2012-03-23 11:43:10 -04:00
Brian Nicholson
1166758395 Bug 725428 - Draw white background in LayerView until Gecko has painted. r=kats 2012-03-22 15:07:00 -07:00
Brian Nicholson
76f8802836 Bug 737782 - Add keyword as a default bookmark column. r=mfinkle
--HG--
extra : rebase_source : 92b52e5402926184221796e32ef1c75b6a36a384
2012-03-22 18:36:09 -07:00
Brian Nicholson
15931dd3db Backout 017f6dd98dc0 for robocop failures 2012-03-22 17:28:13 -07:00
Wes Johnston
9ccdd929f0 Bug 709250 - Disable jar reader for now. 2012-03-22 17:24:30 -07:00
Wes Johnston
145bff5dd2 Bug 738421 - Close zip when done reading. r=sriram 2012-03-22 15:11:39 -07:00
Brian Nicholson
acdfb24780 Bug 725428 - Draw white background in LayerView until Gecko has painted. r=kats 2012-03-22 15:07:00 -07:00
Brian Nicholson
d55a8af05c Bug 718240 - Use 30 second timeout for crash restore. r=mfinkle 2012-03-19 11:20:42 -07:00
Matt Brubeck
4aa468afdc Bug 736995 - Disable share command for resource: URIs [r=margaret] 2012-03-22 13:02:06 -07:00
Wes Johnston
62eea4b617 Bug 709250 - Tets for jar reader. r=lucasr 2012-03-22 11:12:08 -07:00
Wes Johnston
e031e53ce0 Bug 709250 - Add the ability to read nested jar files. r=mfinkle,lucasr 2012-03-22 11:11:49 -07:00
Kartikaya Gupta
ca9c9af74a Bug 737411 - Work around problems with RGB888/RGB555 conversions and dithering in the pixel tests. r=jmaher 2012-03-22 13:35:45 -04:00
Geoff Brown
da09399809 Bug 737411 - Robocop: update reflection references; r=kats 2012-03-22 13:35:19 -04:00
Brian Nicholson
3f043b1687 Backout f8b7d116a096 for Tp regression 2012-03-21 17:29:43 -07:00
Matt Brubeck
8fb1f2f223 Back out c61855cb4558 (bug 734302) because of build failure on Android
--HG--
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml.in => mobile/android/base/resources/menu-v11/gecko_menu.xml
rename : mobile/android/base/resources/menu/gecko_menu.xml.in => mobile/android/base/resources/menu/gecko_menu.xml
2012-03-21 16:26:38 -07:00
Sriram Ramasubramanian
56fb741130 Bug 737906: Restrict remote tabs to 5 on about:home. [r=mfinkle] 2012-03-21 16:06:12 -07:00
Sriram Ramasubramanian
57f15cf777 Bug 727438: Grey bar in background of BrowserToolbar. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable-hdpi/address_bar_texture.png => mobile/android/base/resources/drawable-hdpi/address_bar_texture_port.png
rename : mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture.png => mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land.png
rename : mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture.png => mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land.png
rename : mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture.png => mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture.png => mobile/android/base/resources/drawable-xhdpi-v11/address_bar_texture_port.png
rename : mobile/android/base/resources/drawable/address_bar_texture.png => mobile/android/base/resources/drawable/address_bar_texture_port.png
2012-03-21 16:04:18 -07:00
Ehsan Akhgari
12cffcd90e Bug 734302 - Part 3: Add a menu item for toggling the profiler on mobile; r=BenWa,dougt
--HG--
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml => mobile/android/base/resources/menu-v11/gecko_menu.xml.in
rename : mobile/android/base/resources/menu/gecko_menu.xml => mobile/android/base/resources/menu/gecko_menu.xml.in
extra : rebase_source : 9a4499ff99d661924e1eb09280925ad123ecd948
2012-03-16 14:08:03 -04:00
Margaret Leibovic
d3d41d0583 Bug 731654 - (3/3) Style HTML5 form validation popup. r=sriram 2012-03-21 14:08:04 -07:00
Margaret Leibovic
69c07a6f04 Bug 731654 - (2/3) Get rid of mLayout/mHeight/mWidth. r=sriram 2012-03-21 14:08:00 -07:00
Margaret Leibovic
e3cbbecee6 Bug 731654 - (1/3) Refactor positionAndShowPopup to use popupFoo instead of listFoo variable names. r=sriram 2012-03-21 14:07:57 -07:00
Brad Lassey
e421d43f5e bug 734624 - java.lang.RuntimeException: An error occured while executing doInBackground() at android.os.AsyncTask.done(AsyncTask.java) caused by: android.database.sqlite.SQLiteConstraintException: error code 19: constraint failed, catch potential exceptions r=mfinkle
--HG--
extra : rebase_source : e6a22be859e6e83bc23bd17f70eb701ad5a676e8
2012-03-16 12:21:04 -04:00
Josh Dhaliwal
5062750d82 Bug 735011 - geolocation - support enableHighAccuracy position option. r=dougt 2012-03-21 10:52:35 -07:00
Brian Nicholson
36b55e394a Bug 735469 - Fix IME composition events. r=cpeterson
--HG--
extra : rebase_source : 778dd5a7b9cda7796039fcf3614f507b253b4037
2012-03-21 10:26:53 -07:00
Doug Turner
a19169f8b6 Bug 734854 - Merge PROXIMITY_EVENT with SENSOR_EVENT. r=jdm 2012-03-20 23:36:17 -07:00
Doug Turner
e9b99834bc Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 23:36:17 -07:00
Margaret Leibovic
c88e4535ef Bug 737445 - java.lang.ClassCastException: java.lang.String at org.mozilla.gecko.FormAssistPopup$AutoCompleteListAdapter.populateSuggestionsList(FormAssistPopup.java). r=mfinkle 2012-03-20 10:52:19 -07:00
Chris Lord
49b9819ead Bug 736729 - Fix display-port on first paint and page-size changes. r=kats
Previously, we only set the display-port in response to a page scrolling itself,
or when we adjust the viewport. This meant that the display-port could be
incorrect if a viewport adjustment was sent after a page-size changed, but
before a render had completed.

Similarly, we were not updating the display-port when the viewport of a
foreground document that hadn't been displayed yet was changing. This would
cause the first-paint to have an incorrect (and often too small) display port,
which wouldn't be corrected until the page was scrolled.
2012-03-21 14:44:33 +00:00
Sriram Ramasubramanian
32a0f7bc5f Bug 727454: BrowserToolbar inflation crash in ActionBar. [r=mfinkle] 2012-03-20 17:23:06 -07:00
Matt Brubeck
bb974fd0d2 Back out bug 735330, bug 737462, bug 734854 because they broke XUL Fennec
--HG--
rename : hal/cocoa/smslib.h => dom/system/cocoa/smslib.h
rename : hal/cocoa/smslib.mm => dom/system/cocoa/smslib.mm
2012-03-20 16:59:24 -07:00
Doug Turner
236f7c01c8 No Bug - Build bustage due to merge of bug 734854. Resync GeckoEvent and AndroidJavaWrappers. r=mbrubeck
--HG--
extra : rebase_source : a50129a4a28d6c207c61ba04bbbc149e8d74f977
2012-03-20 15:26:19 -07:00
Doug Turner
26fc4300b4 Bug 734854 - Merge PROXIMITY_EVENT with SENSOR_EVENT. r=jdm 2012-03-20 14:51:06 -07:00
Doug Turner
cb66f15674 Bug 735330 - move device motion from dom/system to hal. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. cocoa bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. window/qt/linux bits. r=jdm
* * *
Bug 735330 - move device motion from dom/system to hal. move accuracy into sensor data.  support compassneedscalibration. r=jdm

--HG--
rename : dom/system/cocoa/smslib.h => hal/cocoa/smslib.h
rename : dom/system/cocoa/smslib.mm => hal/cocoa/smslib.mm
2012-03-20 14:46:14 -07:00
Kartikaya Gupta
a1603a2231 Bug 737630 - Remove duplicated code from beginDrawing. r=pcwalton 2012-03-20 16:55:28 -04:00
Richard Newman
7fedd1792d Bug 736352 - Aborting… doesn't. r=nalexander 2012-03-20 13:35:09 -07:00
Margaret Leibovic
91124c334c Bug 737203 - Intermittent testBookmark | testBookmark | bookmarks list has 2 children (the bookmark we added and the hidden header) - got 0, expected 2. r=gbrown 2012-03-20 10:53:51 -07:00
Richard Newman
2595310051 Bug 734316 - Part 5: fix some more checkstyle warnings. r=trivial 2012-03-20 10:17:23 -07:00
Richard Newman
0d311964f4 Bug 736972 - java.lang.OutOfMemoryError: at java.io.BufferedReader.<init>(BufferedReader.java). r=nalexander 2012-03-20 10:17:23 -07:00
Richard Newman
2bae0007d2 Bug 737265 - Correct creation of special folders. r=nalexander 2012-03-20 10:17:23 -07:00
Mounir Lamouri
d24535daa7 Bug 737392 - Start onResume() observers in a Runnable. r=dougt 2012-03-20 16:07:39 +01:00
Mounir Lamouri
71d5cfc5d5 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-20 14:09:45 +01:00
Lucas Rocha
5bc3cacd8f Bug 708149 - Replace folder column with type in bookmarks table (r=rnewman) 2012-03-20 11:44:32 +00:00
Lucas Rocha
2b845f9691 Bug 708149 - Allow bookmarks table migration to apply a custom migrator (r=rnewman) 2012-03-20 11:44:32 +00:00
Lucas Rocha
6d5127d459 Bug 708149 - Factor out method to migrate bookmarks table (r=rnewman) 2012-03-20 11:44:31 +00:00
Kartikaya Gupta
8476d96552 Bug 731603 - Save the display port and resolution in the VirtualLayer's mPosition and mResolution fields. r=Cwiiis 2012-03-20 00:07:42 -04:00
Kartikaya Gupta
3bdc8512b4 Bug 731603 - Propagate a layersUpdated flag to Java for robocop use. r=ajuma 2012-03-20 00:06:56 -04:00
Kartikaya Gupta
aa77819a92 Bug 731603 - Propagate the resolution of the painted content into syncViewportInfo as well. r=Cwiiis 2012-03-20 00:05:45 -04:00
Sriram Ramasubramanian
b7cb91c982 Bug 735741: Factor out UI in about:home [r=mfinkle]
--HG--
rename : mobile/android/base/resources/layout/abouthome_content.xml => mobile/android/base/resources/layout/abouthome_content.xml.in
2012-03-19 16:15:05 -07:00
Sriram Ramasubramanian
53f280d3c4 Bug 715928: Screenshots for about:home. [r=mfinkle] 2012-03-19 12:36:18 -07:00
Margaret Leibovic
bcb92a055b Bug 727449 - Update testBookmark to expect no folders when there are no desktop bookmarks. r=gbrown 2012-03-19 11:22:36 -07:00
Margaret Leibovic
357f2588fd Bug 727449 - Only show mobile bookmarks folder contents if there are no desktop bookmarks. r=lucasr 2012-03-19 11:22:33 -07:00
Brian Nicholson
3dcc146a2a Bug 718240 - Use 30 second timeout for crash restore. r=mfinkle 2012-03-19 11:20:42 -07:00
Sriram Ramasubramanian
511c1929e9 Bug 736455: Remote tabs with empty tile on about:home [r=mfinkle] 2012-03-19 10:56:38 -07:00
Sriram Ramasubramanian
9bb34121d5 Bug 734893: Faster DB accessing with priority for GeckoAsyncTask. [r=mfinkle, r=blassey] 2012-03-19 10:53:14 -07:00
Brad Lassey
380a975254 bug 734624 - java.lang.RuntimeException: An error occured while executing doInBackground() at android.os.AsyncTask.done(AsyncTask.java) caused by: android.database.sqlite.SQLiteConstraintException: error code 19: constraint failed, synchronize inserts to avoid race condition r=lucasr 2012-03-16 12:21:06 -04:00
Ali Juma
88035a4af3 Bug 737031 - Add EGL error code to error messages in GLController. r=bgirard 2012-03-19 13:35:13 -04:00
Mounir Lamouri
4a2d244963 Bug 734382 - Don't show the list of activities if there is only one. r=blassey 2012-03-14 19:35:47 +01:00
Mounir Lamouri
13fc1a1a8e Bug 730289 - Filepicker on Android should allow picking or capturing media instead of having a specific button for capture. r=dougt,wesj ui-r=madhava 2012-03-18 17:15:56 +01:00
Lucas Rocha
4a936c2598 Bug 730105 - Add Talos test for AwesomeBar frecency filter (r=gbrown) 2012-03-19 16:22:20 +00:00
Lucas Rocha
1d4b698996 Bug 730105 - Ensure test query arg on all ContentProvider operations (r=gbrown) 2012-03-19 16:22:19 +00:00
Lucas Rocha
a31245515b Bug 730105 - Fix content provider registration in ContentProviderTest (r=gbrown) 2012-03-19 16:22:19 +00:00
Geoff Brown
7ce0add331 Bug 735856 - fix intermittent test failure; r=jmaher 2012-03-19 11:09:42 -04:00
William Lachance
fcd96f3e0d Bug 736610 - Code to set checkerboard to flat color broken with Maple merge. r=pwalton 2012-03-18 13:26:54 -04:00
William Lachance
5b9d5bfc8e Bug 734003 - Using white as the base checkerboard color doesn't work. r=pwalton 2012-03-18 13:25:13 -04:00
Mark Finkle
2f256bcc57 Backout 7e28d1a2c648, 330b210f503d, 2421d39e0ab3, aa978ffa44bc, 38a71ae7e06d, b94319584a7a, 7e8278f5e814, 0b4e3c7608ab, 329c07609ca8, 0d61a0d8dba4, Due to Ts regression on Android 2012-03-17 21:51:39 -04:00
Phil Ringnalda
11c327453c Back out bf4b1d3c624e (bug 732069) on suspicion of causing increased failure to start the browser during tests 2012-03-17 12:32:44 -07:00
Mounir Lamouri
63f66981f0 Bug 734382 - Don't show the list of activities if there is only one. r=blassey 2012-03-14 19:35:47 +01:00
Mounir Lamouri
6849113efd Bug 730289 - Filepicker on Android should allow picking or capturing media instead of having a specific button for capture. r=dougt,wesj ui-r=madhava 2012-03-16 22:44:00 +01:00
Mounir Lamouri
a2418c5fd8 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-16 19:43:10 +01:00
Chris Lord
1c2dd7f8ef Bug 732756 - Fix overdrawing of checkerboard. r=kats
Fix overdrawing of the checkerboard layer by letting layers have a concept of
a display-port, and keeping the root layer's display port in track with
Gecko's.
2012-03-17 15:08:22 +00:00
Nick Alexander
44c5374559 Bug 736007 - avoid Server11RepositorySession NullPointerException. r=rnewman 2012-03-16 17:06:58 -07:00
Ryan VanderMeulen
3edabe2c6f Backout d5b66e64cf44 (bug 732756) to see if it fixes Android crashtests. 2012-03-16 17:17:22 -04:00
Margaret Leibovic
22a0b304f0 Bug 704977 - (Part 3) Update awesomeness calculation in profile migrator. r=gcp 2012-03-16 11:36:37 -07:00
Margaret Leibovic
b654fc10cc Bug 704977 - (Part 2) Awesomeness calculation should use nicer recency decay. r=lucasr 2012-03-16 11:36:34 -07:00
Margaret Leibovic
1a1607b788 Bug 704977 - (Part 1) Clean up filterAllSites to make it more readable. r=lucasr 2012-03-16 11:36:31 -07:00
Richard Newman
28c94725b6 Bug 736391 - Don't store places record. r=nalexander 2012-03-16 09:44:30 -07:00
Chris Lord
ff0265ea28 Bug 732756 - Fix overdrawing of checkerboard. r=kats
Fix overdrawing of the checkerboard layer by letting layers have a concept of
a display-port, and keeping the root layer's display port in track with
Gecko's.
2012-03-16 16:30:23 +00:00
Mark Finkle
cac646ad20 Bug 735838 - About Home content displays briefly when opening an external link r=blassey 2012-03-16 12:29:37 -04:00
Chris Peterson
e1a183884b Bug 731034 - Clamp current selection before processing key down events to avoid IndexOutOfBoundsException. r=blassey 2012-03-12 17:08:04 -07:00
Richard Newman
fac1749d77 Bug 735996 - HTTP layer improvements. r=nalexander 2012-03-15 16:19:29 -07:00
Marina Samuel
cda5278a43 Bug 734469 - Clients stage table missing during sync. r=rnewman 2012-03-15 16:19:28 -07:00
Sriram Ramasubramanian
36a7d66f66 Bug 711753: Crash reporter inside ScrollView. [r=mfinkle] 2012-03-15 15:36:22 -07:00
Brian Nicholson
38aa68aa3d Bug 732818 - Use tab URL as AwesomeBar URL. r=mfinkle 2012-03-15 14:05:25 -07:00
Jonathan Kew
d9ecb49f84 backout 51839400b331 (bug 711753) for Android build bustage. 2012-03-15 20:12:46 +00:00
Ali Juma
65f4af1f4a Bug 736205 - Make GLController.disposeGLContext actually destroy the context. r=bgirard 2012-03-15 15:58:32 -04:00
Ali Juma
766c4e4874 Bug 736099 - Prevent a null pointer dereference in GLController.disposeGLContext. r=kats 2012-03-15 15:57:54 -04:00
Sriram Ramasubramanian
7287364cbb Bug 715292: URL bar should have straight edges on the sides. [r=mfinkle] 2012-03-15 12:31:01 -07:00
Sriram Ramasubramanian
3ad721a9a9 Bug 711753: Crash reporter inside ScrollView. [r=mfinkle] 2012-03-15 12:28:35 -07:00
Sriram Ramasubramanian
41f4eed5ff Bug 734880: Bottom center area in tabs-tray should consume clicks. [r=mfinke] 2012-03-15 12:24:39 -07:00
Kartikaya Gupta
12d8c44ba1 Bug 736125 - Fix Java 7 compile warnings. r=sriram 2012-03-15 15:01:52 -04:00
Margaret Leibovic
a388760421 Bug 732104 - (Part 3) Style header row. r=mfinkle 2012-03-15 10:01:11 -07:00
Margaret Leibovic
43046d3aeb Bug 732104 - (Part 2) Remove the ability to tap a folder heading to go back. r=mfinkle 2012-03-15 10:01:11 -07:00
Margaret Leibovic
208543b7af Bug 732104 - (Part 1) Make sure BACK always takes you up a folder level. r=mfinkle 2012-03-15 10:01:11 -07:00
Margaret Leibovic
9e65c93ef7 Bug 731267 - Ignore "All Bookmarks" folder and its badly rooted parent. r=lucasr 2012-03-15 10:01:11 -07:00
Kartikaya Gupta
49b5aadf76 Bug 735612 - Remove unneeded call to notifyLayerClientOfGeometryChange. r=Cwiiis 2012-03-15 10:43:32 -04:00
Kartikaya Gupta
67cc872ecd Bug 735612 - Add missing synchronization around viewport manipulation. r=Cwiiis 2012-03-15 10:40:55 -04:00
Kartikaya Gupta
7a119cd250 Bug 729646 - Allow Java to update the display port on background tabs as well, so that we draw the right thing upon switching to it. r=Cwiiis 2012-03-15 10:38:43 -04:00
Kartikaya Gupta
08ef4dfac6 Bug 729646 - Remove some annoying logging. r=Cwiiis 2012-03-15 10:38:43 -04:00
Lucas Rocha
dd5260b15b Bug 734177 - Add ContentProvider test infrastructure (r=gbrown) 2012-03-14 18:50:00 +00:00
Lucas Rocha
ad46981dbb Bug 734177 - Make BrowserProvider's getDatabasePath() public (r=gpascutto) 2012-03-14 18:49:59 +00:00
Lucas Rocha
2de8c5a1bd Bug 734177 - Add PARAM_IS_TEST to BrowserProvider (r=gpascutto) 2012-03-14 18:49:59 +00:00
Lucas Rocha
63300a7e6a Bug 734177 - Only include profile is set when cleaning up records (r=gpascutto) 2012-03-14 18:49:59 +00:00
Lucas Rocha
ad5d883bfe Bug 734177 - Enable foreign keys support in sqlite (r=gpascutto) 2012-03-14 18:49:59 +00:00
Marina Samuel
b61cb251be Bug 729248 - Smarter upload of our clients record. r=rnewman 2012-03-15 01:25:14 -07:00
Ryan VanderMeulen
79ffaf5278 Backout 11a5cc8bb70a (bug 723251) due to bustage. 2012-03-14 18:48:22 -04:00
Chris Peterson
ffe4591ee7 Bug 733196 - Do not use the fullscreen keyboard on Native Fennec (in portrait or landscape orientations). r=blassey 2012-03-13 14:22:54 -07:00
Chris Peterson
df5d97e323 Bug 726393 - Fetch Android's cached TextKeyListener on key down/up events to avoid nulls. r=blassey, f=gbrown 2012-03-12 16:02:06 -07:00
Josh Dhaliwal
d4cb260f05 Bug 723251 - onSaveInstanceState() never saves screenshots to instance state bundle. r=bnicholson 2012-03-14 18:00:29 -04:00
James Willcox
32043e7f81 Bug 728369 - Fix non-OpenGL plugin positioning on Android r=blassey 2012-03-14 15:43:49 -04:00
Ehsan Akhgari
9475dfbd3e Merge mozilla-central into mozilla-inbound 2012-03-14 13:40:34 -04:00
Kartikaya Gupta
4e638d7d12 Bug 725095 - Merge off-main-thread compositor from Maple. IGNORE BAD COMMIT MESSAGES 2012-03-14 11:18:15 -04:00
Lucas Rocha
3888f943e7 Bug 735660 - Bump database version to enable more performant views (r=rfinkle) 2012-03-14 15:12:43 +00:00
Lucas Rocha
51eeb0abae Bug 735660 - Commit DB transaction used by migrations (r=mfinkle) 2012-03-14 15:12:42 +00:00
James Willcox
a0db3488b7 Bug 728371 - Make Flash work with GLES 2.0 and GL layers r=pcwalton
--HG--
extra : rebase_source : 4b845e7dc4224bfd807fb757e7199c91655c0d69
2012-03-12 13:03:54 -04:00
Kartikaya Gupta
6184d9e2af Back out 89833e1b3016 (bug 707571) as it is broken with the new maple rewrite. r=backout 2012-03-13 17:11:28 -04:00
Kartikaya Gupta
bc6777aae5 Bug 725095 - Various fixes to get maple ready to land on m-c. r=Cwiiis
- Disable fps layer.
- Add some comments to FlexibleGLSurfaceView.
- Get rid of getBufferSize and some other related cleanup.
- Add some comments to compositor-invoked functions in GeckoLayerClient.
- Take out unnecessary parameters to Rect constructor.
- Move class variable initialization to constructor.
- Take out kUsingGLLayers.
- Add a comment about changes in background color.
- Fix up convertViewPointToLayerPoint to be more correct.
- Add note in setPositionAndResolution about how it might be wrong.
- Modify provideEGLSurface to not store the surface in mEGLSurface.
- Remove some unneeded, commented out code in GLThread.
2012-03-12 16:20:19 -04:00
Kartikaya Gupta
77b962c05b Bug 735248 - Add a BOUNCE state to track bounce animations, and disable redraws while we are in a bounce. r=Cwiiis 2012-03-13 12:14:28 -04:00
Kartikaya Gupta
e7c9424a66 Bug 735180 - Remove max(0,..) clamps when calculating display port margins; negative margins are needed during overscroll. r=Cwiiis 2012-03-13 12:14:25 -04:00
Benoit Girard
32745d1cc3 Merge mc->Maple 2012-03-13 11:05:28 -04:00
Nick Alexander
015d227d94 Bug 734521 - ensure response entities are always consumed. r=rnewman 2012-03-12 19:17:56 -07:00
Nick Alexander
086d49b6b3 Bug 709329 - 401 node reassignment. r=rnewman 2012-03-12 19:17:56 -07:00
Brian Nicholson
3d2fc859cd Bug 725213 - Add search engines from text input fields. r=mfinkle 2012-03-12 19:16:27 -07:00
Ehsan Akhgari
5097691ede Backout changeset d2340d74fc19 because of bug 735076 2012-03-12 18:51:44 -04:00
Chris Lord
54f1c2a4e3 Bug 732756 - Fix layers with a mask appearing squashed. r=pcwalton
If a mask was set on a layer, each sub-rectangle would end up drawing with the
full texture extents.
2012-03-12 18:49:01 +00:00
Kartikaya Gupta
9e2a5dc311 Bug 733896 - Together with 580381e2805c, this completely backs out b520f34d78f1 and 4f5bd60be09e. r=ehsan 2012-03-12 14:42:37 -04:00
James Willcox
02313468a0 Bug 728371 - Make Flash work with GLES 2.0 and GL layers r=pcwalton
--HG--
extra : rebase_source : f7a9eb9dab84cb35ba17fb1551051dae2e744d00
2012-03-12 13:03:54 -04:00
Kartikaya Gupta
c2b8ddeddc Bug 732564 - Align the rotation/resize codepath with The Grand Viewport Plan of 2012. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
537956a054 Bug 732564 - Make sure to update the display port when we get a viewport update. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
b7e427003c Bug 732564 - Move the display port trimming to Java so that we always have a copy of the display port being used. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
c86ed3f64b Bug 732564 - Back out part of e48d0ef50574 (bug 728614) as we need to clamp the viewport when animations are aborted. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
afb3444228 Bug 732564 - Take out java-side draw suppression on rotation as it often prevents redrawing completely; we can put this back later if needed. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
51962130f6 Bug 732564 - Modify the Viewport:Update event to take a viewport and synchronously update Java with it. r=Cwiiis 2012-03-12 12:03:38 -04:00
Kartikaya Gupta
e7a3a7af3e Bug 732564 - Merge the UpdateAndDraw and UpdateLater events into a single Update event since they do the same thing now. r=Cwiiis 2012-03-12 12:03:37 -04:00
Kartikaya Gupta
041332fc6d Bug 732564 - Remove JS-driven redraw; gecko should be invalidating whenever we need it to, and we're not suppressing anything now. r=Cwiiis 2012-03-12 12:03:37 -04:00
Kartikaya Gupta
7015851d36 Bug 732091 - Part 4: Add JNI-exposed functions on GeckoLayerClient to allow the compositor to update various properties. r=Cwiiis 2012-03-12 11:50:21 -04:00
Kartikaya Gupta
38e9efe1fc Merge m-c -> maple to pick up b159cd73c215 2012-03-10 11:21:26 -05:00
Benoit Girard
c8515d0999 Merge mc->maple 2012-03-09 18:16:26 -05:00
Benoit Girard
fb79343e79 Merge mc->Maple 2012-03-09 11:13:30 -05:00
Benoit Girard
1b3be902c1 Merge mc->Maple 2012-03-08 10:22:42 -05:00
Marina Samuel
8a833d0163 Bug 733965 - Cursor not closed in ClientsDatabaseAccessor. r=rnewman 2012-03-07 18:01:33 -08:00
Brian Nicholson
e060639a26 Bug 732268 - Don't perform intent actions when launching from recent apps. r=blassey 2012-03-07 17:59:27 -08:00
Brian Nicholson
c307fddcfb Backout 7a86dc056fe5 for test failures 2012-03-07 16:53:55 -08:00
Benoit Girard
6f2d963b78 Merge heads 2012-03-07 11:11:20 -05:00
Benoit Girard
0f0612ce47 Merge mc->Maple 2012-03-07 11:10:45 -05:00