Commit Graph

4587 Commits

Author SHA1 Message Date
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
Markus Stange
7744fae998 Bug 734381 - Don't clear the background behind menuitems when painting into a context without transparency. r=josh 2012-03-09 16:17:37 +01:00
Vivien Nicolas
6adce041c2 Bug 730848 - [Gonk] Generate key events instead of AppCommands for devices hw keys r=mwu 2012-03-01 17:03:59 +01: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
Patrick Walton
df5fc9e46d Turn on OMTC by default; fix crash when acquiring EGL surface 2012-02-01 23:54:01 -08:00
Benoit Girard
9378d80baf Add init code for AndroidEGLObjects 2012-02-01 18:08:09 -05:00
Benoit Girard
7b9d937ba8 Fix AndroidGLController::Init 2012-02-01 17:53:18 -05:00
Benoit Girard
4580dbb21d Progress on omtc integration 2012-02-01 16:18:35 -05:00
Benoit Girard
106b0e77a3 Move registerCxxCompositor to FlexView 2012-02-01 14:15:52 -05:00
Ali Juma
da918c5222 Merge m-c to kiwifox 2012-02-01 12:07:14 -05:00
Benoit Girard
03e53b0b32 Import jni implementation 2012-02-01 12:02:55 -05:00
Benoit Girard
6d0fb45af9 Import jni headers 2012-02-01 11:49:34 -05:00
Ali Juma
150a69c9a2 Disable direct textures because of crashes. 2012-01-31 15:53:54 -05:00
Benoit Girard
5ded8d48db merge mc into kiwifox 2012-01-31 13:55:51 -05:00
Markus Stange
23c72f3d76 Bug 715867 - Don't fire duplicate sizemodechange events on Mac. r=smichaud
--HG--
rename : widget/tests/window_bug596600.xul => widget/tests/empty_window.xul
2012-01-31 11:40:03 +01:00
Wes Johnston
2b1ee754dc Bug 721484 - Don't disable mouse events for touch events. r=blassey 2012-01-30 21:57:06 -08:00
Benoit Girard
f1d2fba1df Merge fixes 2012-01-30 15:57:30 -05:00
Benoit Girard
506188e13c Mergi mc to kiwifox, lots of conflicts so may not build 2012-01-30 13:38:20 -05:00
James Willcox
e0ad67e5bf Bug 721803 - Add known-good devices to direct texture whitelist r=blassey 2012-01-30 22:38:16 -05:00
Benoit Girard
7f35e49cdf Partial work for android OGLSurfaceView
--HG--
extra : rebase_source : 2c6ce362dd859e9f81a5b4490e2451826259a651
2012-01-26 14:23:13 -05:00
Benoit Girard
e647509077 Disable sHasDirectTexture because of crash in Nexus S
--HG--
extra : rebase_source : 03daaf6a9b7a562d95bf42c34b997ba234eed022
2012-01-26 14:22:26 -05:00
Michael Wu
ca6099d72e Bug 729146 - Check aRepaint in Resize in gonk's nsWindow, r=cjones 2012-02-22 09:50:44 +01:00
Owen Taylor
9a71b5ddad Bug 721498 - Use remote timestamp when available for focus requests. r=karlt 2012-02-16 11:23:34 +01:00
Michael Wu
436b4049bb Bug 719647 - Add Touch Event support to Gonk widget backend, r=cjones 2012-01-25 12:37:31 -08:00
Ali Juma
eb69d1849d Work around Bug 719036. 2012-01-18 11:38:45 -05:00
Ali Juma
bc059aa711 merge m-c to kiwifox 2012-01-18 11:04:04 -05:00
Doug Turner
ab812201ed Bug 713803 - Rationalize JNI access accross android widget. r=blassey 2012-01-29 12:39:30 -08:00
Phil Ringnalda
eab130eacc Back out 59d8d92f9f3c (bug 713803) for Android C1 permaorange 2012-01-29 00:49:02 -08:00
Doug Turner
775c1f6fc2 Bug 713803 - Rationalize JNI access accross android widget. r=blassey 2012-01-28 22:38:02 -08:00
Brian Nicholson
b4d0d5faf4 Bug 701092 - Limit session restore attempts. r=mfinkle 2012-01-27 22:04:54 -08:00
Ali Juma
4e5254c2d1 Revert spurious change to widget/android/nsWindow.cpp 2012-01-16 11:14:36 -05:00
Ali Juma
b868e77d3a Address next set of review comments. 2012-01-16 10:31:16 -05:00
Ali Juma
b0cbfdc966 merge mc to kiwifox 2012-01-16 10:06:34 -05:00
Ali Juma
4f0e452c4f merge mc to kiwifox 2012-01-16 09:58:14 -05:00
Tim Taubert
dc0feeb24e merge m-c to fx-team 2012-01-16 11:20:19 +01:00
Jared Wein
843a61d98d Bug 198964 - Enable smooth scrolling by default. r=gavin 2012-01-13 16:26:34 -08:00
Benoit Girard
a83775721c Merge mc with kiwifox 2012-01-12 14:11:08 -05:00
Benoit Girard
08ecac4e02 Merge m-c into kiwifox
--HG--
rename : widget/src/cocoa/nsChildView.h => widget/cocoa/nsChildView.h
rename : widget/src/cocoa/nsChildView.mm => widget/cocoa/nsChildView.mm
rename : widget/public/nsIWidget.h => widget/nsIWidget.h
rename : widget/src/xpwidgets/nsBaseWidget.cpp => widget/xpwidgets/nsBaseWidget.cpp
rename : widget/src/xpwidgets/nsBaseWidget.h => widget/xpwidgets/nsBaseWidget.h
2012-01-11 17:30:40 -05:00
Ali Juma
76de514ab5 More handling review comments for Bug 711168. 2012-01-10 18:04:21 -05:00
Benoit Jacob
48459baa04 Bug 718629 - report more info about failures of waitpid on the glxtest process - r=joe 2012-01-17 14:37:41 -05:00
Matt Brubeck
b79b1e58d3 Back out 88733ce1bef3 (bug 718440) because of Windows build failure 2012-01-17 15:15:47 -08:00
Jeff Muizelaar
315982723f Bug 718440. Add more sampler labels to various places. r=bgirard
This shows the problems described in bug 710068.
2012-01-17 15:33:04 -05:00
James Willcox
7df90dda44 Bug 716190 - Retry graphic buffer locks if we get -EBUSY r=pcwalton
--HG--
extra : rebase_source : 969aee231df4ac7ac70086fa2fa836c26a090b8e
2012-01-17 15:00:56 -05:00
Kan-Ru Chen
0cccff6859 Bug 714717 - Part 2, Reschedule timer after non-idle event. r=MikeK 2012-01-11 15:38:16 +01:00
Kan-Ru Chen
04cf367a1b Bug 714717 - Part 1, Sanity check nextWaitTime. r=MikeK 2012-01-11 15:38:00 +01:00
Ms2ger
10ae9ad9d2 Merge m-c to m-i. 2012-01-11 12:15:35 +01:00
Ed Morley
d27cab927f Merge last PGO-green changeset from mozilla-inbound to mozilla-central 2012-01-11 02:39:31 +00:00
Trevor Saunders
dda2898978 merge accessibility to mozilla-central 2012-01-10 20:52:37 -05:00
Benoit Girard
bda11d91b1 Bug 711564 - Disable ICA/CA Plug-in drawing model on 10.5 because of instability. r=smichaud
--HG--
extra : rebase_source : e204fd8058110d7fbefec1160013185dffc08132
2012-01-09 19:11:04 -05:00
Ali Juma
540e7055c9 Address review comments from Bug 711168.
--HG--
rename : gfx/layers/ipc/ShadowLayersHost.h => gfx/layers/ipc/ShadowLayersManager.h
2012-01-06 17:52:32 -05: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
Jonathan Kew
789760b675 bug 735583 - eliminate font constant synonyms and use the standard forms everywhere. r=jdaggett 2012-03-15 09:04:46 +00:00
Trevor Saunders
533b134d87 merge mozilla-central to accessibility
--HG--
rename : widget/src/gtk2/nsWindow.cpp => widget/gtk2/nsWindow.cpp
rename : widget/src/gtk2/nsWindow.h => widget/gtk2/nsWindow.h
2012-01-05 21:43:01 -05:00
Doug Turner
99adfcf041 Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 16:57:51 -07:00
Doug Turner
cb5e3dd11b Bug 734325 - implement compassneedscalibration event. r=jdm 2012-03-13 16:57:09 -07:00
Doug Turner
fb1156258d Bug 733652 - Remove geolocation address handling (v2). Little adoption, costly implementation r=jdm 2012-03-08 22:16:25 -08:00
Ed Morley
72b4537851 Backout 8b74d5ae78c3 & c619bbb2951f (bug 734391), 772c994fa869 (bug 734324), fd23ff0f9dd1 (bug 734325), d1e037a9390e (bug 733653), 3a7bf79b5b2d (bug 733650) & 9d9392fce538 (bug 733652) for OS X M1 & M3 orange 2012-03-13 22:29:29 +00:00
Doug Turner
1ea5a27f7a No Bug - Build bustage caused by cset c619bbb2951f. Extra char at begining of file. r=me 2012-03-13 10:38:38 -07:00
Doug Turner
dd357ccffe Bug 734324 - implement device motion - rotation rate and acceleration. r=jdm 2012-03-13 10:00:02 -07:00
Doug Turner
968cf06489 Bug 734325 - implement compassneedscalibration event. r=jdm 2012-03-13 09:59:24 -07:00
Doug Turner
4668d637d1 Bug 733652 - Remove geolocation address handling (v2). Little adoption, costly implementation r=jdm 2012-03-08 22:16:25 -08:00
Trevor Saunders
57ef4f25d9 bug 693343 - a11y disabled in Gnome 3 when GNOME_ACCESSIBILITY is unset patch=mgorse, tbsaunde r=tbsaunde, karlt
(testing a possible bustage fix)
2012-01-04 20:54:17 -05:00
Boris Zbarsky
f12f1399b7 Bug 716793. Dispatch synthetic mousemove off the refresh driver, not as fast as we can. r=roc
We use Flush_Display here because mousemoves flush out layout, so we want to do the synthetic one after we've done our normal layout flushing
2012-01-10 00:23:29 -05:00
Makoto Kato
2f13a54acb Bug 715045 - Remove old vc support code. r=jimm 2012-01-05 16:52:22 +09:00
Masayuki Nakano
a0dbc0b9f1 Bug 713502 Fire input event even during composition r=smaug+ehsan 2011-12-31 23:04:37 +09:00
Chris Jones
8f17266c33 Bug 714307: Synchronize back/front buffers in gonk fallback path. r=mwu 2011-12-30 18:28:40 -08:00
Patrick Walton
dfec4981df Backed out bug 709492 due to breakage with external urls. r=backout 2011-12-30 18:47:06 -05:00
Markus Stange
eb399a7302 Bug 598482 part 20 - Rename Update to Invalidate; view updates are now always asynchronous. r=roc 2011-12-23 22:52:25 -05:00
Markus Stange
965873a64b Bug 598482 part 18 - Separate NS_WILL_PAINT and NS_PAINT handling; only flush again if no NS_WILL_PAINT event has been sent by the platform. r=roc 2011-12-23 22:52:24 -05:00
Markus Stange
d13d62c3a3 Bug 598482 part 7 - Remove NS_VMREFRESH_* flags. NS_VMREFRESH_NO_SYNC is now the unchangable default. r=roc 2011-12-23 22:52:22 -05:00
Markus Stange
11a49c8991 Bug 598482 part 3 - Remove synchronous painting APIs from nsIWidget. r=roc 2011-12-23 22:52:21 -05:00
Kevin Gadd
ce002dcfa2 bug 627628 - Throttle the dispatching of starved paints so that time is allowed for the processing of input events between each starved paint. r=roc
This helps maintain responsiveness in cases where input events are being generated very rapidly or where painting is extremely expensive.
2012-01-13 19:29:22 -06:00
Jim Mathies
9184744dfc Bug 618353 - Provide content with the ability to shrink the size of glass borders for glass windows and shrink the fx border by 2 pixels. r=felipe 2012-01-13 09:10:05 -06:00
Brian R. Bondy
d4cacf2f4a Bug 714115 - CF_HTML not being used when comma as a decimal point. r=roc 2012-01-13 09:37:33 -05:00
Mike Hommey
62c12f3946 Bug 716825 - Avoid loading system libraries with their full path. r=bjacob,r=gal,r=blassey 2012-01-13 07:23:02 +01:00
Masayuki Nakano
9c5493c45d Bug 717147 input events which are fired after compositionupdate should be trusted events r=ehsan 2012-01-13 15:19:22 +09:00
Ali Juma
1e5d6f62dd Clean up Compositor destruction. 2011-12-22 10:59:53 -05:00
Ali Juma
f7d1e27182 Clean up pointer usage 2011-12-21 11:10:33 -05:00
Mounir Lamouri
5c5c80c069 Bug 713687 - Part 4 - Network API Android backend: use enable/disable notifications to prevent listening when not needed. r=dougt 2012-01-16 15:01:07 +01:00
Mounir Lamouri
f56d160181 Bug 713687 - Part 2 - Network API Android backend: listen to network changes and notify the DOM. r=dougt 2012-01-17 19:40:39 +01:00
Mounir Lamouri
b60b13293e Bug 713687 - Part 1 - Network API Android backend: get current information. r=dougt 2012-01-16 14:44:07 +01:00
Mounir Lamouri
104c6e72f2 Bug 674725 - Part AU - Release message lists in case of GC. r=smaug,cjones 2012-01-17 19:43:08 +01:00
Mounir Lamouri
51107564e9 Bug 674725 - Part AT - Handle failures for getMessages(). r=smaug,cjones 2011-12-22 23:25:14 +01:00
Ali Juma
8f65b99584 Fix crash when deleting Compositor parent, and change RPC calls to sync calls.. 2011-12-20 10:37:27 -05:00
Benoit Girard
5cf57bc7a0 Fix startup black flash when doing ForceRefreshOpenGL 2011-12-19 16:13:45 -05:00
Benoit Girard
688d67d0d9 merge mc to kiwifox 2011-12-19 11:34:31 -05:00
Benoit Girard
ffabc5ce14 Set parent backend type
--HG--
extra : rebase_source : 92cad3412b9c41dbc96d39a4bf73141811c3a192
2011-12-19 10:46:12 -05:00
Benoit Girard
a487b8f156 More clean up. Shutdown down a window no longer crashes 2011-12-16 19:21:51 -05:00
Benoit Girard
99a20ea320 Clean up some hacks and useless code 2011-12-15 16:31:16 -05:00
Ali Juma
4fe32b6aeb imported patch hacking 2011-12-15 15:07:25 -05:00
Ali Juma
059eb910c9 imported patch PCompositorProgress 2011-12-15 15:07:19 -05:00
Mounir Lamouri
09da127c98 Bug 674725 - Part AQ - Read the next message in the list (Android backend). r=cjones 2011-12-22 23:16:59 +01:00
Mounir Lamouri
76e368a7a2 Bug 674725 - Part AO - Show the first message of message list in SmsCursor. r=smaug,cjones 2011-12-19 12:07:03 +01:00
Mounir Lamouri
c6598ac290 Bug 674725 - Part AN - Handling no messages in created message list. r=smaug,cjones 2011-12-19 12:04:53 +01:00
Mounir Lamouri
4dac706233 Bug 674725 - Part AL - Store Android Cursors to keep track of created message lists. r=cjones 2011-12-22 23:16:22 +01:00
Mounir Lamouri
f3a7dabbc6 Bug 674725 - Part AK - Create an Android Cursor when a message list is requested. r=cjones 2011-12-20 09:07:25 +01:00
Mounir Lamouri
97a37fb5c9 Bug 674725 - Part AG - Notify when delete() fails. r=smaug,cjones sr=sicking 2011-12-22 23:15:44 +01:00
Mounir Lamouri
92cf45e8cd Bug 674725 - Part AF - Implement delete() on Android. r=cjones 2011-12-22 23:15:28 +01:00
Mounir Lamouri
ef742879a6 Bug 674725 - Part AD - Notify when getMessage() fails. r=smaug,cjones sr=sicking 2011-12-22 23:14:45 +01:00
Mounir Lamouri
a300600e0c Bug 674725 - Part AC - Implement getMessage() on Android. r=cjones 2011-12-22 23:08:58 +01:00
Mounir Lamouri
0c18bf7a81 Bug 674725 - Part Y - Notify when send() fails. r=smaug,cjones sr=sicking 2011-12-22 23:06:35 +01:00
Mounir Lamouri
32b8a98ec5 Bug 674725 - Part X - Use SmsRequest for send() method. r=smaug,cjones 2012-01-13 14:26:50 +01:00
Mounir Lamouri
932753cdba Bug 674725 - Part U - Implement WebSMS delivered event for the Android backend. r=cjones 2012-01-13 14:26:24 +01:00
Mounir Lamouri
e7b41c0d50 Bug 674725 - Part S - Implement WebSMS sent event. r=cjones,smaug 2012-01-10 20:34:50 +01:00
Mounir Lamouri
205528614d Bug 674725 - Part R - Save sent messages in the Android database. r=cjones 2012-01-13 14:25:47 +01:00
James Willcox
9b0d6c0c33 Bug 713774 - Fix crasher when changing orientation on Android r=blassey 2012-01-04 21:53:09 -05:00
James Willcox
1d127eda80 Bug 715190 - Clear existing GL errors before trying to check for a new one r=clord 2012-01-04 21:51:11 -05:00
Chris Jones
77d8734898 Bug 672166: Get rid of nsIScreen_MOZILLA_2_0_BRANCH and create nsBaseScreen for shared code. sr=roc 2012-01-04 18:12:48 -08:00
Benoit Girard
e10f317d41 Part A: Setup PCompositor (in progress) 2011-12-12 10:15:57 -05:00
Jeff Walden
f73124604d Bug 711799 - Add parentheses to a bunch of && expressions nested within || expressions. r=dholbert 2011-12-18 01:00:47 -05:00
Ms2ger
c480d4db80 Bug 707576 - Remove nsIDOMNSElement; r=smaug 2011-12-18 11:06:23 +01:00
Doug Turner
2a4b8377d3 Backout of ba92c42f126f 2011-12-17 21:34:03 -08:00
Doug Turner
7543f9ad60 Backout of 8a5cc33141a3 2011-12-17 21:33:44 -08:00
Doug Turner
5ecd025014 Backout of f39dab2d2adb 2011-12-17 21:32:48 -08:00
Doug Turner
9d3905ac3a Backout of 74277c18e7ce 2011-12-17 21:32:24 -08:00
Patrick Walton
4bb55eeec9 Bug 709492 - Part 3: Implement expose events. r=kats 2011-12-29 15:10:28 -08:00
Patrick Walton
50cec8d933 Bug 709492 - Part 2: Implement draw suppression. r=kats 2011-12-29 15:10:27 -08:00
Michael Wu
b583d4c969 Bug 711867 - Track dirty region in gonk widget backend, r=cjones 2011-12-29 15:01:51 -08:00
Chris Jones
8ad41d53d9 Bug 713168: Add support for different screen/input-device resolutions and virtual buttons. Temporary. rs=mwu 2011-12-29 14:39:25 -08:00
Chris Jones
3ab3ae5467 Followup to bug 708154: Fix review comments. r=mwu 2011-12-29 14:39:25 -08:00
Chris Jones
443faacd92 Bug 714183: Import downstream widget/src/gonk changes from b2g. rs=cjones,mwu 2011-12-29 14:39:25 -08:00
Ms2ger
c5542b2100 Bug 709528 - Remove unused nsDeviceContextSpecG::SetMultipleConcurrentDeviceContextsSupported; r=roc a=edmorley 2011-12-11 14:46:35 +01:00
Ms2ger
40fa89fdc0 Bug 709526 - Remove unused confirm_overwrite_file from nsFilePicker.cpp; r=roc a=edmorley 2011-12-11 14:45:51 +01:00
Ms2ger
9195b9f357 Bug 709525 - Remove unused 1-argument nsDeviceContextSpecGTK::GetPrintMethod; r=roc a=edmorley 2011-12-11 14:45:01 +01:00
Tim Abraldes
30a6568785 Bug 704558 - Added encoder options in encodeImage and encodeScaledImage. r=bbondy 2011-12-16 19:43:10 -05:00
James Willcox
f2138c4d9f Bug 670930 - Use asynchronous direct texturing on Android when available 2011-12-16 16:40:58 -05:00
James Willcox
eb0c3ecd6f back out 8a5cc33141a3 due to android-xul build failure 2011-12-16 14:45:58 -05:00
Jim Mathies
f7fce21aa4 Bug 661991 - follow up, make sure and clear file lists before calling file picker's Show. r=bbondy. 2011-12-16 09:10:16 -06:00
James Willcox
7de6dda3c3 Bug 670930 - Use asynchronous direct texturing on Android when available
--HG--
extra : rebase_source : 116b2882092d11b17046bdec5ca4d142d088d6cf
2011-12-16 10:54:10 -05:00
James Willcox
2387bed69a Bug 670930 - Add Android direct texture implementation
--HG--
extra : rebase_source : eb3f095e2663c0ebc0a03117ec8883d66dd8f1b5
2011-12-16 10:54:08 -05:00
Masayuki Nakano
a3298d0045 Bug 204786 Use LookAndFeel for delay to show tooltip r=roc+enndeakin 2011-12-16 18:18:48 +09:00
Trevor Saunders
1b2ce620b0 bug 705983 always check gconf for accessibility state when GNOME_ACCESSIBILITY not set r=ginn.chen 2011-12-01 18:30:55 -05:00
Benoit Jacob
893044e0f2 Bug 729817 - Block the Nouveau 3D driver as it's installed by default on OpenSuse 12.1 and crashes - r=mattwoodrow 2012-02-23 17:23:29 -05:00
Benoit Jacob
326d0228f6 Bug 696636 - Block OpenGL 1 drivers explicitly to steer clear of crashes - r=mattwoodrow 2012-02-23 17:21:30 -05:00
Ed Morley
dba8d82dfd Backout b638c0deeafa (bug 729817) & 512df80d7ca4 (bug 696636) for xpcshell failures 2012-02-24 00:08:38 +00:00
Benoit Jacob
1c50c67130 Bug 729817 - Block the Nouveau 3D driver as it's installed by default on OpenSuse 12.1 and crashes - r=mattwoodrow 2012-02-23 17:23:29 -05:00
Benoit Jacob
fb6fcdfdca Bug 696636 - Block OpenGL 1 drivers explicitly to steer clear of crashes - r=mattwoodrow 2012-02-23 17:21:30 -05:00
Ed Morley
8790c6731c Merge last green changeset of mozilla-inbound to mozilla-central 2012-01-06 22:27:52 +00:00
Kyle Huey
3a27625aad Bug 714752: Make imgIContainerObserver::FrameChanged take an imgIRequest*. r=joe sr=roc 2012-01-06 07:32:38 -05:00
James Willcox
9a700e8d8f Bug 715894 - Only draw dirty rect when using gralloc textures r=clord
--HG--
extra : rebase_source : 432da0c53ce697b6bbc8009c615e9bfb81f0778f
2012-01-06 12:25:05 -05:00
Chris Lord
94788dd323 Bug 709120 - Add tiled buffer support for Android/native. r=pcwalton
This adds support for rendering to a tiled software buffer when using the
Java compositor. Tiles are assumed to be packed tight and stored sequentially,
by row.
2012-01-06 11:22:11 +00:00
Michael Wu
efe388c054 Bug 715679 - Handle more than one window correctly in Gonk, r=cjones 2012-01-05 13:23:34 -08:00
Michael Wu
a4b5775dfd Bug 715678 - Fix indentation in gonk/nsWindow.cpp, r=cjones 2012-01-05 11:17:14 -08:00
Timothy Nikkel
102da0200b Bug 728953. Forward all events to the view event callback instead of skipping some. r=jimm 2012-02-21 15:46:26 -06:00
Chris Pearce
c09c931fe1 Bug 718939 - Backout bea7ecf9084e. r=roc 2012-02-08 17:10:11 +13:00
Cameron McCormack
0079b02b78 Bug 674370 - Make browser windows (and other document-like windows) zoom on creation on OS X 10.7. r=mstange,dao sr=bzbarsky 2012-02-08 11:44:45 +11:00
Neil Deakin
6125e0566b Bug 707382, merge nsIDOMDataTransfer and nsIDOMNSDataTransfer, r=jonas 2012-02-07 13:02:32 -05:00
Alex Pakhotin
cc92a9b8bb Bug 595008 - Make Android IME more efficient by reducing communication between Java and Gecko. r=blassey 2011-12-15 13:35:45 -08:00
Chris Lord
2962f7d02b Bug 708307 - Decouple texture size from tile size. r=pcwalton
This removes the hard-coded limit of 1024x2048 tile sizes, and allows for
arbitrary tile-sizes. It will still only allocate texture sizes in powers of
two, however. It replaces the tile size with a buffered-area size, which can be
re-allocated as the screen dimensions change.
2011-12-15 23:45:52 +00:00
Michael Wu
6ff301bae3 Bug 710041 - Build fixes for gonk widget backend, r=cjones 2011-12-15 15:38:45 -08:00
Kyle Huey
6701a739db Bug 714078: Don't do anything risking a deadlock in IAudioSessionEvents callbacks. r=ehsan 2011-12-29 11:59:29 -05:00
Phil Ringnalda
8e7c10e41c Merge m-i <-> m-c 2011-12-24 21:50:23 -08:00
Florian Haenel
0fc5b748c2 Bug 712291 - broken window resizing on qt/maemo/meego. r=romaxa 2011-12-22 23:13:53 -05:00
Chris Jones
3d03b24f70 Bug 708154: Add a fallback non-GL rendering patch to the gonk widget backend and add support for the qemu touch device. r=kmachulis,gal pending-r=mwu 2011-12-23 23:13:33 -08:00
Phil Ringnalda
3cce1527f8 Back out 1ac4cb2e7c32 to c631f9c3e9a9 (bug 598482) for Android reftest failures 2011-12-23 22:21:58 -08:00
Markus Stange
dfe85f1f6f Bug 598482 part 20 - Rename Update to Invalidate; view updates are now always asynchronous. r=roc 2011-12-23 22:52:25 -05:00
Markus Stange
adc9e7d972 Bug 598482 part 18 - Separate NS_WILL_PAINT and NS_PAINT handling; only flush again if no NS_WILL_PAINT event has been sent by the platform. r=roc 2011-12-23 22:52:24 -05:00
Markus Stange
352b17f6aa Bug 598482 part 7 - Remove NS_VMREFRESH_* flags. NS_VMREFRESH_NO_SYNC is now the unchangable default. r=roc 2011-12-23 22:52:22 -05:00
Markus Stange
47a9e5ee03 Bug 598482 part 3 - Remove synchronous painting APIs from nsIWidget. r=roc 2011-12-23 22:52:21 -05:00
Chris Lord
2853435e26 Bug 711426 - Fix some causes of crashes when rotating. r=kats
The lock on the software buffer was not being respected when destroying the
surface on screen rotation, meaning we could destroy it while Gecko was still
drawing to it. This would certainly cause a crash on rotation under the right
conditions. The same situation also occurred in
GeckoSoftwareLayerClient.getBitmap().

