wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
104,505 Commits 1 Branch 166 Tags 1.2 GiB
576737466b
Commit Graph

7199 Commits

Author SHA1 Message Date
Sriram Ramasubramanian
6af75e9632 Bug 777026: Use a touch delegate on Tabs button to overcome overlapping on menu button. [r=mfinkle] 2012-08-20 00:45:37 -04:00
Sriram Ramasubramanian
65e4aa0439 Bug 784203: Firefox logo left uncropped on about:home on tablets. [r=mfinkle] 2012-08-20 17:40:59 -07:00
Michael Comella
57f8f15bf5 Bug 780486: Corrected about:home draw order. r=sriram 2012-08-20 16:04:49 -07:00
Lucas Rocha
e121e95d62 Bug 784050 - Put back code to remove style tags in Readability.js (r=bnicholson) 2012-08-20 20:49:28 +01:00
Kartikaya Gupta
c2cd754ccb Bug 781220 - Remove the mLayerClient field from GeckoApp. r=sriram 2012-08-20 15:43:53 -04:00
Kartikaya Gupta
91da6e0789 Bug 781220 - Move some functions from GeckoLayerClient over into LayerView to simplify access to them. r=sriram 2012-08-20 15:43:53 -04:00
Kartikaya Gupta
1f938065b8 Bug 781220 - Hide other GeckoLayerClient methods and expose them via the LayerView API. r=sriram 2012-08-20 15:43:53 -04:00
Kartikaya Gupta
f82d267807 Bug 781220 - Expose a getLayerView function from GeckoApp and use it instead of going through the layer client in a few places. r=sriram 2012-08-20 15:43:53 -04:00
Kartikaya Gupta
f370fb6d42 Bug 781220 - Replace a bunch of code that gets the layer view via the layer client to just accessing the layer view directly. r=sriram 2012-08-20 15:43:53 -04:00
Kartikaya Gupta
a7b6aa8be4 Bug 781220 - Simplify initialization codepaths by having the LayerView create the GeckoLayerClient. r=sriram 2012-08-20 15:43:53 -04:00
James Willcox
4132b3c711 Bug 783028 - Enable stagefright media plugins on Android r=mfinkle 2012-08-15 14:00:39 -04:00
Mark Finkle
6337920bf2 Bug 783912 - [ARMv6] Use more conservative GC settings for ARMv6 r=blassey 2012-08-20 00:15:12 -04:00
Mark Finkle
a134ac7ea0 Bug 783909 - Fixup app update timer prefs r=blassey 2012-08-20 00:15:10 -04:00
Mark Finkle
96334926eb Bug 781169 - Tweak aboutApps strings r=wesj 2012-08-20 00:15:08 -04:00
Chris Double
3e7c161e0d Bug 781831 - Part 2 - Fix package error on XUL android - r=mfinkle 
--HG--
extra : rebase_source : faa8b37f5f6fa0512c98e4a208774f1e3dd830b2
 2012-08-20 12:09:27 +12:00
Eitan Isaacson
f07c9abaf8 Bug 781987 - Use accessibility helper class name instead of LayerView for pre-JB accessibility events. r=mbrubeck 2012-08-20 18:29:22 -04:00
Eitan Isaacson
5741eb371b Bug 777560 - Add Jelly Bean accessibility features to Java layer. r=mbrubeck 2012-08-20 18:29:22 -04:00
Gian-Carlo Pascutto
781e4da933 Bug 779687 - Telemetry around Fennec OOM kills. r=blassey 2012-08-21 13:20:26 +02:00
Ehsan Akhgari
8c296bbcd4 Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
 2012-08-22 11:56:38 -04:00
Lucas Rocha
a6036813ce Bug 766948 - Implement new Reader style (r=mfinkle) 2012-08-17 17:38:58 -04:00
Brian Nicholson
0f546849ab Bug 783601 - Remove extra textContent reference from getInnerText(). r=lucasr 2012-08-17 14:42:48 -04:00
Brian Nicholson
b8370bff75 Bug 783373 - Change mobile-specific Google search URL to standard Google search URL. r=mfinkle 2012-08-17 11:06:10 -04:00
Ed Morley
7435db4163 Backout 506268f7735e & ea163112807d (bug 746142) for Android build failures 2012-08-17 12:30:02 +01:00
Zoe Bellot
d60647c1bf Bug 746142 - Part 2 - Use inputmode attribute to vary the virtual keyboard on Android. f=mounir r=cpeterson 2012-08-17 12:02:18 +02:00
James Willcox
526dcb9217 Bug 735112 - Add some thread synchronization for plugin layers 2012-06-15 11:27:40 -04:00
Michael Comella
10720fe6be Bug 777450 - Part 2: Long pressing a Flash video no longer activates text selection. r=wesj 2012-08-16 17:35:20 -04:00
Michael Comella
6fe8ff3f82 Bug 777450 - Part 1: Clean up general context menu code. r=wesj 2012-08-16 17:35:20 -04:00
Chris Peterson
71f2c61465 Bug 781748 - Part 2: Add debug logging for IME state parameters. r=blassey 2012-08-10 21:12:28 -07:00
Chris Peterson
8115e54b34 Bug 781748 - Part 1: Guard against null mIMEActionHint or mIMETypeHint from Gecko. r=blassey 2012-08-14 11:21:19 -04:00
Chenxia Liu
d928553efb Bug 755638 - SecurityException when attempting to sync multiple Fennecs to the same account. r=rnewman 2012-08-16 11:05:57 +02:00
Mike Hommey
12ce397704 Backout changeset d945ae198516 (bug 760152). r=kats 2012-08-01 09:51:12 +02:00
Matt Brubeck
8d3664b927 Back out e8fae7f2ce39 (bug 781318) because of reftest failure 2012-08-15 19:48:31 -04:00
Wes Johnston
38d5b8ddac Bug 650399 - All webapps should use the same webapp database. r=mfinkle 2012-08-15 17:02:15 -04:00
Wes Johnston
61d4aa40e0 Bug 781318 - Autofocus textboxes in prompts. r=mbrubeck 2012-08-15 16:51:36 -04:00
Lucas Rocha
0b2a414e41 Bug 781865 - Ignore DOMContentLoaded events from iframes in Reader (r=mfinkle) 2012-08-14 15:51:11 -04:00
Lucas Rocha
1c877fc379 Bug 782480 - Clear parentNode reference when removing a child in JSDOMParser (r=bnicholson) 2012-08-14 15:51:11 -04:00
Lucas Rocha
532e104e2c Bug 777565 - Don't overflow pre/code elements in reader, wrap them (r=bnicholson) 2012-08-14 15:51:10 -04:00
Chris Peterson
3b49385f2e Bug 781713 - Inline getEditable() and remove unnecessary null checks. r=blassey 
--HG--
extra : rebase_source : 62522e83d95c1dc309c1b286dc48ddfa69f6f560
 2012-08-09 17:49:59 -07:00
