Commit Graph

549 Commits

Author SHA1 Message Date
Benoit Jacob
2bc4784d59 Bug 766251 - 4/5 - clean up GetGfxDriverInfo on Android - r=jrmuizel 2012-07-05 10:12:54 -04:00
Benoit Jacob
948c49313f Bug 766251 - 2/5 - reimplement GfxInfo on Android to use the data provided by the Java thread - r=jrmuizel 2012-07-05 10:12:33 -04:00
Benoit Jacob
de3d2ca49c Bug 766251 - 1/5 - GfxInfo on Android: the Java and AndroidBridge parts - r=kats,jrmuizel 2012-07-05 10:12:10 -04:00
Ehsan Akhgari
7b2a3505b7 Backout changeset ba7021170544 (bug 539356) because of performance and correctness regressions 2012-07-03 20:12:45 -04:00
Ehsan Akhgari
0597a14136 Backout changeset 6e8c5c011767 (bug 539356) because of performance and correctness regressions 2012-07-03 20:11:05 -04:00
Brad Lassey
2eadd89019 bug 770289 - JNIEnv->NewString can throw and needs to be caught before another JNI call, follow up to fix whitespace r=kats 2012-07-02 15:32:34 -04:00
Brad Lassey
a6753c6999 bug 770289 - JNIEnv->NewString can throw and needs to be caught before another JNI call r=kats 2012-07-02 15:12:50 -04:00
Brad Lassey
9e9c410591 bug 749917 - crash in mozilla::AndroidBridge::CheckURIVisited r=kats 2012-07-02 13:54:10 -04:00
Matt Woodrow
e980d568fc Bug 539356 - Part 24 - Don't paint android widgets that aren't being composited, or at the front. r=roc 2012-06-30 15:06:13 +12:00
Matt Woodrow
78b4c453c4 Bug 539356 - Part 22 - Force a background color when running android reftests. r=roc 2012-06-30 15:06:13 +12:00
Bonnie Surender
6dcaba353f Fixing bug 715041. Add support for Idle API. r=bent, jst 2012-06-29 01:32:21 -07:00
Kartikaya Gupta
8effaf0ad1 Bug 753665 - Ensure the mParent reference is nulled out when destroying a child window. r=blassey 2012-06-18 22:29:52 -04:00
Eitan Isaacson
1a7bf52bf4 Bug 763613 - Make hover events mousemove events. r=wesj 2012-06-15 15:34:22 -07:00
Brad Lassey
17abebe181 bug 755070 - Scrolling causes after paint notifications which causes screenshotting which causes checkerboarding r=kats,cjones 2012-06-14 09:08:51 -07:00
Marco Castelluccio
b5556afb6f Bug 703484 - Part 3: Fix android whitelist. r=ajuma 2012-06-13 15:54:02 -04:00
Kartikaya Gupta
7178944e03 Bug 753444 - Remove device-space page rect from setPageRect as it is not needed. r=jrmuizel 2012-06-13 13:49:40 -04:00
Ed Morley
7d13aab294 Backout 61fd66629c4f, 7c8121f8d3af & 2a2e9cf8fd41 (bug 539356), e31a5e6545d3 (bug 761884), 85fa80bd9792, a284ccb25b83, 2865904db9fc, 34e07b09c426, e9b3d41e0360, cef00ebcd6c8, f943b729ac14 & 783f298401b6 (bug 539356), 330a086f1570 (bug 741682), d80219c8842c (bug 739671), e8c96b4fd4da, 313af486e68d, 0adc41ff56dc, 0cd288a38085, f1d43208825c, 4859876972f3, eec8ef3ebe48, f7f29fcd1845, 6079b229d306, f23c3a7e7ce0, 9824458a41e2 & 6748b5496059 (bug 539356) for mochitest-4 orange & talos regressions on multiple platforms 2012-06-11 10:08:32 +01:00
Matt Woodrow
bedca2df54 Bug 539356 - Part 22 - Force a background color when running android reftests. r=roc 2012-06-11 16:45:39 +12:00
Eitan Isaacson
bd9e788491 Bug 755976 - Send empty text and selection when IME is disabled. r=cpeterson 2012-06-07 11:09:00 -07:00
James Willcox
af687b7aba Bug 759747 - Fix up fullscreen Flash handling on Android 4.0+ r=blassey 2012-06-06 22:39:36 -04:00
James Willcox
2f1fe9627e Bug 759799 - Hook up Hal WakeLocks on Android r=blassey 2012-06-06 22:39:01 -04:00
Benoit Girard
13541e24a7 Backout dd81ac5bb79d (Bug 703484) for regressing OMTC OGL on Mac. 2012-06-06 11:23:39 -04:00
Geoff Lankow
1214b72681 Bug 749930 - Replace uses of nsILocalFile with nsIFile (compiled code only); r=bsmedberg 2012-06-06 14:08:30 +12:00
Brad Lassey
78eae2f149 backout bug 755070 2012-06-04 20:15:37 -04:00
Brad Lassey
4efe3882f3 bug 755070 - Scrolling causes after paint notifications which causes screenshotting which causes checkerboarding, only update dirty rects, reuse a single bytebuffer and stop using java bitmaps r=kats 2012-06-04 11:56:31 -04:00
Brad Lassey
5a7ccf9bfd bug 755070 - Scrolling causes after paint notifications which causes screenshotting which causes checkerboarding, screenshot only on idle r=kats 2012-06-04 11:56:30 -04:00
Kartikaya Gupta
c97a446579 Bug 760458 - When taking thumbnail screenshots account for RTL pages as well. r=bnicholson 2012-06-01 23:50:57 -04:00
Matt Brubeck
1f99b61afd Back out bug 760342 for Windows build error, bug 755070 for Android crashes, and bug 760458 because it depends on 755070 2012-06-01 17:45:02 -07:00
Kartikaya Gupta
4b169bce37 Bug 760458 - When taking thumbnail screenshots account for RTL pages as well. r=bnicholson 2012-06-01 20:30:46 -04:00
Brad Lassey
7dea2d33ac bug 755070 - Scrolling causes after paint notifications which causes screenshotting which causes checkerboarding, only update dirty rects, reuse a single bytebuffer and stop using java bitmaps r=kats
--HG--
extra : rebase_source : 2a7c299c7133da06638d9ef1d27d4b4653072dce
2012-06-01 18:54:48 -04:00
Brad Lassey
903870d276 bug 755070 - Scrolling causes after paint notifications which causes screenshotting which causes checkerboarding, screenshot only on idle r=kats
--HG--
extra : rebase_source : be056e08b6a7d8aa339b12cbeb58d42054f5a118
2012-06-01 18:54:47 -04:00
Chris Peterson
621a31e62f Bug 756429 - Part 2: Assert sanity of composition string's state changes. r=blassey 2012-06-01 09:48:13 -07:00
Brad Lassey
a128356276 bug 759146 - Looper throws uncaught exception on (some?) HTC Sense 4.0 phones (HTC Evo 4G LTE, HTC J, etc), follow up to guard against changes to MessageQueue r=snorp a=johnath 2012-06-01 14:40:10 -04:00
Brad Lassey
57d721013b bug 759146 - follow up to fix bad merge 2012-05-31 23:24:07 -04:00
Brad Lassey
e2a1dbe98f bug 759146 - Looper throws uncaught exception on (some?) HTC Sense 4.0 phones (HTC Evo 4G LTE, HTC J, etc) r=snorp 2012-05-31 20:07:07 -04:00
Marco Castelluccio
5b892a2174 Bug 703484 - Part 3: Fix android OMTC whitelist. r=ajuma
--HG--
extra : rebase_source : e16788c85616fa92bfe724266b60435b446e9124
2012-05-30 14:56:56 -04:00
James Willcox
f881190c2a Bug 727421 - Implement full screen support for Flash on Android r=blassey 2012-05-30 12:10:49 -04:00
James Willcox
1a03a64625 Backout 814d564578d1 due to xul bustage 2012-05-30 11:58:50 -04:00
James Willcox
9709d39263 Bug 727421 - Implement full screen support for Flash on Android r=blassey 2012-05-30 10:29:16 -04:00
Kartikaya Gupta
104f576166 Bug 753665 - Fix incorrect comment and some formatting of debug output. r=blassey 2012-05-26 11:07:24 -04:00
Kartikaya Gupta
e8331e21d1 Bug 753665 - Add some missing kungFuDeathGrips while dispatching events. r=blassey 2012-05-26 11:06:55 -04:00
Kartikaya Gupta
c9b0d5825d Bug 753665 - Fix possible corruption in the window parent chain. r=blassey 2012-05-26 11:06:25 -04:00
James Willcox
e264b3b0fc Bug 747492 - Don't show vkb when plugin is focused on Android r=cpeterson 2012-05-24 11:03:07 -04:00
Kartikaya Gupta
0a9040618b Bug 748384 - Propagate page bounds and CSS page bounds in via compositor. r=Cwiiis,ajuma,mats 2012-05-23 10:51:39 -04:00
Kartikaya Gupta
47f98d820d Bug 748384 - Remove the DrawMetadataProvider which is not being used any more. r=Cwiiis 2012-05-23 10:49:44 -04:00
Kartikaya Gupta
04a457fab1 Bug 748384 - Back out 330e9c52f9ac, 9ba1078559fe, 2ed39c12d792, f53f05ecacd5 for build bustage. r=bustage 2012-05-23 11:08:19 -04:00
Kartikaya Gupta
9db13b7a79 Bug 748384 - Propagate page bounds and CSS page bounds in via compositor. r=Cwiiis,ajuma,mats 2012-05-23 10:51:39 -04:00
Kartikaya Gupta
9ae5a45d13 Bug 748384 - Remove the DrawMetadataProvider which is not being used any more. r=Cwiiis 2012-05-23 10:49:44 -04:00
Nicolas Silva
3dbfab5718 Bug 722012 - Added a call to XInitThreads before the first call to XOpenDisplay to fix OMTC crashes. r=karlt
--HG--
rename : toolkit/mozapps/update/test/chrome/test_0093_stagedBackground.xul => toolkit/mozapps/update/test/chrome/test_0092_finishedBackground.xul
rename : toolkit/mozapps/update/test/unit/test_0113_general.js => toolkit/mozapps/update/test/unit/test_0110_general.js
rename : toolkit/mozapps/update/test/unit/test_0114_general.js => toolkit/mozapps/update/test/unit/test_0111_general.js
rename : toolkit/mozapps/update/test/unit/test_0115_general.js => toolkit/mozapps/update/test/unit/test_0112_general.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0170_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test/unit/test_0171_fileLocked_xp_win_partial.js
extra : rebase_source : f527614c4a5f0b8979bd8bc39dcd3ca739ba9e08
2012-05-22 11:34:34 -04:00
Gervase Markham
87620f5676 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Chris Peterson
932c11ef0e Bug 748590 - Backout adea606b5694 to map KEYCODE_DPAD_CENTER to DOM_VK_RETURN. r=eeejay 2012-05-18 15:51:53 -07:00
Benjamin Smedberg
2187798a40 Bug 734847 part 2 - treewide changes resulting from the default-infallibility of hashtables; either remove useless result checks, or use the fallible version of APIs, depending on context, r=jlebar
--HG--
extra : rebase_source : 844b008c5167e6ca39a7ba9eeec8b30672938704
2012-05-18 13:30:49 -04:00
Vladimir Vukicevic
e6a02e4530 b=750272; protect against raised Java-side exception when getting EGL Surface; r=blassey 2012-05-18 08:59:01 -04:00
Fernando Jiménez
3c2fb23798 Bug 733320 - [WebSMS][B2G SMS] Add 'read' attribute to nsIDOMMozSmsMessage. Part 3 - Android Backend; r=mounir 2012-05-17 12:42:38 -07:00
Geoff Brown
7d170aa945 Bug 755324 - Avoid JNI leak in AndroidGLController::ProvideEGLSurface. r=kats 2012-05-15 18:30:15 -04:00
Brad Lassey
525e463364 Bug 751262 - Don't pop the JNI local ref frame if pushing it failed. r=kats 2012-05-08 20:21:36 -04:00
Doug Turner
508b5e26f9 Bug 752674 - device proximity needs y and z values. r=blassey 2012-05-08 20:56:54 -07:00
Jason Duell
07b4ed4ca6 Bug 750616 - Get rid of warnings in necko on android. r=blassey 2012-05-08 17:00:12 -07:00
Chris Jones
1f66b60c34 Bug 745145, part 4: Rename some things. r=mounir
--HG--
rename : hal/fallback/FallbackScreenOrientation.cpp => hal/fallback/FallbackScreenConfiguration.cpp
2012-05-08 14:36:07 -07:00
Chris Jones
234136e0ea Bug 745145, part 1: Generalize ScreenOrientation into ScreenConfiguration, and add screen rect and color+pixel depth to it. r=mounir 2012-05-08 14:36:07 -07:00
Kartikaya Gupta
788bcace55 Bug 752539 - Pass in the AutoLocalJNIFrame to some methods that implicitly require it. r=blassey 2012-05-08 09:35:59 -04:00
Brian Nicholson
e7048100c0 Bug 752426 - Add null checks for thumbnail screenshots. r=blassey 2012-05-07 16:53:01 -07:00
James Willcox
ef2091831a Bug 751609 - Give up on locking a Surface after 10 failures r=blassey 2012-05-07 14:18:30 -04:00
Brian Nicholson
5c02aa754a Bug 750846 - Move thumbnail size logic to Gecko. r=blassey 2012-05-03 16:29:59 -07:00
Kartikaya Gupta
06aee064be Bug 748531 - Guard against exceptions in JNI. r=blassey 2012-05-04 11:08:47 -04:00
Kartikaya Gupta
60a1f57e8b Bug 748531 - Propagate the JNIEnv through DrawWindow*lay helpers instead of unnecessarily re-calling GetJNIForThread everywhere. r=blassey 2012-05-04 11:08:46 -04:00
Kartikaya Gupta
fceca20aeb Bug 748531 - Fix indentation and minor cleanup in AndroidBridge.cpp. r=blassey 2012-05-04 11:08:45 -04:00
Doug Turner
9eaa2d7486 Bug 738465 - implement device light sensor. r=smaug 2012-05-02 09:43:45 -07:00
Brian Nicholson
567d90f367 Backout 7e237e96018f for black area in thumbnails. r=backout 2012-05-03 19:06:08 -07:00
Brian Nicholson
ef88af632e Bug 750846 - Move thumbnail size logic to Gecko. r=blassey
--HG--
extra : rebase_source : f8194c78ff0acc530db15a0aed6472475a0e0eed
2012-05-03 16:29:59 -07:00
James Willcox
85ae98e6a2 Bug 730890 - Install and run an Android Looper on Gecko main thread r=cjones 2012-05-03 10:53:31 -04:00
Ed Morley
2d35fc9b56 Merge mozilla-central to mozilla-inbound 2012-05-03 20:13:41 +01:00
Ali Juma
fa7767fbca Bug 748048 - Part 2: Don't restrict invalidation to the widget's boundaries on Android. r=roc 2012-05-03 12:34:02 -04:00
Benoit Jacob
84e349eedc Bug 736123 - kill GetVendor() and EGLUtils.h - r=jrmuizel
Was only returning "Android" instead of something useful.
2012-04-30 17:43:12 -04:00
Kartikaya Gupta
bfe02559b4 Bug 749788 - Fix some JNI code bugs. r=blassey 2012-04-28 12:55:59 -04:00
James Willcox
3d2040da6d Bug 749750 - Correctly ref created Surfaces on Android r=blassey 2012-04-27 16:10:03 -04:00
James Willcox
22ddeff430 Bug 727116 - Draw Flash plugins with OpenGL during pan/zoom on legacy Android r=blassey 2012-04-27 16:04:47 -04:00
Chris Lord
968ce32698 Bug 748718 - Make ScreenshotLayer use SingleTileLayer's draw function. r=kats
ScreenshotLayer overrides SingleTileLayer's draw function to simplify the
drawing process. Unfortunately, this doesn't respect the layer mask, and can
cause the layer to appear incorrectly stretched.