We also waited until the next redraw when freeing the old texture associated
with the surface. This had the effect of temporarily increasing the memory
usage (generally by either 4.5 or 9 megabytes). If memory pressure is high,
this could also cause a crash, though it is far less likely than the above case.
2011-12-24 00:49:00 +00:00
Paul O’Shannessy
d1d30cea3e Bug 707814 - Awesomebar autocomplete box appears in the wrong place [r=mstange] 2011-12-23 16:36:20 -08:00
Chris Jones
0724ea97f2 Bug 715232: Don't attempt to CopyTexImage from an RGB framebuffer to an RGBA texture. r=joedrew 2012-01-25 18:05:34 -08:00
Ed Morley
2806e8f2c1 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-01-26 01:30:30 +00:00
Michael Wu
ea2588584c Bug 712973 - Use InputReader from libui in gonk widget backend, r=cjones 2012-01-25 11:00:34 -08:00
Michael Wu
c2c5ac8482 Bug 720769 - Enable nsTransferable in Gonk backend, r=cjones 2012-01-25 10:22:15 -08:00
Ed Morley
1c246bc124 Merge last green changeset of mozilla-inbound to mozilla-central 2012-01-25 14:14:48 +00:00
Ms2ger
2d51bac031 Merge m-c to m-i. 2012-01-25 11:06:40 +01:00
Ms2ger
c65e8a0ba7 Bug 718504 - Remove some GetChildAt callers; r=smaug 2012-01-25 08:50:07 +01:00
Oleg Romashin
6ec67b6e36 Bug 720299 - Qt Fennec does not compile with faststartup (undefined reference moz_free/alloc et.c). r=dougt 2012-01-25 02:07:21 -05:00
Marco Bonardo
b5461ddb2d Merge last green PGO from inbound to central 2012-01-24 13:27:20 +01:00
Serge Gautherie
10804f0910 Bug 720071. (Av1a) Fix windows/nsFilePicker to actually be buildable using "--with-windows-version=502". r=jmathies. 2012-01-24 07:05:15 +01:00
Serge Gautherie
ae33d5546d Bug 719389. (Av1) Fix "#ifdef MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN" from bug 441197. r=khuey. 2012-01-23 08:02:37 +01:00
Ed Morley
c1585c7af3 Backout 91eebc6bdb59 & 7d776b291014 (bug 717283) for Android native reftest crashes 2012-01-22 11:55:18 +00:00
Chris Lord
d994084581 Bug 717283 - Use tiles on-demand. r=pcwalton, snorp
Instead of tying the tile-buffer in MultiTileLayer directly to the back-buffer
of the page, make sure rendering is always aligned to the tile grid and use
tiles on-demand. This makes better use of tiles when panning/zooming, and opens
up the route for further optimisations.
2012-01-22 09:40:37 +00:00
Chris Peterson
46474f8a44 Bug 701002 part 2 - JavaStackTrace: send "JavaStackTrace" field to Socorro. r=dougt 2012-01-23 12:02:56 -08:00
Chris Lord
4122e6b473 Bug 709152 - Squash multiple viewport events in nsAppShell. r=pcwalton
We only ever want to respond to the latest viewport sent, separate the
viewport change into its own event and remove all but the latest in the queue
when processing events.
2011-12-22 11:35:32 +00:00
Jacek Caban
fb57206152 Bug 731943 - Get rid of no longer needed mingw hacks r=jimm 2012-03-02 11:27:06 +01:00
Steven Michaud
f486e3b94a Bug 730282 - Firefox crash @ mozilla::SignalTracerThread. r=ted.mielczarek. 2012-03-12 15:13:14 -05:00
Brad Lassey
33fe479cbf bug 719359 - Pageload thumbnails for sites with <meta viewport=width=n> do not cover entire thumbnail box in about:home r=mfinkle 2012-03-12 14:05:43 -04:00
Jean-Alexandre Anglès d'Auriac
df49639224 b=714068 use gtk_icon_theme_get_icon_sizes instead of gtk_icon_theme_has_icon to determine whether GtkWindow will use an icon r=karlt
--HG--
extra : transplant_source : %01%D7%07%9BU%7E%0C%C7t%E6ye%3Av%CC%02%FB%99%1B%D1
2012-01-11 15:41:28 +13:00
Chris Coulson
7259b3bb98 Bug 635918 part 2 - Provide additional recommended properties when playing samples via libcanberra r=kinetik
--HG--
extra : transplant_source : %A1%1E%FD%85%2C%EE%E8%C0%96%E1%A7/%0BD%F3C%CB%D2%7D%EF
2012-01-11 11:37:40 +13:00
Chris Coulson
5b4e6e4a03 Bug 635918 Part 1 - Make nsISound::Play use libcanberra on Linux rather than esound r=kinetik f=karlt
--HG--
extra : transplant_source : %F8%B5-%FB%3D%2B%60%AA%B7%EE%E4%9Fy%85%AA%B7%0C%C9%23/
2012-01-11 11:37:36 +13:00
Masayuki Nakano
66ffdd2bfb Bug 716819 Move nsToolkit::VistaCreateItemFromParsingNameInit() and nsToolkit::createItemFromParsingName to WinUtils r=jimm 2012-01-11 11:09:41 +09:00
Kan-Ru Chen
61a59e26f5 Bug 714694 - Part 2, Track user activity in gonk backend; r=mwu DONTBUILD 2012-01-11 02:07:00 +00:00
Kan-Ru Chen
ea114890d0 Bug 714694 - Part 1, Add IdleService to gonk backend; r=mwu 2012-01-11 02:06:59 +00:00
Ed Morley
8eb8a45281 Backout 4c84b021a3c8 & d16206820082 (bug 714694) to correct patch author 2012-01-11 02:06:28 +00:00
Ed Morley
269d831b1d Bug 714694 - Part 2, Track user activity in gonk backend; r=mwu 2012-01-11 01:44:46 +00:00
Ed Morley
cfdfba830e Bug 714694 - Part 1, Add IdleService to gonk backend; r=mwu 2012-01-11 01:44:45 +00:00
Brad Lassey
88e3637cca bug 715507 - GlobalHistory is accessing Gecko on the wrong thread r=dougt,kats 2012-01-05 16:14:23 -08:00
Benoit Girard
2a513e20f0 Bug 635544 - rename nsIWidget::DrawOver to DrawWindowOverlay. r=roc 2012-01-21 21:01:17 -05:00
Matt Brubeck
3017d8c4c6 Back out 47584f117727 and e05a8743389a (bug 717283) because of native Android startup crashes 2012-01-20 11:42:34 -08:00
Chris Lord
94b277a126 Bug 717283 - Use tiles on-demand. r=pcwalton, snorp
Instead of tying the tile-buffer in MultiTileLayer directly to the back-buffer
of the page, make sure rendering is always aligned to the tile grid and use
tiles on-demand. This makes better use of tiles when panning/zooming, and opens
up the route for further optimisations.
2012-01-20 17:36:56 +00:00
Benjamin Smedberg
adc4ea281c Bug 715885 - Don't allow extensions to hook nsIDragService. r=roc 2012-01-19 17:48:18 -06:00
Benoit Girard ext:(%2C%20Ali%20Juma%20%3Cajuma%40mozilla.com%3E)
fdd5472876 Bug 711168 - Implement the compositor protocol for OMTC. r=cjones 2012-01-19 09:45:37 -05:00
Jeff Muizelaar
a47ca866d2 Bug 718440. Add more sampler labels to various places. r=bgirard
This shows the problems described in bug 710068.
2012-01-17 15:33:04 -05:00
James Willcox
43d0cd88c2 Bug 719233 - Only use direct texturing on whitelisted devices r=blassey 2012-01-18 20:41:28 -05:00
James Willcox
4e566ea4f6 Bug 718014 - Restrict dirty rect to subrect of tile texture
--HG--
extra : rebase_source : bbe56fd271b08e908eb301b5b0839a80bce139fb
2012-01-18 10:41:30 -05:00
Wes Johnston
72f42280fd Bug 603008 - Platform support for multitouch events. r=smaug
* * *
Bug 603008 - Platform support for multitouch events.
* * *
ifdefandroid
2011-12-16 16:24:11 -08:00
Michael Wu
f9eeb3e020 Bug 708191 - Don't draw when the screen is off on gonk, r=cjones 2012-01-17 02:55:25 -08:00
Michael Wu
82a8302a99 Bug 718631 - Fix Gonk build after bug 598482, r=cjones 2012-01-18 13:22:12 -08:00
Jeff Walden
461e38f5e8 Bug 704313 - Implement mozilla/StdInt.h. r=cjones
--HG--
extra : rebase_source : b221134fdfbde13a37a6ef621bba3ca183a46101
2011-11-22 17:42:57 -08:00
Kartikaya Gupta
d1129af956 Bug 688208 - Guard against accessing destroyed object [r=mfinkle]
The nsWindow for Android often dispatches events but doesn't check
for window destruction afterwards. Ensure that necessary destruction
checks and kungFuDeathGrips are in place to avoid accessing a
destroyed object.
2011-11-22 15:31:49 -05:00
Kartikaya Gupta
d509a9ad5c Bug 688208 - nsWindow should call super::OnDestroy [r=mfinkle] 2011-11-22 15:29:54 -05:00
Jim Mathies
a2c81afa5e Bug 684555, r=bbondy 2011-12-07 13:01:48 -06:00
Ed Morley
a2b9f740f0 Merge mozilla-central to mozilla-inbound 2011-12-07 09:39:26 +00:00
Oleg Romashin
91d92aa2c0 Bug 706935 - file upload on Meego Harmattan don't working. r=dougt 2011-12-06 19:29:58 -05:00
Martin Stransky
5afa9511b3 Bug 558742 - Comma doesn't work in print range, r=roc 2011-12-06 23:45:06 -05:00
Brad Lassey
ef43bddba9 merge birch to mozilla-central
--HG--
rename : embedding/android/GeckoBatteryManager.java => mobile/android/base/GeckoBatteryManager.java
2011-12-06 13:55:36 -05:00
Brad Lassey
7d13e8bf0b backout some changes we don't want to land from birch 2011-12-06 01:56:04 -05:00
Justin Lebar
15f78c78bd Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir 2011-12-05 01:07:00 +08:00
Doug Turner
9e4b0cbaeb merge with m-c 1900e3edd32d 2011-11-30 22:30:21 -08:00
Brad Lassey
558cf1a575 bug 706383 - Save screenshot in bundle, clean up old unused code r=dougt 2011-11-30 21:28:05 -05:00
Chris Lord
f7cb049db9 Bug 704575 - Union dirty rects instead of painting all of them. r=kats
In bug #703821 we disabled the squashing of multiple draw events, as it caused
corruption due to the dirty rects being ignored. Re-enable it, and union the
dirty rectangles to avoid this corruption.
2011-11-30 16:17:17 +00:00
Doug Turner
0a640468d8 Merge with mozilla-central 95bca70369ef
--HG--
rename : embedding/android/AndroidManifest.xml.in => mobile/android/base/AndroidManifest.xml.in
rename : embedding/android/GeckoApp.java => mobile/android/base/GeckoApp.java
rename : embedding/android/GeckoAppShell.java => mobile/android/base/GeckoAppShell.java
rename : embedding/android/GeckoEvent.java => mobile/android/base/GeckoEvent.java
rename : embedding/android/GeckoSmsManager.java => mobile/android/base/GeckoSmsManager.java
rename : embedding/android/Makefile.in => mobile/android/base/Makefile.in
2011-11-29 20:58:39 -08:00
Brad Lassey
e22e225291 bug 704217 - Quit doesn't work before Gecko is up r=dougt 2011-11-24 02:04:26 -05:00
Marco Bonardo
72eaf234fe Backout 407fba8cbd5a (bug 702256) for build failure on Windows. 2011-12-05 13:48:59 +01:00
Justin Lebar
e33d8ba71a Bug 702256 - "[Gonk] Add DOM API for turning screen on/off and adjusting the screen's brightness" r=cjones,mounir
--HG--
extra : rebase_source : 6c1f1b49d911e749da524266695e2f05d52900b2
2011-12-05 01:07:00 +08:00
Florian Quèze
b967e8551a Bug 697546 - Add a scriptable way to set a dock badge text. r=smichaud,josh 2011-12-05 10:57:45 +01:00
Lars Erdmann
3fde3c61e1 Bug 705454 - Loading of module PMMERGE to compute screen size is wrong. r=wuno 2011-12-05 10:55:01 +01:00
Makoto Kato
7ee469fe13 Bug 700234 - get rid of *WithConversion (widget part). r=roc 2011-12-05 18:10:27 +09:00
Doug Turner
387c79c13b Merge mozilla-central 0ea84b44a7f1 2011-11-23 12:29:40 -08:00
Lucas Rocha
e04df851b4 Bug 701374 - Add native method to check creation of fixup URIs (r=dougt)
--HG--
extra : rebase_source : fd623dc1db9b110f8f0085ca0377c29697331093
2011-11-23 09:48:00 -08:00
Doug Turner
cb49e80219 Merge with mozilla-central 6f998cc964be
--HG--
rename : embedding/android/GeckoApp.java => mobile/android/base/GeckoApp.java
2011-11-22 12:48:22 -08:00
Ed Morley
7869147d73 Merge last green changeset of mozilla-inbound to mozilla-central 2011-11-22 02:36:57 +00:00
Doug Turner
d67f26cb8a merge with mozilla-central ea5e1f4e996a 2011-11-18 21:46:09 -08:00
Patrick Walton
e396e42b71 Bug 703821 - Don't squash together draw events if the Java compositor is in use. r=dougt 2011-11-18 21:42:17 -08:00
Doug Turner
eac83076a0 merge with mozilla-central 2ab636cf01f3 2011-11-18 10:38:37 -08:00
Doug Turner
9d9e3291b0 Bug 0 - Moving embedding/android into mobile/android/base. r=mfinkle,blassey
--HG--
rename : embedding/android/AlertNotification.java => mobile/android/base/AlertNotification.java
rename : embedding/android/AndroidManifest.xml.in => mobile/android/base/AndroidManifest.xml.in
rename : embedding/android/App.java.in => mobile/android/base/App.java.in
rename : embedding/android/AwesomeBar.java => mobile/android/base/AwesomeBar.java
rename : embedding/android/AwesomeBarTabs.java => mobile/android/base/AwesomeBarTabs.java
rename : embedding/android/BrowserToolbar.java => mobile/android/base/BrowserToolbar.java
rename : embedding/android/ConfirmPreference.java => mobile/android/base/ConfirmPreference.java
rename : embedding/android/CrashReporter.java.in => mobile/android/base/CrashReporter.java.in
rename : embedding/android/DoorHanger.java => mobile/android/base/DoorHanger.java
rename : embedding/android/DoorHangerPopup.java => mobile/android/base/DoorHangerPopup.java
rename : embedding/android/Favicons.java => mobile/android/base/Favicons.java
rename : embedding/android/GeckoApp.java => mobile/android/base/GeckoApp.java
rename : embedding/android/GeckoAppShell.java => mobile/android/base/GeckoAppShell.java
rename : embedding/android/GeckoAsyncTask.java => mobile/android/base/GeckoAsyncTask.java
rename : embedding/android/GeckoBatteryManager.java => mobile/android/base/GeckoBatteryManager.java
rename : embedding/android/GeckoConnectivityReceiver.java => mobile/android/base/GeckoConnectivityReceiver.java
rename : embedding/android/GeckoEvent.java => mobile/android/base/GeckoEvent.java
rename : embedding/android/GeckoEventListener.java => mobile/android/base/GeckoEventListener.java
rename : embedding/android/GeckoInputConnection.java => mobile/android/base/GeckoInputConnection.java
rename : embedding/android/GeckoPreferences.java => mobile/android/base/GeckoPreferences.java
rename : embedding/android/GeckoStateListDrawable.java => mobile/android/base/GeckoStateListDrawable.java
rename : embedding/android/GeckoThread.java => mobile/android/base/GeckoThread.java
rename : embedding/android/GlobalHistory.java => mobile/android/base/GlobalHistory.java
rename : embedding/android/LauncherShortcuts.java.in => mobile/android/base/LauncherShortcuts.java.in
rename : embedding/android/Makefile.in => mobile/android/base/Makefile.in
rename : embedding/android/NotificationHandler.java.in => mobile/android/base/NotificationHandler.java.in
rename : embedding/android/PromptService.java => mobile/android/base/PromptService.java
rename : embedding/android/Restarter.java.in => mobile/android/base/Restarter.java.in
rename : embedding/android/SurfaceLockInfo.java => mobile/android/base/SurfaceLockInfo.java
rename : embedding/android/Tab.java => mobile/android/base/Tab.java
rename : embedding/android/Tabs.java => mobile/android/base/Tabs.java
rename : embedding/android/TabsTray.java => mobile/android/base/TabsTray.java
rename : embedding/android/gfx/BufferedCairoImage.java => mobile/android/base/gfx/BufferedCairoImage.java
rename : embedding/android/gfx/CairoImage.java => mobile/android/base/gfx/CairoImage.java
rename : embedding/android/gfx/CairoUtils.java => mobile/android/base/gfx/CairoUtils.java
rename : embedding/android/gfx/GeckoSoftwareLayerClient.java => mobile/android/base/gfx/GeckoSoftwareLayerClient.java
rename : embedding/android/gfx/InputConnectionHandler.java => mobile/android/base/gfx/InputConnectionHandler.java
rename : embedding/android/gfx/IntSize.java => mobile/android/base/gfx/IntSize.java
rename : embedding/android/gfx/Layer.java => mobile/android/base/gfx/Layer.java
rename : embedding/android/gfx/LayerClient.java => mobile/android/base/gfx/LayerClient.java
rename : embedding/android/gfx/LayerController.java => mobile/android/base/gfx/LayerController.java
rename : embedding/android/gfx/LayerRenderer.java => mobile/android/base/gfx/LayerRenderer.java
rename : embedding/android/gfx/LayerView.java => mobile/android/base/gfx/LayerView.java
rename : embedding/android/gfx/NinePatchTileLayer.java => mobile/android/base/gfx/NinePatchTileLayer.java
rename : embedding/android/gfx/PlaceholderLayerClient.java => mobile/android/base/gfx/PlaceholderLayerClient.java
rename : embedding/android/gfx/PointUtils.java => mobile/android/base/gfx/PointUtils.java
rename : embedding/android/gfx/RectUtils.java => mobile/android/base/gfx/RectUtils.java
rename : embedding/android/gfx/SingleTileLayer.java => mobile/android/base/gfx/SingleTileLayer.java
rename : embedding/android/gfx/TextLayer.java => mobile/android/base/gfx/TextLayer.java
rename : embedding/android/gfx/TextureReaper.java => mobile/android/base/gfx/TextureReaper.java
rename : embedding/android/gfx/TileLayer.java => mobile/android/base/gfx/TileLayer.java
rename : embedding/android/locales/Makefile.in => mobile/android/base/locales/Makefile.in
rename : embedding/android/locales/en-US/android_strings.dtd => mobile/android/base/locales/en-US/android_strings.dtd
rename : embedding/android/locales/jar.mn => mobile/android/base/locales/jar.mn
rename : embedding/android/locales/l10n.ini => mobile/android/base/locales/l10n.ini
rename : embedding/android/package-name.txt.in => mobile/android/base/package-name.txt.in
rename : embedding/android/resources/anim/grow_fade_in.xml => mobile/android/base/resources/anim/grow_fade_in.xml
rename : embedding/android/resources/anim/shrink_fade_out.xml => mobile/android/base/resources/anim/shrink_fade_out.xml
rename : embedding/android/resources/color/awesomebar_tab_text.xml => mobile/android/base/resources/color/awesomebar_tab_text.xml
rename : embedding/android/resources/drawable-hdpi-v11/address_bar_url_bg.9.png => mobile/android/base/resources/drawable-hdpi-v11/address_bar_url_bg.9.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_forward.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_reload.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_reload.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-hdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
rename : embedding/android/resources/drawable-hdpi-v11/tabs_more.png => mobile/android/base/resources/drawable-hdpi-v11/tabs_more.png
rename : embedding/android/resources/drawable-hdpi-v11/tabs_normal.png => mobile/android/base/resources/drawable-hdpi-v11/tabs_normal.png
rename : embedding/android/resources/drawable-hdpi-v11/tabs_plus.png => mobile/android/base/resources/drawable-hdpi-v11/tabs_plus.png
rename : embedding/android/resources/drawable-hdpi-v11/tabs_pressed.png => mobile/android/base/resources/drawable-hdpi-v11/tabs_pressed.png
rename : embedding/android/resources/drawable-hdpi-v8/address_bar_url_bg.9.png => mobile/android/base/resources/drawable-hdpi-v8/address_bar_url_bg.9.png
rename : embedding/android/resources/drawable-hdpi-v8/doorhanger_arrow.png => mobile/android/base/resources/drawable-hdpi-v8/doorhanger_arrow.png
rename : embedding/android/resources/drawable-hdpi-v8/doorhanger_bg.9.png => mobile/android/base/resources/drawable-hdpi-v8/doorhanger_bg.9.png
rename : embedding/android/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png => mobile/android/base/resources/drawable-hdpi-v8/doorhanger_popup_bg.9.png
rename : embedding/android/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png => mobile/android/base/resources/drawable-hdpi-v8/doorhanger_shadow_bg.9.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_forward.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_forward.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_reload.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_reload.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-hdpi-v8/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v8/ic_menu_share.png
rename : embedding/android/resources/drawable-hdpi-v8/site_security_lock.png => mobile/android/base/resources/drawable-hdpi-v8/site_security_lock.png
rename : embedding/android/resources/drawable-hdpi-v8/tabs_more.png => mobile/android/base/resources/drawable-hdpi-v8/tabs_more.png
rename : embedding/android/resources/drawable-hdpi-v8/tabs_normal.png => mobile/android/base/resources/drawable-hdpi-v8/tabs_normal.png
rename : embedding/android/resources/drawable-hdpi-v8/tabs_plus.png => mobile/android/base/resources/drawable-hdpi-v8/tabs_plus.png
rename : embedding/android/resources/drawable-hdpi-v8/tabs_pressed.png => mobile/android/base/resources/drawable-hdpi-v8/tabs_pressed.png
rename : embedding/android/resources/drawable-hdpi-v8/urlbar_stop.png => mobile/android/base/resources/drawable-hdpi-v8/urlbar_stop.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_forward.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_forward.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_reload.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_reload.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-hdpi-v9/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v9/ic_menu_share.png
rename : embedding/android/resources/drawable-mdpi-v11/address_bar_url_bg.9.png => mobile/android/base/resources/drawable-mdpi-v11/address_bar_url_bg.9.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_forward.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_reload.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_reload.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-mdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
rename : embedding/android/resources/drawable-mdpi-v11/tabs_more.png => mobile/android/base/resources/drawable-mdpi-v11/tabs_more.png
rename : embedding/android/resources/drawable-mdpi-v11/tabs_normal.png => mobile/android/base/resources/drawable-mdpi-v11/tabs_normal.png
rename : embedding/android/resources/drawable-mdpi-v11/tabs_plus.png => mobile/android/base/resources/drawable-mdpi-v11/tabs_plus.png
rename : embedding/android/resources/drawable-mdpi-v11/tabs_pressed.png => mobile/android/base/resources/drawable-mdpi-v11/tabs_pressed.png
rename : embedding/android/resources/drawable-mdpi-v8/address_bar_url_bg.9.png => mobile/android/base/resources/drawable-mdpi-v8/address_bar_url_bg.9.png
rename : embedding/android/resources/drawable-mdpi-v8/doorhanger_arrow.png => mobile/android/base/resources/drawable-mdpi-v8/doorhanger_arrow.png
rename : embedding/android/resources/drawable-mdpi-v8/doorhanger_bg.9.png => mobile/android/base/resources/drawable-mdpi-v8/doorhanger_bg.9.png
rename : embedding/android/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png => mobile/android/base/resources/drawable-mdpi-v8/doorhanger_popup_bg.9.png
rename : embedding/android/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png => mobile/android/base/resources/drawable-mdpi-v8/doorhanger_shadow_bg.9.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_forward.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_forward.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_reload.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_reload.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-mdpi-v8/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v8/ic_menu_share.png
rename : embedding/android/resources/drawable-mdpi-v8/site_security_lock.png => mobile/android/base/resources/drawable-mdpi-v8/site_security_lock.png
rename : embedding/android/resources/drawable-mdpi-v8/tabs_more.png => mobile/android/base/resources/drawable-mdpi-v8/tabs_more.png
rename : embedding/android/resources/drawable-mdpi-v8/tabs_normal.png => mobile/android/base/resources/drawable-mdpi-v8/tabs_normal.png
rename : embedding/android/resources/drawable-mdpi-v8/tabs_plus.png => mobile/android/base/resources/drawable-mdpi-v8/tabs_plus.png
rename : embedding/android/resources/drawable-mdpi-v8/tabs_pressed.png => mobile/android/base/resources/drawable-mdpi-v8/tabs_pressed.png
rename : embedding/android/resources/drawable-mdpi-v8/urlbar_stop.png => mobile/android/base/resources/drawable-mdpi-v8/urlbar_stop.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_forward.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_forward.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_reload.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_reload.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-mdpi-v9/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v9/ic_menu_share.png
rename : embedding/android/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png => mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_add.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_bookmark_remove.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_find_in_page.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_find_in_page.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_foward.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_foward.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_reload.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_reload.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png
rename : embedding/android/resources/drawable-xhdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
rename : embedding/android/resources/drawable-xhdpi-v11/tabs_more.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_more.png
rename : embedding/android/resources/drawable-xhdpi-v11/tabs_normal.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_normal.png
rename : embedding/android/resources/drawable-xhdpi-v11/tabs_plus.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_plus.png
rename : embedding/android/resources/drawable-xhdpi-v11/tabs_pressed.png => mobile/android/base/resources/drawable-xhdpi-v11/tabs_pressed.png
rename : embedding/android/resources/drawable/address_bar_bg.xml => mobile/android/base/resources/drawable/address_bar_bg.xml
rename : embedding/android/resources/drawable/address_bar_url_default.xml => mobile/android/base/resources/drawable/address_bar_url_default.xml
rename : embedding/android/resources/drawable/address_bar_url_pressed.xml => mobile/android/base/resources/drawable/address_bar_url_pressed.xml
rename : embedding/android/resources/drawable/awesomebar_tab_focus.xml => mobile/android/base/resources/drawable/awesomebar_tab_focus.xml
rename : embedding/android/resources/drawable/awesomebar_tab_focus_selected.xml => mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml
rename : embedding/android/resources/drawable/awesomebar_tab_indicator.xml => mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml
rename : embedding/android/resources/drawable/awesomebar_tab_press.xml => mobile/android/base/resources/drawable/awesomebar_tab_press.xml
rename : embedding/android/resources/drawable/awesomebar_tab_press_selected.xml => mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml
rename : embedding/android/resources/drawable/awesomebar_tab_selected.xml => mobile/android/base/resources/drawable/awesomebar_tab_selected.xml
rename : embedding/android/resources/drawable/awesomebar_tab_unselected.xml => mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml
rename : embedding/android/resources/drawable/checkerboard.png => mobile/android/base/resources/drawable/checkerboard.png
rename : embedding/android/resources/drawable/crash_reporter.png => mobile/android/base/resources/drawable/crash_reporter.png
rename : embedding/android/resources/drawable/desktop_notification.png => mobile/android/base/resources/drawable/desktop_notification.png
rename : embedding/android/resources/drawable/favicon.png => mobile/android/base/resources/drawable/favicon.png
rename : embedding/android/resources/drawable/progress_spinner.xml => mobile/android/base/resources/drawable/progress_spinner.xml
rename : embedding/android/resources/drawable/progress_spinner_1.png => mobile/android/base/resources/drawable/progress_spinner_1.png
rename : embedding/android/resources/drawable/progress_spinner_10.png => mobile/android/base/resources/drawable/progress_spinner_10.png
rename : embedding/android/resources/drawable/progress_spinner_11.png => mobile/android/base/resources/drawable/progress_spinner_11.png
rename : embedding/android/resources/drawable/progress_spinner_12.png => mobile/android/base/resources/drawable/progress_spinner_12.png
rename : embedding/android/resources/drawable/progress_spinner_13.png => mobile/android/base/resources/drawable/progress_spinner_13.png
rename : embedding/android/resources/drawable/progress_spinner_14.png => mobile/android/base/resources/drawable/progress_spinner_14.png
rename : embedding/android/resources/drawable/progress_spinner_15.png => mobile/android/base/resources/drawable/progress_spinner_15.png
rename : embedding/android/resources/drawable/progress_spinner_16.png => mobile/android/base/resources/drawable/progress_spinner_16.png
rename : embedding/android/resources/drawable/progress_spinner_17.png => mobile/android/base/resources/drawable/progress_spinner_17.png
rename : embedding/android/resources/drawable/progress_spinner_18.png => mobile/android/base/resources/drawable/progress_spinner_18.png
rename : embedding/android/resources/drawable/progress_spinner_2.png => mobile/android/base/resources/drawable/progress_spinner_2.png
rename : embedding/android/resources/drawable/progress_spinner_3.png => mobile/android/base/resources/drawable/progress_spinner_3.png
rename : embedding/android/resources/drawable/progress_spinner_4.png => mobile/android/base/resources/drawable/progress_spinner_4.png
rename : embedding/android/resources/drawable/progress_spinner_5.png => mobile/android/base/resources/drawable/progress_spinner_5.png
rename : embedding/android/resources/drawable/progress_spinner_6.png => mobile/android/base/resources/drawable/progress_spinner_6.png
rename : embedding/android/resources/drawable/progress_spinner_7.png => mobile/android/base/resources/drawable/progress_spinner_7.png
rename : embedding/android/resources/drawable/progress_spinner_8.png => mobile/android/base/resources/drawable/progress_spinner_8.png
rename : embedding/android/resources/drawable/progress_spinner_9.png => mobile/android/base/resources/drawable/progress_spinner_9.png
rename : embedding/android/resources/drawable/shadow.png => mobile/android/base/resources/drawable/shadow.png
rename : embedding/android/resources/drawable/site_security_level.xml => mobile/android/base/resources/drawable/site_security_level.xml
rename : embedding/android/resources/drawable/start.png => mobile/android/base/resources/drawable/start.png
rename : embedding/android/resources/drawable/tab_close.png => mobile/android/base/resources/drawable/tab_close.png
rename : embedding/android/resources/drawable/tab_new.png => mobile/android/base/resources/drawable/tab_new.png
rename : embedding/android/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml
rename : embedding/android/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml
rename : embedding/android/resources/drawable/tabs_tray_bg.9.png => mobile/android/base/resources/drawable/tabs_tray_bg.9.png
rename : embedding/android/resources/layout/awesomebar_header_row.xml => mobile/android/base/resources/layout/awesomebar_header_row.xml
rename : embedding/android/resources/layout/awesomebar_row.xml => mobile/android/base/resources/layout/awesomebar_row.xml
rename : embedding/android/resources/layout/awesomebar_search.xml => mobile/android/base/resources/layout/awesomebar_search.xml
rename : embedding/android/resources/layout/awesomebar_tab_indicator.xml => mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
rename : embedding/android/resources/layout/awesomebar_tabs.xml => mobile/android/base/resources/layout/awesomebar_tabs.xml
rename : embedding/android/resources/layout/browser_toolbar.xml => mobile/android/base/resources/layout/browser_toolbar.xml
rename : embedding/android/resources/layout/crash_reporter.xml => mobile/android/base/resources/layout/crash_reporter.xml
rename : embedding/android/resources/layout/doorhanger.xml => mobile/android/base/resources/layout/doorhanger.xml
rename : embedding/android/resources/layout/doorhangerpopup.xml => mobile/android/base/resources/layout/doorhangerpopup.xml
rename : embedding/android/resources/layout/gecko_app.xml => mobile/android/base/resources/layout/gecko_app.xml
rename : embedding/android/resources/layout/gecko_menu.xml => mobile/android/base/resources/layout/gecko_menu.xml
rename : embedding/android/resources/layout/launch_app_list.xml => mobile/android/base/resources/layout/launch_app_list.xml
rename : embedding/android/resources/layout/launch_app_listitem.xml => mobile/android/base/resources/layout/launch_app_listitem.xml
rename : embedding/android/resources/layout/list_item_header.xml => mobile/android/base/resources/layout/list_item_header.xml
rename : embedding/android/resources/layout/notification_icon_text.xml => mobile/android/base/resources/layout/notification_icon_text.xml
rename : embedding/android/resources/layout/notification_progress.xml => mobile/android/base/resources/layout/notification_progress.xml
rename : embedding/android/resources/layout/notification_progress_text.xml => mobile/android/base/resources/layout/notification_progress_text.xml
rename : embedding/android/resources/layout/select_dialog_list.xml => mobile/android/base/resources/layout/select_dialog_list.xml
rename : embedding/android/resources/layout/tabs_row.xml => mobile/android/base/resources/layout/tabs_row.xml
rename : embedding/android/resources/layout/tabs_tray.xml => mobile/android/base/resources/layout/tabs_tray.xml
rename : embedding/android/resources/values/arrays.xml => mobile/android/base/resources/values/arrays.xml
rename : embedding/android/resources/values/colors.xml => mobile/android/base/resources/values/colors.xml
rename : embedding/android/resources/values/styles.xml => mobile/android/base/resources/values/styles.xml
rename : embedding/android/resources/values/themes.xml => mobile/android/base/resources/values/themes.xml
rename : embedding/android/resources/xml/preferences.xml => mobile/android/base/resources/xml/preferences.xml
rename : embedding/android/strings.xml.in => mobile/android/base/strings.xml.in
rename : embedding/android/ui/PanZoomController.java => mobile/android/base/ui/PanZoomController.java
rename : embedding/android/ui/ViewportController.java => mobile/android/base/ui/ViewportController.java
2011-11-18 10:28:17 -08:00
Doug Turner
4bbb5acd71 merge from mozilla-central b62e6ee5ba9b 2011-11-17 15:49:43 -08:00
Doug Turner
38bd64c879 Bug 703057 - Put DrawToFile on another thread. r=blassey
--HG--
extra : rebase_source : f90ae83248da6b270baf8abbb873bdb89977d8fc
2011-11-16 14:32:44 -08:00
Doug Turner
408086068e Merge. 2011-11-15 01:09:26 -08:00
Doug Turner
a94842c06f Bug 701996 - Merge widget/src/android from birch back into mozilla-central. r=dougt/blassey 2011-11-14 19:12:14 -08:00
Doug Turner
17bde0d178 Bug xxxx - Followups to java compositor changes. review comments to widget/. r=dougt 2011-11-11 09:41:19 -08:00
Patrick Walton
4dcca0c378 Bug 695448 - Implement a Java compositor, and use it to scroll. r=? 2011-11-09 17:39:29 -08:00
Steven Michaud
c8380455ba Bug 704456 - Add null check to horizontal swipe tracking handler. r=mstange 2011-11-22 15:15:45 -06:00
Benjamin Smedberg
0082dc046f b=429592 disable hang monitor during GLib main loop poll f?bsmedberg r?roc
--HG--
extra : rebase_source : 6cc701723aa63e1ad2168dcdf7f8a3832c57ad5a
2011-11-14 11:07:42 -05:00
Benjamin Smedberg
43328ad940 Bug 429592 - Hook up more correct hang monitoring with Cocoa widgets to avoid false positives and negatives, r?smichaud
--HG--
extra : rebase_source : f553b5257a9a3310d2a0d64058d02bf041e7aab7
2011-11-11 16:13:36 -05:00
Justin Lebar
adcce83942 Bug 701716 - navigator.vibrate's Android backend is missing an AutoLocalJNIFrame. r=mwu 2011-11-11 11:11:41 -05:00
Marco Bonardo
8c72c90eb0 Merge mozilla-central and mozilla-inbound 2011-11-11 11:09:58 +01:00
Gregory Szorc
3c849fad59 Merge b-s to m-c 2011-11-10 15:15:29 -08:00