Chris Peterson
2f1d52b6d5 Bug 781708 - Log warnings about unexpected beginBatchEdit/endBatchEdit counts. r=blassey 
--HG--
extra : rebase_source : 694835a34c9f0de99331c8c1b7924780d2137dd8
 2012-08-09 15:38:10 -07:00
Gian-Carlo Pascutto
8a2f9a9f5b Bug 729928 - Cleanup unused cache preferences. r=dcamp 2012-08-15 09:06:39 +02:00
Mark Capella
bd1800d03d Bug 759824 - Doorhanger button callback functions in LoginManagerPrompter.js contain incorrect arguments, r=margaret 2012-08-14 21:37:06 -04:00
Ryan VanderMeulen
c4c324c1a7 Merge m-c to inbound. 2012-08-14 20:19:33 -04:00
Chris Peterson
cc733dd923 Backout a1c1113cdf3e (Bug 781274) to avoid user confusion over StrictMode screen flashing. a=me 2012-08-14 17:13:52 -04:00
Geoff Brown
336045d7ac Bug 774833 - Robocop: use finishOpenedActivities instead of finalize; r=jmaher 2012-08-14 08:49:59 -06:00
Margaret Leibovic
f71d49e329 Bug 780906 - Add context menu items to start text selection in input fields. r=wesj 2012-08-14 10:28:14 -04:00
Kartikaya Gupta
278a2d48bb Bug 780650 - Clean up dynamic dependencies from robocop on fennec. r=cpeterson 2012-08-14 08:55:58 -04:00
Chris Lord
9ae792e26b Bug 782327 - Enable OMTC async video on Android. r=blassey 
Set layers.async-video.enabled to true and remove the css rule that forced
nearest-neighbour scaling on video.
 2012-08-13 23:03:36 -04:00
Kartikaya Gupta
a6904d07f1 Bug 765156 - Fix NPE from getHandler() returning null for a detached view. r=mfinkle 2012-08-13 22:56:27 -04:00
Kartikaya Gupta
8449342826 Bug 776906 - Remove unnecessary conversion of bitmap to PNG. r=blassey 2012-08-13 20:01:31 -04:00
Kartikaya Gupta
8d7957296b Bug 776906 - Fix thumbnails on Nexus 7. r=blassey 2012-08-13 20:01:31 -04:00
Geoff Brown
37edc0b6b3 Bug 770461 - Robocop: improve diagnostics in testHistoryTab; r=jmaher 2012-08-13 12:11:12 -06:00
Kartikaya Gupta
b4f2fcef66 Bug 734496 - Don't apply resistance to pinch zoom unless an axis is in overscroll on both sides. r=Cwiiis 2012-08-11 13:32:04 -04:00
Geoff Brown
aa5e801284 Bug 764901 - Robocop: make testPasswordEncrypt more robust; r=jmaher 2012-08-10 15:59:12 -06:00
Kartikaya Gupta
d45bbd7e49 Bug 781676 - Fix possible NPE from a null mTouchEventHandler. r=sriram 2012-08-10 16:16:54 -04:00
Chris Peterson
4a101f8128 Bug 781020 - Remove IME's composing spans when Gecko resets the composition state. r=blassey 
--HG--
extra : rebase_source : 252b3b15dfe3570fdc4a695c0f720f7c7e59944a
 2012-08-08 16:16:59 -07:00
Chris Peterson
f04aa01b68 Bug 778468 - Part 10: Make all event registration go through EventDispatcher. r=blassey 2012-08-02 18:38:45 -07:00
Chris Peterson
214dbdb6fc Bug 778468 - Part 9: Use EventDispatcher to remove ui dependency on GeckoAppShell event registration. r=blassey 2012-08-04 00:33:07 -07:00
Chris Peterson
51b5e13a65 Bug 778468 - Part 8: Add EventDispatcher to remove gfx dependency on GeckoAppShell event registration. r=blassey 2012-08-02 15:12:35 -07:00
Chenxia Liu
0fc0035b09 Bug 775360 - "Show me how" link should not launch Browser Intents page. r=rnewman 2012-08-10 17:03:36 +02:00
Chris Double
9dc73ab7a4 Bug 759945 - Part 2: Android package changes for software decoding using libstagefright on Android - r=mark.finkle 
--HG--
extra : rebase_source : 3a96e6d81507329d52016f7dfb5d6b804c29f7d5
 2012-08-10 20:15:16 +12:00