Change the screenshot process so that whole-page screenshots pass parameters
that are pre-scaled (to avoid mismatches when the viewport changes), and set
the page size on the ScreenShotLayer so it draws in the correct place.

This also alters the masking slightly to avoid visible seams around masks in
the centre of the page, and to avoid unnnecessary drawing at the edges of the
page.

This change fixes the frame-rate issues with the screenshot layer, as it
removes unnecessary over-draw.

--HG--
extra : rebase_source : 671c5a48d7bc08b3b452ed7eea228eb22843c1ce
2012-04-26 13:45:31 -04:00
Jeff Muizelaar
0816fa076e Bug 748832. Remove dead paint supression code. r=kats
Bug 732564 disabled the painting suppression code in browser.js. This removes
the caller and the interface.

--HG--
extra : rebase_source : 236f81abcf980c41ffdb6c29dc4290a6a7671d14
2012-04-25 12:49:43 -04:00
Eitan Isaacson
346ee076d0 Bug 748590 - Map KEYCODE_DPAD_CENTER to DOM_VK_ENTER. r=cpeterson 2012-04-25 17:09:12 -07:00
Masayuki Nakano
116dbd00b1 Bug 166240 part.5 Add support KeyboardEvent.location on Android r=cpeterson 2012-05-03 17:35:02 +09:00
Matt Brubeck
2702248b0c Bug 748473 - Back button is no longer mapped to escape key [r=cpeterson] 2012-04-24 20:47:46 -07:00
Masayuki Nakano
e089b336f8 Bug 630811 part.2 Replace nsInputEvent::isShift, nsInputEvent::isControl, nsInputEvent::isAlt and nsInputEvent::isMeta r=smaug 2012-04-25 12:00:02 +09:00
Brad Lassey
3222823138 Bug 747642 - Followup to fix xul android bustage 2012-04-24 23:53:57 +01:00
Brad Lassey
017428cde1 bug 747642 - cleanup AndroidJNI.cpp r=mwu 2012-04-21 11:41:03 -04:00
Brad Lassey
142a463d8e bug 746016 - Cache low res version of the page in the java ui for use instead of checkerboarding r=kats
--HG--
extra : rebase_source : d6de0327a46393cd4cfc327dea5689364744a71d
2012-04-24 15:13:36 -04:00
Kartikaya Gupta
1acb7a1d78 Bug 748189 - Call GetJNIForThread less often on a hot code path. r=blassey a=blassey 2012-04-23 21:06:41 -04:00
Kartikaya Gupta
0f88200e66 Bug 747759 - Insert missing break statement. r=blassey a=blassey 2012-04-23 21:05:23 -04:00
Joe Drew
7f29dc336a Bug 744916 - Make the Java viewport keep track of its size in both CSS pixels and device pixels. r=kats
--HG--
extra : rebase_source : f733c2a4eadaeaa9c845b83886af8ab335250f85
2012-04-12 16:00:56 -04:00
James Willcox
4e5222e0f7 Bug 707353 - Implement ANPWindow::showKeyboard() for Android plugins. r=snorp a=blocking-fennec
--HG--
extra : rebase_source : ca2da8fe9689fa702444cd6da7b4841d9ef12ec4
2012-04-20 09:49:50 -07:00
Ali Juma
c40c713688 Bug 733596 - Tell the compositor about the new surface size on surface change. r=bgirard a=blocking-fennec 2012-04-20 11:46:30 -04:00
Jeff Muizelaar
36817c47c9 Backout c048eb7cc728 for checkerboarding regresions
http://graphs.mozilla.org/graph.html#tests=[[175,63,20]]&sel=none&displayrange=7&datatype=running
http://graphs.mozilla.org/graph.html#tests=[[201,63,20]]&sel=none&displayrange=7&datatype=running
2012-04-20 00:50:07 -04:00
Chris Peterson
5c13ad58f8 Bug 742036 - Part 3: Pass Android's native keycodes to Flash plugin using nsGUIEvent::pluginEvent. r=masayuki,blassey a=blocking-fennec
--HG--
extra : rebase_source : c5cd6ba353970c1ba2f3315c55730957d1a306b9
2012-04-19 10:49:31 -07:00
Chris Peterson
e91824d463 Bug 742036 - Part 2: Add AndroidGeckoEvent::RepeatCount() for KeyEvents. r=masayuki,blassey a=blocking-fennec
--HG--
extra : rebase_source : 64059f8f6a31446d7ba0d23fe6e89cfc4716dd23
2012-04-19 13:55:33 -07:00
Chris Peterson
51967b09ef Bug 742036 - Part 1: Convert Android keycodes to DOM/NS_VK keycodes. r=masayuki a=blocking-fennec
--HG--
extra : rebase_source : 58b581eb97d82bea46f238213599b7bea2f6a78f
2012-04-19 13:34:03 -07:00
Jeff Muizelaar
6dd88cabce Bug 745315. Draw as soon as we get a Viewport:Changed r=kats a=joe
This should reduce some unpredictibility from our drawing
code and I don't see any negative concequences.
2012-04-17 20:23:35 -04:00
Ed Morley
e5e627a993 Backout 4e26b559d215, d74da7b4bf10 & d91d3787a3ef (bug 742036) for xul android failures; a=backout 2012-04-19 12:50:46 -07:00
Jeff Muizelaar
368f1d4fbe Bug 745864 - Add profiling labels relevant for Fennec event performance. r=bgirard a=blassey
--HG--
extra : rebase_source : e4ba8a8b6f4bdad1dcd6fe076e3262a6e07aeba2
2012-04-16 15:07:56 -04:00
Chris Peterson
92cf464bf4 Bug 742036 - Part 3: Pass Android's native keycodes to Flash plugin using nsGUIEvent::pluginEvent. r=masayuki,blassey a=blocking-fennec
--HG--
extra : rebase_source : 0cedf764055dba59a8c55a468b5a6dc60e20dbae
2012-04-19 10:49:31 -07:00
Chris Peterson
0bdc38f132 Bug 742036 - Part 2: Add AndroidGeckoEvent::RepeatCount() for KeyEvents. r=masayuki,blassey a=blocking-fennec
--HG--
extra : rebase_source : 8ff6cd6d3e4688570b41fe9e5233ea26fdf417ed
2012-04-19 09:56:04 -07:00
Chris Peterson
af050bf07c Bug 742036 - Part 1: Convert Android keycodes to DOM/NS_VK keycodes. r=masayuki a=blocking-fennec
--HG--
extra : rebase_source : 8c8e8fbf4dd6bd0bfc67e621a1f24788d93ec5b1
2012-04-18 10:15:15 -07:00
Brian Nicholson
d43f6811b0 Bug 746548 - Fix NPE for cache service in pause/resume. r=mfinkle a=blocking-fennec 2012-04-18 13:08:36 -07:00
Brian Nicholson
2feaf84692 Bug 745075 - Close disk cache when pausing. r=gbrown f=mfinkle,michal 2012-04-17 10:29:52 -07:00
Timothy Nikkel
c512b3f366 Bug 728284. Don't try to paint an opaque background for widgets that do it themselves. r=roc 2012-04-17 01:04:05 -05:00
Brad Lassey
6bcb2c0088 bug 721654 - Crash in mozilla::AndroidBridge::HandleGeckoMessage, follow up to require a JNI env for nsJNIString constructor r=kats 2012-04-16 18:31:05 -04:00
Brad Lassey
367badb60b bug 721654 - Crash in mozilla::AndroidBridge::HandleGeckoMessage r=kats 2012-04-16 17:25:04 -04:00
JP Rosevear
b859d6b310 Bug 745401 - Fix logic error in draw event coalescing. r=kats 2012-04-16 10:31:13 -04:00
Mark Finkle
06836e9d32 Bug 737050 - Add support for the WEBAPP intent r=blassey r=bnicholson r=gavin 2012-04-13 22:45:25 -04:00
Eitan Isaacson
9c4cdab930 Bug 739493 - Add "Accessibility:IsEnabled" message for Android 2012-03-15 10:38:27 -04:00
Eitan Isaacson
ab05ba0a95 Bug 739493 - Add "Accessibility:Event" message for Android 2012-03-09 15:06:50 -08:00
James Willcox
c3bd125218 backout 022be5c50732 for xul bustage 2012-04-11 12:56:00 -04:00
James Willcox
19f98af9ab Bug 730890 - Set up an Android Looper on the main Gecko thread r=cjones 2012-04-11 11:43:08 -04:00
Kartikaya Gupta
0be646552b Bug 740883 - Coalesce VIEWPORT events across NATIVE_POKE and DRAW events on insertion. r=Cwiiis 2012-04-10 09:28:43 -05:00
Kartikaya Gupta
f6d65c93b5 Bug 740883 - Improve DRAW event coalescing behaviour for reduced latency. r=Cwiiis 2012-04-10 09:27:04 -05:00
Brad Lassey
a0000e3ade bug 738198 - crash in nsPluginInstanceOwner::~nsPluginInstanceOwner r=snorp 2012-03-27 01:31:57 -04:00
Kartikaya Gupta
80acb9f5c0 Bug 740718 - Move event coalescing code to PostEvent and rearrange to avoid null pointer dereferences. r=blassey 2012-04-07 23:50:42 -05:00
Kartikaya Gupta
5ed6f42383 Bug 742019 - Rewrite how we handle touch events so we don't break panning, and don't introduce unnecessary latency. r=wesj 2012-04-07 03:09:26 -04:00
Jeff Muizelaar
f9b0fd8b45 Bug 740898. Merge LayerView and GLSurfaceView. r=pcwalton
Once, GLThread is gone we don't have any need to support both styles of GL
rendering. Merging LayerView and FlexibleGLSurfaceView makes it clearer what's
going on, and I expect we'll also be able to take out some dead code from the
resulting LayerView.

This patch is mostly uninteresting. The interesting bits are that
implementations of requestRender and the constructors are merged. Everything
else is mostly copying over methods and renaming FlexibleGLSurfaceView's
mController to mGLController.
2012-04-05 11:28:50 -04:00
Jeff Muizelaar
4f2cb20d6a Backed out changeset 0f8439284834
The bug number was wrong.
2012-04-05 11:27:02 -04:00
Jeff Muizelaar
1268f26df1 Bug 730898. Merge LayerView and GLSurfaceView. r=pcwalton
Once, GLThread is gone we don't have any need to support both styles of GL
rendering. Merging LayerView and FlexibleGLSurfaceView makes it clearer what's
going on, and I expect we'll also be able to take out some dead code from the
resulting LayerView.

This patch is mostly uninteresting. The interesting bits are that
implementations of requestRender and the constructors are merged. Everything
else is mostly copying over methods and renaming FlexibleGLSurfaceView's
mController to mGLController.
2012-03-30 14:21:59 -04:00
Brad Lassey
2f434bf365 bug 741284 - add async file request method r=kats 2012-04-05 01:50:06 -04:00
Doug Turner
ca3546ddbd Bug 741869 - Revert the android sensor correction which changes direction of values. r=mwu 2012-04-04 14:20:25 -07:00
Doug Turner
b70a56cfd0 Bug 741868 - Revert the android sensor filter which dropped orientation and movement events. r=mwu 2012-04-04 13:39:14 -07:00
Veeraya Pupatwibul
26e9a6a204 Bug 741333 - Remove PRBool/PR_TRUE/PR_FALSE that crept in r=Ms2ger 2012-04-04 11:15:10 +02:00
Joe Drew
110c76a0cf Bug 741166 - Restore waitForValidSurface, removed in error in bug 737949. r=ajuma 2012-04-02 15:43:21 -04:00
Josh Dhaliwal
39e8ba50ed Bug 739488 - Fennec Native nightly crashes in mozilla::AndroidBridge::EnableLocationHighAccuracy when page requests GPS location. r=dougt 2012-04-02 11:52:41 -07: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
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
Ali Juma
e7e968bb4b Bug 735230 - Part 2: Add compositor pause/resume events to Gecko. r=kats 2012-03-28 18:00:32 -04:00
Eitan Isaacson
ac7baec75e Bug 738741 - Map Android's KEYCODE_DPAD_CENTER to DOM_VK_ENTER. r=mbrubeck 2012-03-28 22:11:55 +02:00
Phil Ringnalda
bd61180bdc Back out 3e6a7f9fb34e (bug 739488) for Android XUL bustage 2012-03-29 08:26:07 -07:00
Josh Dhaliwal
0083d2d678 Bug 739488 - Fennec Native nightly crashes in mozilla::AndroidBridge::EnableLocationHighAccuracy when page requests GPS location. r=dougt 2012-03-29 07:20:58 -07:00
Josh Dhaliwal
5062750d82 Bug 735011 - geolocation - support enableHighAccuracy position option. r=dougt 2012-03-21 10:52:35 -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
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
Jared Wein
30a9bb32c5 Bug 737675 - Implement -moz-touch-enabled for Android and Gonk. r=mwu 2012-03-20 16:44:43 -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
Mounir Lamouri
71d5cfc5d5 Bug 720795 - Screen Orientation API reading and event implementation in Android. r=dougt 2012-03-20 14:09:45 +01: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
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
Kartikaya Gupta
c243707faf Bug 727966 - Remove an unnecessary paint on rotation. r=blassey 2012-03-19 10:06:24 -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
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
Ryan VanderMeulen
3edabe2c6f Backout d5b66e64cf44 (bug 732756) to see if it fixes Android crashtests. 2012-03-16 17:17:22 -04: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
Phil Ringnalda
807c91234e Back out 243cd4db5edd and 4175fc853e16 (bug 712716) for OS X 10.6 and 10.7 assertions 2012-03-15 23:21:54 -07:00
Benoit Girard
26f5681f0b Bug 712716 - Fix AndroidGraphicBuffer resource management. r=snorp,jmuizelaar 2012-03-12 16:28:02 -04:00
Brad Lassey
bc821ff978 bug 735790 - Tab thumbnails only scale 3/4 of the window r=mfinkle 2012-03-15 00:43:53 -04:00
Kartikaya Gupta
08ef4dfac6 Bug 729646 - Remove some annoying logging. r=Cwiiis 2012-03-15 10:38:43 -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
Kartikaya Gupta
cfd3606831 Fix build error for android-xul; goes with 8e11e5b9c935. r=bustage 2012-03-14 01:13:58 -04:00
Kartikaya Gupta
32769189d0 Bug 725095 - Address review comments in the widget code. r=blassey
- Rip out a lot of unused code in AndroidFlexViewWrapper.*
- Simplify the GetViewTransform JNI code
- Move the references to CompositorParent and CompositorThread from AndroidBridge to nsWindow
- Remove a bunch of logging and add some assertions and comments
2012-03-14 00:15:11 -04: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
f5463ddffd Fix small merge resolution error in 60ebef177e6d. r=me 2012-03-13 18:21:58 -04:00
Benoit Girard
32745d1cc3 Merge mc->Maple 2012-03-13 11:05:28 -04:00
Ehsan Akhgari
5097691ede Backout changeset d2340d74fc19 because of bug 735076 2012-03-12 18:51:44 -04:00
Ehsan Akhgari
dfa138382a Backout changeset b52bae0250f7 because of test failures 2012-03-12 18:51:17 -04:00
Ali Juma
7013e73a7b Bug 725095 - Address GFX review comments. r=joe 2012-03-12 16:32:02 -04:00
Benoit Girard
803f0eba61 Bug 712716 - Fix AndroidGraphicBuffer resource management. r=snorp,jmuizelaar 2012-03-12 16:28:02 -04: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
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
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
Matt Brubeck
001b042a9a Back out 5026c5ad25e7 because of XUL Fennec bustage 2012-03-08 16:42:31 -08:00
Benoit Girard
8461970bfc Bug 733184 - Remove more logging from widget. r=pcwalton 2012-03-05 19:58:18 -05:00
Kartikaya Gupta
22c1400978 Bug 732736 - Fix use of AutoLocalJNIFrame in some JNI wrappers. r=dougt 2012-03-04 22:21:21 -05:00
Michael Wu
d82046881d Bug 734081 - Check pixel depth when choosing config on egl, r=cjones 2012-03-08 19:01:12 -05:00
Chris Peterson
7f1c94e140 Bug 733153 - Remove obsolete widget.ime.android.landscape_fullscreen and fullscreen_threshold prefs. r=dougt 2012-03-07 17:17:00 -08:00
Ryan VanderMeulen
4d57056b4d Back out 2175db811fad (bug 734081) due to Android reftest failures. 2012-03-08 18:41:28 -05:00
Michael Wu
d78d9dfe0a Bug 734081 - Check pixel depth when choosing config on egl, r=cjones 2012-03-08 17:06:54 -05:00
Eitan Isaacson
2cc9d9dfa6 Bug 729237 - Fixed AndroidBridge emit a11y event function, added java string class as class member. r=blassey 2012-03-07 19:24:38 -05:00
Kartikaya Gupta
d5c3b7e98b Merge m-c again to pick up 75deec1f1a7b 2012-02-28 14:37:26 -05:00
Benoit Girard
5582ac1cee More render trace. r=debug_only
--HG--
extra : rebase_source : b20e2e6e7469433ee6148c8fa0a7dd0c0ca21009
2012-02-28 11:24:24 -05:00
Kartikaya Gupta
4720c13486 Merge heads 2012-02-27 15:59:56 -05:00
Kartikaya Gupta
134e9fec76 Merge m-c 2012-02-27 15:06:35 -05:00
Benoit Girard
a9a9772362 Added more rendertrace breakdowns 2012-02-27 14:31:29 -05:00
Josh Dhaliwal
5eca462914 Bug 727905 - Zero width window handling in nsWindow.cpp crash. r=dougt 2012-02-26 19:59:22 -08:00
Kartikaya Gupta
e37885a6c7 Take out the code that allows Java to further clip the invalid rect based on visible area.
This code is never used because the invalid rect we pass to DrawTo is ignored;
the nsLayoutUtils::PaintFrame uses the display port as the visible region to
paint instead. (http://mxr.mozilla.org/mozilla-central/source/layout/base/nsLayoutUtils.cpp#1603)
2012-02-26 10:47:45 -05:00
Ryan VanderMeulen
e46d8ad3d0 Back out 940194c616f2 (bug 729237) on suspicion of Android XUL bustage. 2012-02-25 22:09:23 -05:00
Benoit Girard
986b769ef1 Bug 730521 - Fix memory leak and needless memory allocation. r=ajuma 2012-02-24 21:51:14 -05:00
Kartikaya Gupta
0c8abc000c We were allocating and re-allocating a view-sized buffer and then claiming it was 32x32. Cut that down to stop wastage. Also drop unused method. 2012-02-24 12:11:32 -05:00
Kartikaya Gupta
9969c98db4 Remove unused parameters passed to endDrawing 2012-02-24 12:11:29 -05:00
Kartikaya Gupta
fa940eb49b Pull out tile dimensions being passed around uselessly 2012-02-24 10:51:41 -05:00
Kartikaya Gupta
5857681738 Bug 730033 - Rip out WidgetTileLayer and associated gunk. r=snorp 2012-02-23 14:55:15 -05:00
Kartikaya Gupta
53a439cccc Completely collapse GeckoGLLayerClient into GeckoLayerClient. 2012-02-22 14:45:44 -05:00
Doug Turner
0aea58f84d merge with mozilla-central: 2012-02-22 09:30:09 -08:00
Ehsan Akhgari
324ca6b6b4 Backout changeset b520f34d78f1 but keep the callback parts because they may be useful for other things 2012-02-22 11:35:25 -05:00
Ehsan Akhgari
dfd4c96ec1 Fix an assertion condition to assert what it means 2012-02-22 11:29:21 -05:00
Zack Weinberg
9c593e5cd7 Bug 96971: Move GetSystemFont from nsDeviceContext to mozilla::LookAndFeel. r=roc 2012-02-20 15:19:48 -08:00
Brad Lassey
3961277f20 bug 728614 - Refactor viewport implementation to remove js parts of the implementation r=dougt 2012-02-18 18:32:50 -05:00
Benoit Girard
7cf93f9f2a Backout c1161ca4bf13 for test failures 2012-02-21 11:34:00 -05:00
Brad Lassey
db01bf6a07 Bug 728614 - Part 0: Allow querying the viewport information from Java; r=dougt 2012-02-18 19:22:56 -05:00
Ehsan Akhgari
e60677dc90 Backout changeset c1161ca4bf13 2012-02-20 16:37:51 -05:00
Brad Lassey
c2cde20188 [mq]: meta_viewport_query
--HG--
extra : rebase_source : 586dfca0cf7d9446e532ecfa38fd126225db36b9
2012-02-18 18:32:50 -05:00
Benoit Girard
47cf03a5c3 Bug 728924 - Fix MOZ_JAVA_COMPOSITOR definition. r=joe 2012-02-20 13:57:40 -05:00
Brad Lassey
9e55996669 merge from mozilla-central 2012-02-18 17:29:33 -05:00
Brad Lassey
95697a85f1 backing out e45688c8531c because it broke the build 2012-02-18 14:21:48 -05:00
Patrick Walton
ce3f178378 Stub untested gralloc support, disabled for now 2012-02-17 23:53:21 -08:00
Chris Lord
dd4aacfc79 Fix screen/window size change events.
Window size was being treated as equivalent to screen size, which it isn't.
Make sure to send the size-changed event when either the window size or the
screen size change, and to properly differentiate between the two.
2012-02-17 17:25:52 +00:00
Ehsan Akhgari
2d00d4d7a8 Stop asserting the reverse of what we mean 2012-02-17 11:50:14 -05:00
Kartikaya Gupta
6e72a9570d Also remove dangling entrails of the layer client type 2012-02-17 09:16:14 -05:00
Kartikaya Gupta
5ec5bd703f Rip out unused GeckoSoftwareLayerClient since we've committed to GL layers. 2012-02-17 09:04:50 -05:00
Kartikaya Gupta
f3c1b6a928 Put back some things left out of dougt's merge 2012-02-17 01:36:49 -05:00
Benoit Girard
1bb7f1c5f2 Bug 728924 - Fix MOZ_JAVA_COMPOSITOR definition. r=joe 2012-02-20 14:02:15 -05:00
Doug Turner
b66a0f8126 Merge with mozilla-central 2012-02-16 18:06:54 -08:00
Brad Lassey
6a55170fc3 bug 727847 - meter orientation events on android r=dougt 2012-02-16 23:03:57 -08:00
Brad Lassey
585ae3af5b bug 726930 - speed up tab thumbnails r=mfinkle 2012-02-17 10:52:26 -08:00
Benoit Girard
567f149d32 Fix one shutdown crash
--HG--
extra : rebase_source : dd71617cbabf7848565ab609362964037fbac01a
2012-02-15 11:29:14 -05:00
Benoit Girard
612ce84d1f remove dead code 2012-02-14 18:36:33 -05:00
Philipp von Weitershausen
b4da8b67b0 Bug 720632 - Part 4: Use nsISmsRequestManager in Android JNI code. r=cjones 2012-02-20 00:44:29 +01:00
Patrick Walton
1b46184a8f Fix scissor rect and use the Java compositor's cached viewport metrics when drawing decorations 2012-02-13 20:20:38 -08:00
Kartikaya Gupta
bc50d262d3 Stop XUL fennec from crashing on startup 2012-02-13 16:57:57 -05:00
Patrick Walton
5081278876 Integrate the Java compositor. Scroll bars now appear. 2012-02-13 14:52:30 -08:00
Patrick Walton
ec85569a69 Expose ActivateProgram() and DeactivateProgram() to widget 2012-02-13 13:55:10 -08:00
Benoit Girard
5ec8cb5563 Make OMTC changes not effect desktop 2012-02-13 17:17:12 -05:00
Eitan Isaacson
55d77d968d Bug 729237 - Fixed AndroidBridge emit a11y event function, added java string class as class member. r=blassey 2012-02-25 20:38:27 -05:00
Patrick Walton
d698580c18 Uncomment the Java compositor integration, except for the part that causes PowerVR crashes 2012-02-10 23:03:02 -08:00
Patrick Walton
9fb4d6959b Uncomment TransformLayerUserData and move it into Layers to fix build bustage 2012-02-10 18:55:48 -08:00
Ali Juma
7f7fa10d9e Fix busted build. 2012-02-10 10:40:57 -05:00
Patrick Walton
9ff00d7ac5 Implement the rendering hooks for Java compositor integration. Currently segfaulting, so ifdef'd out. 2012-02-09 23:55:13 -08:00
Patrick Walton
76fcf64d4a Expose the necessary Java routines to render decorations through JNI 2012-02-09 22:58:18 -08:00
Patrick Walton
492b9f6acc Add a DrawWindowUnderlay() to match DrawWindowOverlay() 2012-02-09 19:47:50 -08:00
Benoit Girard
3f101c071a Merge working on Nexus S 2012-02-08 20:23:27 -05:00
Benoit Girard
2430a6b71c Merge fixes 2012-02-08 19:01:21 -05:00
Benoit Girard
7dc71cdb8d Merge m-c into maple 2012-02-08 16:43:22 -05:00
Josh Dhaliwal
f6eaae518a Bug 727905 - Zero width window handling in nsWindow.cpp crash. r=dougt 2012-02-27 18:57:28 -05:00
Patrick Walton
e9d5b35c01 Shrink the surface size to speed up painting 2012-02-06 15:25:18 -08:00
Ali Juma
c30eba6e2e Move surface ownership to GLContextProviderEGL.
--HG--
extra : rebase_source : a3f83d279de5087a521a938d66c4e7b5dee79d74
2012-02-06 16:53:09 -05:00
Ali Juma
035ebbe87f Add support for pausing/resuming composition from Java. 2012-02-05 13:33:38 -05:00
Patrick Walton
8f577231bf Stand up async panning and zooming 2012-02-03 23:31:05 -08:00
Patrick Walton
acf57d7d37 Poke the compositor to composite on a pan or zoom; stub AndroidBridge::GetViewTransform() 2012-02-03 18:35:58 -08:00
Patrick Walton
d6e3afde17 Add a virtual layer and GL layer client implementation 2012-02-03 15:48:26 -08:00
Patrick Walton
13458c16d5 Eliminate coupling between the software layer client and the rest of Fennec 2012-02-02 23:30:41 -08:00
Patrick Walton
a25f57bcc7 Pull parts of GeckoSoftwareLayerClient that will be used for GL layers into a generic GeckoLayerClient class 2012-02-02 22:07:05 -08:00
Patrick Walton
96bf34ae0e Clean up nsWindow::Draw() a bit 2012-02-02 20:24:49 -08:00
Patrick Walton
f15ef916a3 Partial removal of tiling, stub callouts 2012-02-02 19:28:22 -08:00
Benoit Girard
ad52ff772a Hack the real window dimensions 2012-02-02 18:03:55 -05:00
Benoit Girard
d4c038b718 Fix GetLayerManager logic 2012-02-02 14:16:59 -05:00
Benoit Girard
ea4615353c Fix problems with Nexus S init 2012-02-02 13:57:38 -05:00
Benoit Girard
97fdca975c remove OGLSurfaceView init, todo remove OGLSurfaceView.java 2012-02-02 11:28:54 -05:00
Benoit Girard
709f31dbb4 Removing this awesome template code because it causes library load crashes :( 2012-02-02 11:17:50 -05:00