Brian Nicholson
b92c5fd9c5 Bug 779796 - Part 6: Remove article generator function in Readability.js. r=lucasr 2012-08-09 23:30:46 -07:00
Brian Nicholson
c7bd8e5cd6 Bug 779796 - Part 5: Move Readability parsing to a web worker. r=lucasr 2012-08-09 23:30:46 -07:00
Brian Nicholson
c95c10e807 Bug 779796 - Part 4: Remove XPCOM-related code from Readability.js. r=lucasr,mfinkle 2012-08-09 23:30:46 -07:00
Brian Nicholson
da6f05594e Bug 779796 - Part 3: Update Readability.js to be compatible with JSDOMParser. r=lucasr 2012-08-09 23:30:46 -07:00
Brian Nicholson
87da169055 Bug 779796 - Part 2: Replace Reader checks with full parses. r=lucasr 2012-08-09 23:30:46 -07:00
Brian Nicholson
8af2d2c5b7 Bug 779796 - Part 1: Implement JSDOMParser. r=lucasr,mfinkle 2012-08-09 23:30:46 -07:00
Chris Peterson
f1bdc0312a Bug 781274 - Enable StrictMode's red screen flashing on unofficial builds. r=blassey 2012-08-08 11:11:57 -07:00
Chris Peterson
3a4e55169e Bug 781038 - Part 2: Extract setSpan() and setSelection() boilerplate into a convenience method. r=blassey 2012-08-07 16:14:23 -07:00
Chris Peterson
4f473d04af Bug 781038 - Part 1: Span and select the Editable's actual length. r=blassey 2012-08-07 15:47:05 -07:00
Chris Peterson
8fc5d48a1b Bug 780191 - Commit composition string before sending autocomplete text event. r=blassey 2012-07-11 17:29:33 -07:00
Chris AtLee
b31db82fc3 Bug 776185: use the buildid based on MOZ_BUILD_DATE for ANDROID_VERSION_CODE r=mfinkle 2012-08-09 17:57:41 -04:00
Margaret Leibovic
bea544bdc6 Bug 781143 - Add mDoorHangerPopup null check in GeckoApp.onBackPressed. r=wesj 2012-08-09 13:53:00 -07:00
Margaret Leibovic
94948b2e6e Bug 730039 - Persist Fenenc's open tabs in TabsProvider. r=rnewman 2012-08-09 13:52:58 -07:00
Wes Johnston
4f6464689f Bug 757680 - Add a pref to turn off event coalescing. r=kats 2012-08-09 12:54:36 -07:00
Wes Johnston
e95e0a2ff5 Bug 779490 - Remove code to handle UTF8 App names. r=mfinkle 2012-08-09 12:54:35 -07:00
Sriram Ramasubramanian
d7399578b0 Bug 765156: NPE in Property Animator's invalidate(). [r=mfinkle] 
--HG--
extra : rebase_source : 7e9625e2a93d25646ab086f89feba9493445d523
 2012-08-09 11:39:02 -07:00
Brian Nicholson
533507b12b Bug 780713 - Disable reader mode logging by default. r=lucasr 2012-08-09 10:53:44 -07:00
Brian Nicholson
dd592bf035 Bug 717428 - Part 2: Add missing breaks in database upgrade logic. r=lucasr 2012-08-09 10:38:00 -07:00
Brian Nicholson
fc16cec4f1 Bug 717428 - Part 1: Remove AndroidBrowserDB. r=lucasr 2012-08-09 10:38:00 -07:00
Brian Nicholson
baa549ed82 Bug 777966 - Replace regex <br> matching with replaceBrs(). r=lucasr 
--HG--
extra : rebase_source : 0cbe7d9788e551ea1412cb014f92cd5b7b038093
 2012-08-06 10:54:24 -07:00
Marco Zehe
5add77cef6 Bug 779448 - add contentDescription to the Go button, r=blassey 2012-08-09 18:26:43 +02:00
Margaret Leibovic
ed780d259e Bug 781191 - Update doorhanger popup anchor after inflating a new browser toolbar layout. r=wesj 2012-08-09 08:31:05 -07:00
Mark Finkle
1dab717d5b Bug 781091 - aboutCertError.xhtml XML Parsing Error r=margaret 2012-08-09 09:35:57 -04:00
Geoff Brown
0f40838dfa Bug 769919 - Robocop: Add more diagnostics to testBookmark; r=jmaher 2012-08-09 07:11:36 -06:00
Geoff Brown
ea983ff4f5 Bug 727152 - Robocop: improve shutdown of mAsserter; r=jmaher 2012-08-09 07:06:19 -06:00
Nick Alexander
f3fc22b751 Bug 761682, Bug 777973 - Version prefs; don't always invalidate auth token. r=rnewman 2012-08-08 17:13:20 -07:00
Brian Nicholson
17d3a456bb Bug 779089 - Add proper Apache 2 header to Readability.js. r=gerv 2012-08-08 13:13:10 -07:00
Wes Johnston
4d6103f2a2 Bug 776677 - Show a toast when we receive webapp install errors. r=mfinkle 2012-08-08 12:35:15 -07:00
Wes Johnston
3301706c7e Bug 776600 - Allow passing some default prefs from the manfiest to the webapp. r=mfinkle 2012-08-08 12:35:15 -07:00
William Chen
16866a115c Bug 775377 - Modify nsIContentPermissionRequest to use nsIPrincipal instead of nsIURI. r=dougt+cjones 2012-07-30 10:58:26 -04:00
Brian Nicholson
08eae70a42 Bug 784104 - Disable search suggestions by default. r=mfinkle 2012-08-20 11:41:54 -07:00
Wes Johnston
c95cb27fb9 Bug 776600 - Support apps setting their default orientation. r=blassey 2012-08-20 10:28:40 -07:00
Wes Johnston
d8b02e3ed9 Bug 781900 - Update Clear Site Preferences string. r=mfinkle 2012-08-20 10:28:38 -07:00
Wes Johnston
9a9919e945 Bug 781900 - Move site preferences dialog to urlbar context menu. r=mfinkle 2012-08-20 10:28:36 -07:00
Brian Nicholson
39ea6bd8b8 Bug 782421 - Use parsed result for reader articles. r=lucasr 2012-08-14 17:29:40 -04:00
Lucas Rocha
8973b4d41e Bug 784055 - Remove all code dealing with offsetWidth in Readability.js (r=bnicholson) 2012-08-20 18:05:37 +01:00
Lucas Rocha
71fc3ac6fe Bug 784050 - No need to remove stylesheets and style tags in Readability.js (r=bnicholson) 2012-08-20 18:05:37 +01:00
Eitan Isaacson
a677be035c Bug 783706 - Bump minimum version to SDK 16. r=blassey 2012-08-20 13:04:31 -04:00
Lucas Rocha
d83c884cbe Bug 782348 - Fetch byline info from articles to show on Reader (r=bnicholson) 2012-08-20 14:06:58 +01:00
Kartikaya Gupta
c0d9057cff Bug 780699 - Prevent possible deadlock by reducing the scope of a synchronized block in GLController. r=ajuma 2012-08-08 11:37:46 -04:00
Margaret Leibovic
b3755edbdc Bug 778263 - Clean up SelectionHandler data when we bail in startSelection. r=mfinkle 2012-08-07 11:20:11 -07:00
Matt Brubeck
8e8edfe957 Bug 778468 (followup) - Add missing import to GeckoApp.java 
--HG--
extra : rebase_source : eb1fec6f975604c4bce94e68f52b965ecd410cca
 2012-08-07 14:48:13 -07:00
Kartikaya Gupta
c22525a970 Bug 779920 - Fix mismatch between window and coordinates passed to anyElementFromPoint. r=wesj 2012-08-07 16:00:14 -04:00
Kartikaya Gupta
ad138057bb Bug 771575 - Remove unused function. r=mbrubeck 2012-08-07 15:47:02 -04:00
Kartikaya Gupta
6850d6e553 Bug 771757 - Set the browser size without triggering a reflow when meta-viewport elements are received before the first paint. r=mbrubeck 2012-08-07 15:43:17 -04:00
Chris Peterson
12be5c166f Bug 778468 - Part 7: Move GeckoEventListener to org.mozilla.gecko.util package. r=blassey 
--HG--
extra : rebase_source : d0b2982b64126c046c5c974c7ec014992bef63b7
 2012-08-02 17:13:40 -07:00
Chris Lord
5b80d64763 Bug 780928 - Fix rawtypes usage in LayerView.java. r=kats 
Fix unnecessary usage of raw Class type.
 2012-08-07 18:57:19 +01:00
Kartikaya Gupta
089f9a73a4 Bug 778257 - Fix javascript warning because of function returning inconsistent types. r=margaret 2012-08-07 13:30:45 -04:00
Wes Johnston
a7ea50f579 Bug 766392 - Style about:apps to match other about pages. r=mfinkle 2012-08-07 09:49:30 -07:00
Kartikaya Gupta
7c27c82eb2 Bug 777351 - Scope down and inline some functions in the new GeckoLayerClient. r=sriram 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
69eda93651 Bug 777351 - Remove unnecessary getBitmap function that always returns null. r=sriram 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
0f75a70847 Bug 777351 - Fold LayerController into GeckoLayerClient. r=sriram 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
e3ce5edbe4 Bug 777351 - Some minor cleanup in GeckoLayerClient.java. r=sriram 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
8805993182 Bug 777351 - Move the getDrawable functions from LayerController to LayerView. r=sriram 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
3350e05928 Bug 777075 - Remove notifyLayerClientOfGeometryChange from the PanZoomTarget interface by baking it into setViewportMetrics and setForceRedraw. r=mbrubeck 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
ac83271939 Bug 777075 - Add a getMutableMetrics helper. r=mbrubeck 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
4fdffd71e8 Bug 777075 - Trim the PanZoomState interface by moving some LayerController functions into PanZoomController. r=mbrubeck 2012-08-07 10:39:04 -04:00
Kartikaya Gupta
4b24887a6e Bug 777075 - Extract a PanZoomTarget interface for functions that PanZoomController depends upon. r=mbrubeck 2012-08-07 10:39:03 -04:00
Kartikaya Gupta
d3a77d21bc Bug 777075 - Eliminate the getViewport and getZoomFactor methods in LayerController to further reduce exposed surface area. r=mbrubeck 2012-08-07 10:39:03 -04:00
Kartikaya Gupta
d6ad560bb7 Bug 777075 - Extract a ZoomConstraints class to carry around the pieces of data that are otherwise floating around Tab and LayerController. r=mbrubeck 2012-08-07 10:39:03 -04:00
Kartikaya Gupta
decd347956 Bug 777075 - Refactor PanZoomController to consolidate code that gets the viewport metrics from the LayerController. r=mbrubeck 2012-08-07 10:39:03 -04:00
Lucas Rocha
168366f04b Bug 766942 - Stop prograpation on clicks in toolbar buttons (r=mfinkle) 2012-08-07 15:23:21 +01:00
Lucas Rocha
75734de9b9 Bug 766942 - Get rid of mInReadingList property in BookmarksTab (r=wesj) 2012-08-07 15:23:21 +01:00
Lucas Rocha
7b0ef2e470 Bug 766942 - Implement new reader toolbar (r=mfinkle) 2012-08-07 15:23:21 +01:00
Lucas Rocha
91d7bf2b0f Bug 766942 - Change Tabs to handle Reader:Removed message from Gecko (r=mfinkle) 2012-08-07 15:23:20 +01:00
Lucas Rocha
1a1ddda365 Bug 766942 - Fix GeckoApp's showToast() to actually show the notification (r=mfinkle) 2012-08-07 15:23:20 +01:00
Lucas Rocha
542366042e Bug 766942 - Set query argument with initial reading list state (r=mfinkle) 2012-08-07 15:23:20 +01:00
Lucas Rocha
bac0c2b63d Bug 766942 - Add Reader:GoToReadingList bits to GeckoApp (r=margaret) 2012-08-07 15:23:20 +01:00
Lucas Rocha
4fee6fcd1a Bug 766942 - Support showing reading list directly on awesomebar startup (r=margaret) 2012-08-07 15:23:20 +01:00
Lucas Rocha
ab9e803ad1 Bug 766942 - Change bookmarks tab to support reading list as initial folder (r=margaret) 2012-08-07 15:23:20 +01:00
Michael Comella
57045f1a3c Bug 780481 - Fix top sites item height. r=sriram 2012-08-06 20:27:04 -04:00
Michael Comella
edc0af825d Bug 780367 - AboutHomeContent should no longer have two views. r=sriram 2012-08-06 20:27:04 -04:00
Chris Peterson
778b6784c6 Bug 778468 - Part 6: Inject LayerView's InputConnectionHandler to remove GeckoInputConnection dependency. r=blassey 
--HG--
extra : rebase_source : 7422a54c7c360ef8712c75d865e5e545d922aad1
 2012-08-02 11:56:52 -07:00
Chris Peterson
425c4af89d Bug 778468 - Part 5: Move GeckoAsyncTask to org.mozilla.gecko.util package. r=mfinkle 
--HG--
extra : rebase_source : 4aa925222ea94fd58d5b071075c0d6a7d9be9231
 2012-08-02 11:10:31 -07:00
Chris Peterson
75caa1ddcf Bug 778468 - Part 4: Move GeckoBackgroundThread to org.mozilla.gecko.util package. r=mfinkle 
--HG--
extra : rebase_source : c9bc3d8bd3d1fe22adfb905030d904d4785386a6
 2012-08-02 11:03:58 -07:00
Chris Peterson
bf58574432 Bug 778468 - Part 3: Move GeckoJarReader to org.mozilla.gecko.util package. r=mfinkle 
--HG--
extra : rebase_source : 307ecf819a24b348c9878590066c20e3823519f6
 2012-08-01 18:58:23 -07:00
Chris Peterson
261ee5c004 Bug 778468 - Part 2: Move INIParser to org.mozilla.gecko.util package. r=mfinkle 
--HG--
extra : rebase_source : c5f40ac931084fdcdd73304900fd5ecd0210c3ac
 2012-08-02 10:40:57 -07:00
Chris Peterson
d8a66a2518 Bug 778468 - Part 1: Move ActivityResultHandler to org.mozilla.gecko.util package. r=mfinkle 
--HG--
extra : rebase_source : 2e367de82c0d129f2e469da825d49fd41dd6e19b
 2012-08-02 10:33:44 -07:00
Wes Johnston
82b0d7039a Bug 769821 - Save app cache at install time for webapps. r=mfinkle,fabrice 2012-08-06 09:30:12 -07:00
Makoto Kato
51f4299456 Bug 771201 - Characters committed at every typing on fullscreen keyboard. r=cpeterson 2012-08-06 16:28:46 +09:00
Margaret Leibovic
25b513fd89 Bug 732336 - (Part 3) Listen for tab events in doorhanger popup. r=wesj 2012-08-04 16:34:47 -07:00
Margaret Leibovic
456ee4beb5 Bug 732336 - (Part 2) Refactor DoorHanger/Tab to centralize logic in DoorHangerPopup. r=wesj 2012-08-04 16:34:44 -07:00
Margaret Leibovic
ee7029bde2 Bug 732336 - (Part 1) Move doorhanger-related event listeners to DoorHangerPopup. r=wesj 2012-08-04 16:34:42 -07:00
Ms2ger
cb4d106015 Bug 716822 - Move attributes and methods on nsIDOMNSEvent to nsIDOMEvent; r=smaug 2012-08-04 09:44:00 +02:00
Ed Morley
b3355a8c11 Bug 780373 - scrollbars-01.svg & scrollbars-02.svg are perma-orange on Android. r=mfinkle 2012-08-04 20:32:24 +01:00
Mike Hommey
c1b35e7b2a Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Ed Morley
4eb11bee72 Revert inbound to 3d5d1daa2505 to stop OS X M5 failures (backout not clean/could have been a bad merge) on a CLOSED TREE 2012-08-04 18:05:15 +01:00
Ms2ger
e6463200a3 Merge m-c to m-i. 2012-08-04 13:02:15 +02:00
Mike Hommey
be451c22dc Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE 2012-08-04 10:38:41 +02:00
Ms2ger
b927c10310 Bug 716822 - Move attributes and methods on nsIDOMNSEvent to nsIDOMEvent; r=smaug 2012-08-04 09:44:00 +02:00
Mike Hommey
e79d87471e Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 08:48:56 +02:00
Ed Morley
d359ee0356 Merge mozilla-central and fx-team 2012-08-03 15:52:55 +01:00
Richard Newman
1aa5365609 Bug 774300 - Sync authentication errors if passwords contain non-ASCII characters. r=nalexander 
* * *
Bug 774300 - Fix omission. r=me
 2012-08-02 22:00:43 -07:00
Nick Alexander
4d1ff3cc48 Bug 741960 - Fuzz backoff times up to 25% more to avoid client lock-stepping. r=rnewman 2012-08-02 22:00:43 -07:00
Ed Morley
520d455d66 Merge mozilla-central to mozilla-inbound 2012-08-03 23:34:31 +01:00
Sriram Ramasubramanian
c584a7162b Bug 765079: Text selection in HTML input elements. [r=margaret] 
--HG--
extra : rebase_source : b975954af7f903d9543227970101437a21b21310
 2012-08-03 12:38:40 -07:00
Sriram Ramasubramanian
7fd64f7752 Bug 777358: Large tablet tab new should be added to Makefile.in. [r=mfinkle] 
--HG--
extra : rebase_source : 6b96820d93a7364f40ac51e49bf4b2fc334a09e3
 2012-08-03 12:11:54 -07:00
Sriram Ramasubramanian
d2f25deef4 Bug 779322: TabsTray lost its scrolling capabilities. [r=mbrubeck] 
--HG--
extra : rebase_source : 5574cd1dea25d3121fe50be5ef8407030b7a1897
 2012-08-03 12:11:15 -07:00
Vladimir Vukicevic
bd1724bff4 b=780213; don't call glDeleteTextures when len == 0 in TextureReaper, because Adreno; r=snorp 2012-08-03 13:40:41 -04:00
Vladimir Vukicevic
abcbcb4077 b=779936; can't use TextureView without android hardware accelerated windows (S3 bustage); r=snorp 2012-08-03 13:40:33 -04:00
Vivien Nicolas
d0416d1328 Bug 770453 - [b2g] Semi-transparent scroll bars should not occupy content-flow space mobile/xul part. r=mfinkle 2012-08-03 12:35:14 +02:00
Ryan VanderMeulen
378e8bb0b8 Merge again. 2012-08-02 17:20:44 -04:00
Ryan VanderMeulen
e5fc4802ad Merge m-c to inbound. 2012-08-02 17:17:28 -04:00
Margaret Leibovic
d6f45d2764 Bug 779007 - Don't make about: pages privileged if they don't need to be. r=mfinkle 2012-08-02 14:16:54 -07:00
Margaret Leibovic
e946d187b8 Bug 778940 - Clean up our session history logic in Tab. r=mfinkle 2012-08-02 14:15:17 -07:00
Vladimir Vukicevic
7f6be6c511 b=779826; fix Invalid size exception in DirectBufferAllocator (Android nightly bustage fix); r=snorp,kats 2012-08-02 11:14:32 -04:00
Michael Comella
d4d2806ca0 Bug 686528 - (5 of 5) about:home recreates itself onConfigurationChange. r=sriram 2012-08-01 22:23:51 -04:00
Michael Comella
f24f6fcbd9 Bug 686528 - (4 of 5) kTopSiteHeight in AboutHomeContent uses a dimen constant. r=sriram 2012-08-01 22:23:51 -04:00
Michael Comella
c388bb6113 Bug 686528 - (3 of 5) Set padding for about:home tablet layout. r=sriram 2012-08-01 22:23:51 -04:00
Michael Comella
d011c23e3c Bug 686528 - (2 of 5) Clean up about:home and add 10" landscape layout. r=sriram 2012-08-01 22:23:51 -04:00
Michael Comella
27ca6eb9e7 Bug 686528 - (1 of 5) about:home uses integer resources to handle different sizes. r=sriram 2012-08-01 22:23:51 -04:00
Chris Peterson
13b91b21d0 Bug 779366 - Part 2c: Query resources for DisplayMetrics, not the WindowManager. r=sriram 2012-08-01 14:56:26 -07:00
Chris Peterson
41b6ea6b1b Bug 779366 - Part 2b: Remove ViewportMetrics' dependency on GeckoApp by passing DisplayMetrics. r=sriram 2012-08-01 14:51:28 -07:00
Wes Johnston
3359fe7582 Bug 772968 - Use a special appid for webapps on android. r=mfinkle 2012-08-02 09:57:01 -07:00
Brian R. Bondy
0205a74689 Bug 770911 - Remove all prefetch clearing code. r=taras. 2012-08-02 10:50:29 -04:00
Panos Astithas
80897951b7 Bug 779462 - Use Device instead of Fennec prefixes in Fennec browser actors; r=mfinkle 2012-08-03 10:32:25 +03:00
Chris Peterson
0056fba509 Backout bcb8b2b5a310 (bug 779366 - Part 2). r=me 2012-08-01 14:42:11 -07:00
Chris Peterson
51f10d37e8 Bug 779366 - Part 3: Move direct buffer allocation to DirectBufferAllocator. r=kats 2012-07-31 15:54:29 -07:00
Chris Peterson
2f9b95cde3 Bug 779366 - Part 2: Move DisplayMetrics to ConfigurationUtils. r=sriram 2012-07-30 16:05:44 -07:00
Chris Peterson
f5549b06dc Bug 779366 - Part 1: Move FloatUtils to org.mozilla.gecko.util package. r=kats 
--HG--
rename : mobile/android/base/FloatUtils.java => mobile/android/base/util/FloatUtils.java
 2012-07-27 21:57:47 -07:00
Chris Peterson
20927a2f40 Bug 778472 - Part 3: Standardize order of import statements: org.mozilla, com, net, org, android, java. r=mfinkle 2012-07-27 17:53:54 -07:00
Ed Morley
8c798cdc3b Backout d2ee4c12c0b3 (bug 777351), 5aa6f94160dd (bug 777351), b47c470168fc (bug 777351), 5fb303ba52f7 (bug 777351), be81e4c3d928 (bug 777351), abc5b9a922dc (bug 777075), 8f1fc980f1f1 (bug 777075), 0b194a7f47d4 (bug 777075), d10df9bfef60 (bug 777075), 65393fe32cce (bug 777075), b52dc1df2fde (bug 777075), 8aeda525c094 (bug 777075) for Android native R1 failures on a CLOSED TREE 2012-08-01 18:42:05 +01:00
Kartikaya Gupta
912ab62a3b Bug 777351 - Scope down and inline some functions in the new GeckoLayerClient. r=sriram 2012-08-01 10:48:19 -04:00
Kartikaya Gupta
59d53a3a44 Bug 777351 - Remove unnecessary getBitmap function that always returns null. r=sriram 2012-08-01 10:48:19 -04:00
Kartikaya Gupta
4df9e1758d Bug 777351 - Fold LayerController into GeckoLayerClient. r=sriram 2012-08-01 10:48:19 -04:00
Kartikaya Gupta
789cc42d7f Bug 777351 - Some minor cleanup in GeckoLayerClient.java. r=sriram 2012-08-01 10:48:19 -04:00
Kartikaya Gupta
866b310b59 Bug 777351 - Move the getDrawable functions from LayerController to LayerView. r=sriram 2012-08-01 10:48:19 -04:00
Kartikaya Gupta
9637f91654 Bug 777075 - Remove notifyLayerClientOfGeometryChange from the PanZoomTarget interface by baking it into setViewportMetrics and setForceRedraw. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
d21d9fe1d7 Bug 777075 - Add a getMutableMetrics helper. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
7de6d09010 Bug 777075 - Trim the PanZoomState interface by moving some LayerController functions into PanZoomController. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
48920d20cf Bug 777075 - Extract a PanZoomTarget interface for functions that PanZoomController depends upon. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
dbe1c47d30 Bug 777075 - Eliminate the getViewport and getZoomFactor methods in LayerController to further reduce exposed surface area. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
48c5cd570b Bug 777075 - Extract a ZoomConstraints class to carry around the pieces of data that are otherwise floating around Tab and LayerController. r=mbrubeck 2012-08-01 10:38:30 -04:00
Kartikaya Gupta
e0c7659f57 Bug 777075 - Refactor PanZoomController to consolidate code that gets the viewport metrics from the LayerController. r=mbrubeck 2012-08-01 10:38:29 -04:00
Michael Comella
34cb8c196d Bug 778879 - Switch relative URL conversion code to use Services.jsm. r=mfinkle 2012-07-31 18:26:29 -04:00
Michael Comella
afb9b0fc27 Bug 778862 - Change match_parent tags to fill_parent. r=sriram 2012-07-31 18:26:29 -04:00
Michael Comella
ad5977bfb9 Bug 778491 - Make about:home last tabs text correctly centered. r=sriram 2012-07-31 18:26:29 -04:00
Wes Johnston
54fceaffe6 Bug 766604 - Convert UTF-8 App names to UTF16 for Java. r=mbrubeck 2012-07-31 11:34:48 -07:00
Matt Brubeck
e8ccb5a9ca Bug 778333 - Back out 4b197ffb4dcc (bug 775372) and 7d11ab4b1a8c (bug 769857) because of link-clicking regressions 2012-07-31 10:57:24 -07:00
James Willcox
7d9aa5cde7 Bug 779152 - Render into a TextureView on Android where available r=kats 2012-07-31 13:30:46 -04:00
Marco Zehe
340121ef96 Bug 758431 - Make menu items converted into actionBar items accessible by adding a contentDescription for it, r=sriram 2012-07-31 12:02:53 +02:00
Mike Habicher
01f8e81e31 Bug 740997 - ICS camera support, r=jst,gal,roc 2012-07-30 17:59:05 -04:00
Brian Nicholson
711531853f Bug 778561 - Remove YouTube UA hack. r=mfinkle 2012-07-30 21:19:04 -07:00
Brian Nicholson
1f433797bf Bug 777811 - Add getSubject() to AwesomeBarItem. r=mfinkle 2012-07-30 17:00:49 -07:00
Sriram Ramasubramanian
0d3285d021 Bug 778438: ActionBar crash on Awesomebar. [r=mfinkle] 2012-07-30 14:21:29 -07:00
Nick Alexander
327e140c89 Bug 778081: No NullPointerException in CommandProcessor.getArgsList. r=rnewman 
--HG--
extra : rebase_source : 8fd9757ef2b385f6d033e278864d8b2770aceb4a
 2012-07-30 13:05:33 -07:00
Nick Alexander
1d6f11b435 Bug 766354: Don't leak PII from SendTabActivity. r=rnewman 
--HG--
extra : rebase_source : cd626fd18dec41efb80fd00250b164517bcd5d5b
 2012-07-30 13:05:04 -07:00
Chris Peterson
bc94267076 Bug 778472 - Part 2: Replace wildcard import statements with fully-qualified names. r=mfinkle 2012-07-27 17:54:28 -07:00
Chris Peterson
22f5fd455c Bug 778472 - Part 1: Remove unused and redundant import statements. r=mfinkle 2012-07-27 17:54:41 -07:00
Ehsan Akhgari
c80897316e Merge the nullptr conversion from mozilla-central into mozilla-inbound 2012-07-30 10:28:15 -04:00
Aryeh Gregor
57c0ad57fb Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Kartikaya Gupta
aed9399f87 Bug 770047 - Add the LayerView directly to the XML layout rather than creating it later, so that we don't get a black flash on startup on JellyBean devices. r=sriram 2012-07-28 10:33:51 -04:00
Sriram Ramasubramanian
38a53f53bc Bug 778247: mAppContext cleanup: Tabs can avoid it. [r=mbrubeck] 
--HG--
extra : rebase_source : 1a5ed5ec5dbfdd72c81877196e3a3f10764e3d07
 2012-07-27 23:31:54 -07:00
Sriram Ramasubramanian
c3b75f7817 Bug 778247: mAppContext cleanup: AboutHomeContent is associated with only one activity. [r=mbrubeck] 
--HG--
extra : rebase_source : 60aa53488d18f395e4e4b6d0023e357ffcb23ee4
 2012-07-27 23:31:42 -07:00
Sriram Ramasubramanian
387b831795 Bug 778247: mAppContext cleanup: BrowserApp is a subclass of GeckoApp. [r=mbrubeck] 
--HG--
extra : rebase_source : 4ae2582c26ad0e2fcd464fdceddffb80ea46c88e
 2012-07-27 23:31:42 -07:00
Sriram Ramasubramanian
4c40a2abe4 Bug 778247: mAppContext cleanup: TabsPanel doesn't need it. [r=mbrubeck] 
--HG--
extra : rebase_source : be08d9e04fd9e6f15e3d99915c532916afd5a093
 2012-07-27 23:31:40 -07:00
Sriram Ramasubramanian
c0e26931fa Bug 778247: mAppContext cleanup: BrowserToolbar doesn't need it. [r=mbrubeck] 
--HG--
extra : rebase_source : 9b4e36926beaaa29316a715443551b0fd324629c
 2012-07-27 23:15:39 -07:00
Sriram Ramasubramanian
0c3fb5d217 Bug 778247: mAppContext cleanup: display metrics can be obtained from context. [r=mbrubeck] 
--HG--
extra : rebase_source : a36329385979ffd0312fdba19b17798f0e62b3ad
 2012-07-27 23:13:34 -07:00
Sriram Ramasubramanian
d4f91c1aab Bug 778247: mAppContext cleanup: not needed for events. [r=mbrubeck] 
--HG--
extra : rebase_source : d5dfd53953736117609fbe4acce2982f7888d4cf
 2012-07-27 23:10:50 -07:00
Matt Brubeck
247c6935da Bug 775372 - Fix exceptions in _cancelTapHighlight when the highlight element is from a dead window [r=margaret] 2012-07-27 16:03:18 -07:00
Sriram Ramasubramanian
f3a432b0ee Bug 770928: Enable default text interaction on honeycomb+. [r=mbrubeck] 2012-07-26 23:56:53 -07:00
Sriram Ramasubramanian
19e23d0d9a Bug 761785: Background shown during overscroll disappeared. [r=kats] 2012-07-26 23:54:48 -07:00
Sriram Ramasubramanian
da97c18da8 Bug 777427: BrowserApp should handle Addon related menu items. [r=wesj] 2012-07-26 23:53:48 -07:00
Sriram Ramasubramanian
8c94e66ddb Bug 777427: BrowserApp should handle its MenuItems. [r=wesj] 
--HG--
rename : mobile/android/base/resources/menu-large-v11/gecko_menu.xml.in => mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml.in => mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu-v11/gecko_menu.xml.in => mobile/android/base/resources/menu-v11/gecko_app_menu.xml.in
rename : mobile/android/base/resources/menu-xlarge-v11/gecko_menu.xml.in => mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
rename : mobile/android/base/resources/menu/gecko_menu.xml.in => mobile/android/base/resources/menu/browser_app_menu.xml.in
 2012-07-26 23:52:41 -07:00
Michael Comella
4d58b09e4e Bug 776110 - <a> and <img> uris are replaced with absolute uris. r=lucasr 2012-07-26 21:17:23 -04:00
Michael Comella
cdf139c721 Bug 775740 - Remove reimplemented functionality of ArrayAdapter in PromptListAdapter. r=wesj 2012-07-26 21:17:23 -04:00
Lucas Rocha
36cc3c7f5f Bug 767738 - Use favicon from the original site in Reader (r=mbrubeck) 2012-07-26 23:08:50 +01:00
Margaret Leibovic
c0e5e2a32a Bug 777805 - Update error message for unsupported plugins to include "Learn More..." link. r=mbrubeck 2012-07-26 14:57:34 -07:00
Wes Johnston
339aceecb8 Bug 645592 - Remove unused getTitle function. r=margaret 2012-07-26 13:02:27 -07:00
Wes Johnston
0ec79746ba Bug 777649 - Use history ID for removing items on the all pages screen. r=margaret 2012-07-26 12:53:19 -07:00
Wes Johnston
dbd3b44884 Bug 777663 - Use localized string for password prompts. r=mbrubeck 2012-07-26 12:53:16 -07:00
Wes Johnston
863f6e829e Bug 776950 - Use displayname for homescreen shortcuts. r=margaret 2012-07-24 16:47:59 -07:00
James Willcox
1b25da7bfc Bug 777746 - Don't block Flash for Tegra on Gingerbread/Froyo r=blassey 2012-07-26 15:41:40 -04:00
Kartikaya Gupta
8111166470 Bug 777505 - Fix possible NPE in getInputMethodManager. r=cpeterson 2012-07-26 13:53:51 -04:00
Nick Alexander
e0c9f52054 Bug 772645 - part 2/2: Make Android Sync account type depend on Fennec shared user ID. r=rnewman 2012-07-26 08:47:25 -07:00
Nick Alexander
40e87e8aca Bug 772645 - part 1/2: Make Android Sync account type depend on Fennec shared user ID. r=rnewman 
Firefox and Firefox Beta share account type org.mozilla.firefox_sync.
Aurora and Nightly share account type org.mozilla.fennec_sync.
Developer builds use account type org.mozilla.fennec_whoami_sync.
This was dictated by released code which clustered the shared Android
IDs and code signing into these three sets.
 2012-07-26 08:47:25 -07:00
Nick Alexander
5956d9ea84 Bug 764867 - Make Android Sync branding match Fennec branding by using @drawable/icon. r=rnewman 2012-07-26 08:47:25 -07:00
Kartikaya Gupta
d701131c35 Bug 775722 - Reposition the text selection handles during pan/zoom operations. r=blassey 2012-07-26 10:13:48 -04:00
Ed Morley
8ae0bc807e Merge mozilla-central to mozilla-inbound 2012-07-26 13:25:04 +01:00
Ed Morley
7c29aed7d0 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-07-26 13:04:00 +01:00
Paul Rouget
a3e73dc8e4 merge fx-team to m-c 2012-07-25 15:07:40 -07:00
Lucas Rocha
c4efdaea06 Bug 767121 - Show tip when toolbar hides for the first time in reader (r=mbrubeck) 2012-07-26 10:48:52 +01:00
Sriram Ramasubramanian
6a005beed7 Bug 775211: Custom menu flickers on JB and HTC Sensation. [r=mbrubeck] 2012-07-24 21:32:39 -07:00
Sriram Ramasubramanian
e1a5c02184 Bug 761929: Crash on H/W MENU key press with custom menu. [r=mbrubeck] 2012-07-24 21:30:46 -07:00
Kartikaya Gupta
525cb8d43c Bug 776702 - Remove unnecessary BitmapDrawable instance creation. r=cpeterson 2012-07-24 13:31:51 -04:00
Kartikaya Gupta
d157f74266 Bug 773431 - Ensure we grab touchstart events in capture mode since content can kill it before it bubbles. r=wesj 2012-07-24 12:53:47 -04:00
Kartikaya Gupta
221d163724 Bug 773427 - Ensure that when moving click points, we don't allow it to get rounded incorrectly. r=wesj 2012-07-24 12:08:40 -04:00
Chenxia Liu
6a88dc1655 Bug 776659 - Remove FLAG_ACTIVITY_NEW_TASK where not necessary. r=nalexander 2012-07-24 16:34:11 +02:00
Wes Johnston
ee1dedbfbe Bug 766094 - Use an int for telemetry pref. r=mbrubeck 2012-07-23 17:54:37 -07:00
Michael Comella
4085ba97a7 Bug 776369 - Fix NullPointerException. r=bnicholson 2012-07-23 20:02:21 -04:00