Commit Graph

15459 Commits

Author SHA1 Message Date
Phil Ringnalda
63e4c71a33 Merge m-i to m-c 2013-11-03 13:04:44 -08:00
Jim Mathies
88b99cb054 Backout cset 8ca9d85c1204 (bug 927172) due to viewport issues in metrofx. r=me 2013-11-02 16:41:46 -05:00
Gijs Kruitbosch
b035f59a74 Merge mozilla-central and ux 2013-11-02 11:33:53 +01:00
Gijs Kruitbosch
ad9e61fa26 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Ryan VanderMeulen
43eeed0ee4 Merge fx-team to m-c. 2013-11-01 14:51:36 -04:00
Gijs Kruitbosch
727205ff4e Merge mozilla-central and ux 2013-11-01 19:51:09 +01:00
Ed Morley
2153b816b9 Backed out changeset f24ee0606ea6 (bug 926128) for reftest failures on OS X & crashes on B2G on a CLOSED TREE 2013-11-01 15:51:32 +00:00
Gijs Kruitbosch
f298c06fde Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Ed Morley
febfa6a288 Merge mozilla-central and fx-team 2013-11-01 13:19:18 +00:00
Ed Morley
23e525166f Merge latest green b2g-inbound changeset and mozilla-central 2013-11-01 13:14:45 +00:00
Fabrice Desré
bd9859e505 Bug 914843 - fix gfx issue on oop b2g linux. r=nrc 2013-10-31 23:36:02 -07:00
Ryan VanderMeulen
da0792e78f Merge m-c to inbound on a CLOSED TREE. 2013-10-31 16:10:29 -04:00
Carsten "Tomcat" Book
3f22c5643c merge mozilla-central to mozilla-inbound 2013-11-06 14:55:48 +01:00
Jonathan Watt
a01c162997 Bug 866659 - Avoid bad cast in nsNativeTheme::IsRangeHorizontal. r=bz 2013-11-06 10:05:18 +00:00
Jim Mathies
45e93927a0 Bug 930995 - Display port should be set sync when the apz requests a repaint. r=kats 2013-11-01 05:09:37 -05:00
Jim Mathies
252b6230ff Bug 907635 - Move metro utils logging functions over to WinUtils. r=masayuki 2013-11-01 05:09:32 -05:00
Nathan Froyd
401d6b3706 Bug 933071 - add --with-macos-private-frameworks to support cross-compiling; r=mshal 2013-10-31 09:50:26 -04:00
Ryan VanderMeulen
1d57260a86 Merge m-c to inbound on a CLOSED TREE. 2013-10-30 22:42:13 -04:00
Ryan VanderMeulen
a4511eaf5f Merge b2g-inbound to m-c on a CLOSED TREE. 2013-10-30 22:36:56 -04:00
Rodrigo Silveira
336c93949d Bug 927172 - Can't touch scroll when second monitor is attached r=jimm
--HG--
extra : rebase_source : 9d583bda2e6def27f5f99c74481635dd79621179
2013-10-29 21:29:07 -07:00
Matt Brubeck
ee433d829f Bug 934750 - Don't cancel content touch events unless APZC consumes them [r=jimm,kats]
This is necessary for our "cross-slide" hack to work.  We need to send
input to both content and APZC until the input passes the pan threshold, so
that the start page can use touch events without disabling async panning.

In the long run we hope to use "touch-action: pan-x" for this and no longer
rely on this hack.
2013-11-06 12:06:46 -08:00
Rodrigo Silveira
a991caf336 Bug 927172 - Can't touch scroll when second monitor is attached r=jimm 2013-10-29 21:29:07 -07:00
Jim Mathies
ea27669bd6 Bug 933748 - Remove rotate and pinch simple gesture support from MetroInput. r=tabraldes 2013-11-01 12:45:38 -05:00
Jim Mathies
3abbfbace6 Bug 918273 - Add touch input target debugging to MetroInput. r=tabraldes 2013-11-01 12:45:30 -05:00
Jim Mathies
8d45d75289 Bug 931763 - Simplify handling of first touch start and touch move in MetroInput. r=tabraldes 2013-10-29 20:51:00 -05:00
Jim Mathies
1b4c5c5105 Bug 931504 - Fire touchcancel to content for every touch point the apz consumes. r=tabraldes 2013-10-29 20:51:00 -05:00
Wes Kocher
9e8ba0656b Backed out changeset 4a21dc77dad9 (bug 932280) for inexplicably breaking win7debug browser-chrome tests on a CLOSED TREE 2013-10-29 17:19:15 -07:00
Wes Kocher
aa27f88eb0 Merge m-c to inbound 2013-11-07 17:56:10 -08:00
Randell Jesup
53daa692c8 Bug 932112: Rollup of changes previously applied to media/webrtc/trunk/webrtc rs=jesup
* * *
* * *
Add AndroidAudioManager to the moz.build files.
2013-11-07 20:07:47 -05:00
Matt Brubeck
32a41e54f9 Bug 936005 - Allow chrome to cancel gesture recognition with preventDefault [r=jimm] 2013-11-07 13:13:24 -08:00
Jim Mathies
913257774e Bug 927033 - Dispatch touchcancel to APZC when content consumes touch input [r=mbrubeck] 2013-11-07 13:12:53 -08:00
Oleg Romashin
d6e4b452a3 Bug 932280 - [Qt] Move moc_ files to Makefile.in in order to pass existance check for autogenerated files. r=Ms2ger 2013-10-29 07:56:53 -07:00
Juan Gomez
a2c534847d Bug 931573 - Fix a crash in some gralloc's HAL implementation causing an unitialized pointer variable in FramebufferSurface. r=dhylands 2013-10-31 10:09:06 -04:00
Birunthan Mohanathas
02a1314689 Bug 784739 - Switch from NULL to nullptr in miscellaneous directories; r=ehsan 2013-11-11 14:17:14 -05:00
Ryan VanderMeulen
1e03d34ba6 Merge m-c to fx-team. 2013-11-07 14:49:21 -05:00
Kartikaya Gupta
be9f32efa9 Bug 927027 - Don't keep untransformed touch points in the touch list. r=jimm,tabraldes 2013-11-07 13:47:49 -05:00
Masayuki Nakano
5990ca0978 Bug 932168 Use simple IME context when focus field has focus (partially backing out a patch for bug 906072) r=karlt 2013-10-29 18:04:59 +09:00
Blake Kaplan
b313542a2b Bug 923961 - Force b2g-desktop to composite on OSX. r=mstange 2013-10-29 13:57:16 -07:00
Jeff Muizelaar
9a2df406b2 Bug 919454. Add a rule to catch broken StretchRect(). r=bjacob
--HG--
extra : rebase_source : f7f452eddbb114ac51c77f7fc3b895a954a2b37a
2013-11-07 10:22:08 -05:00
Ehsan Akhgari
96c519ebd6 Bug 938134 - Build widget/xpwidgets in unified mode; r=roc
--HG--
rename : widget/shared/WidgetUtils.cpp => widget/shared/SharedWidgetUtils.cpp
2013-11-17 14:03:55 -05:00
Chris Peterson
67bff2ec34 Bug 936989 - Fix -Wunused-variable warnings in nsIdleService.cpp. r=vladv 2013-10-27 23:12:55 -07:00
Nathan Froyd
f478d39678 Bug 918651 - part 7 - place includes intelligently in generated IPDL files; r=bent
This is where the magic starts to happen.  We move includes from the base
protocol header (${NAME}.h) to the parent and child headers (${NAME}Parent.h
and ${NAME}Child.h) to follow good include hygiene.

For the base protocol header, we examine the set of types used by struct and
union definitions to determine which headers we need to include.

For parent and child headers, we forward declare what we can and include
appropriate headers otherwise.  For forward-declared types, we include the
appropriate headers in the parent and child source files.
2013-10-01 12:55:42 -04:00
Wes Kocher
aed505ca19 Merge m-c to b2g-inbound 2013-11-11 16:19:56 -08:00
Michael Wu
30d37e6394 Bug 890186 - Assign charCodes on key events, r=fabrice 2013-11-11 18:19:04 -05:00
Daniel Holbert
e846bd6bb3 Bug 936628: Add media query to check for whether we have a color picker backend available. r=jimm 2013-11-10 19:07:59 -08:00
Mats Palmgren
9aa750b23b Bug 933260 - Honor the specified CSS width and height on <input type=checkbox/radio> also on Linux. r=karlt 2013-11-02 12:11:30 +00:00
Andreas Gal
6be862a938 Bug 926128 - Use a single configurable shader in OpenGL layers backend. r=vlad, r=nical 2013-11-01 09:29:20 -04:00
Jim Mathies
f62f18df95 Bug 933748 - Follow up to remove a couple of noisy LogFunction calls. r=nobug 2013-11-04 09:51:43 -06:00
Markus Stange
db3e318af6 Bug 934023 - Use the correct cell rect when drawing the window buttons. r=smichaud
--HG--
extra : rebase_source : 02a43c9e84c3f796bb8dc547734dc2169915ce86
2013-11-20 17:21:24 +01:00
Markus Stange
9161db21c9 Bug 923840 - Mark -moz-appearance:toolbar as opaque on Mac. r=roc
--HG--
extra : rebase_source : 6f7ba3357c3d24c6c273270b25627dcab8298d47
2013-11-20 17:20:51 +01:00
Kartikaya Gupta
45045d0c0b Bug 937843 - Make some things in APZCCallbackHelper const. r=botond 2013-11-13 13:22:34 -05:00
Kartikaya Gupta
31f4ad7953 Bug 937688 - Add a helper to APZCCallbackHelper to obtain the presShellId and viewId. r=botond 2013-11-13 13:20:29 -05:00
Kartikaya Gupta
c1c34fd9f8 Bug 937688 - Some small cosmetic changes to existing code. r=botond 2013-11-13 13:20:29 -05:00
Masayuki Nakano
5d9700ad8e Bug 930900 part.2 Fix event class names in test_assign_event_data.html r=smaug 2013-10-29 13:14:43 +09:00
Masayuki Nakano
ac184b22c5 Bug 930900 part.1 Add new key name index which means KeyboardEvent.key should refer stored string (not implemented yet) r=smaug 2013-10-29 13:14:42 +09:00
Masayuki Nakano
4c99fde530 Bug 930855 Replace WidgetEvent::Is*EventDerivedClass() with WidgetEvent::As*Event() r=smaug 2013-10-29 13:14:42 +09:00
Tim Stullich
c79864f037 Bug 722605 - AndroidGraphicBuffer whitelist uses linear search. r=snorp 2013-10-28 15:03:12 -05:00
James Willcox
e15535d63b Backed out changeset d79efecfad97
--HG--
extra : rebase_source : 4bc0cb740f5a666fa70a6095d1bb05f9d2ef06f5
2013-10-28 14:31:44 -05:00
Tim Stullich
4dc2eb329e Bug 722605 - AndroidGraphicBuffer whitelist uses linear search. r=snorp 2013-10-28 14:04:04 -05:00
Birunthan Mohanathas
28ba747e91 Bug 784739 - Switch from NULL to nullptr in widget/; r=ehsan 2013-10-28 10:05:51 -04:00
Masayuki Nakano
ce970f41ff Bug 930860 Move IsLeftClickEvent() and IsContextMenuKeyEvent() from WidgetEvent to WidgetMouseEvent(Base) r=smaug 2013-10-28 18:03:19 +09:00
Nicholas Nethercote
3b80765894 Bug 925584 - Remove some unnecessary jsapi.h inclusions from .cpp files. r=Ms2ger.
--HG--
extra : rebase_source : 41fcb0e922a519ef679c1c1b6293c2b638e83a48
2013-10-10 15:22:35 -07:00
Phil Ringnalda
780e2a2c5f Back out f872d288480b:9b86b4e60b29 (bug 929513) for failing to build on Windows
CLOSED TREE
2013-10-27 15:38:40 -07:00
David Zbarsky
031da49889 Bug 929513 Part 10: Convert ScreenSizeChanged to use gfx::IntSize r=nical 2013-10-27 17:53:28 -04:00
Cykesiopka
d2f6b7333c Bug 914270 - Part 1: Simple/Automated moves. r=joey 2013-10-24 18:51:00 +01:00
Carsten "Tomcat" Book
d7e4c57fbb Merge Fx-Team to Mozilla-Central 2013-10-25 11:21:15 +02:00
Mike Hommey
b000a846c2 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Jim Mathies
9c3ca8c604 Bug 930177 - Consolidate async scroll event handling with keyboard handling. r=tabraldes 2013-10-24 16:35:07 -05:00
Mike Hommey
59a17d0f20 Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Mike Hommey
3fa7456cd6 Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal 2013-10-24 08:00:23 +09:00
Carsten "Tomcat" Book
711eb0e2fe Merge Fx-team to Mozilla-Central 2013-10-23 14:49:38 +02:00
Rodrigo Silveira
fe065daf83 Bug 918225 - Right-click drop down options are offset r=mbrubeck,jimm 2013-10-22 17:30:19 -07:00
Wes Kocher
16d6e76b4e Merge inbound to m-c 2013-10-22 18:11:06 -04:00
Jim Mathies
357604de6e Bug 927979 - Register the gecko thread correctly in the profiler for FxMetro. r=bgirard 2013-10-22 08:30:06 -05:00
Masayuki Nakano
b285541889 Bug 602787 part.10 Create TextRange.h for separating TextEvents.h r=roc 2013-10-22 22:27:36 +09:00
Masayuki Nakano
f135c17228 Bug 602787 part.9 Don't implement methods which need BasicEvents.h or TextEvents.h in windows/KeyboardLayout.h r=jimm 2013-10-22 22:27:36 +09:00
Masayuki Nakano
e73dea32d8 Bug 602787 part.8 Don't implement nsWindowBase::DispatchPluginEvent() in windows/nsWindowBase.h r=jimm 2013-10-22 22:27:35 +09:00
Masayuki Nakano
601b8b99ef Bug 602787 part.7 Don't implement methods which use Widget*Event in qt/nsWindow.h r=romaxa 2013-10-22 22:27:35 +09:00
Masayuki Nakano
549327a157 Bug 602787 part.6 Use EventForwards.h in gtk/nsWindow.h r=karlt 2013-10-22 22:27:35 +09:00
Masayuki Nakano
7811d5c344 Bug 602787 part.2 Don't implement nsIWidgetListener in its header file r=roc 2013-10-22 22:27:34 +09:00
Markus Stange
3720087dda Bug 886999 - Wait until composition has finished before tearing down our NSView. r=mattwoodrow 2013-10-09 10:39:23 -04:00
Markus Stange
c5d89cc8ca Bug 886999 - Lock the GL context before compositing on the compositor thread or before calling setView or update on the main thread. r=mattwoodrow 2013-10-09 10:39:23 -04:00
Markus Stange
61c19b2081 Bug 914437 - Also refuse to render when our view is not attached to a window. r=mattwoodrow 2013-10-09 10:39:23 -04:00
Markus Stange
7c09b8eb8a Bug 886999 - Only call setView and update on the GL context when necessary. r=mattwoodrow 2013-10-09 10:39:22 -04:00
Markus Stange
52cd1d3bda Bug 923133 - Remove unneeded main thread GL context management in -[ChildView lockFocus]. r=mattwoodrow 2013-10-09 10:39:22 -04:00
Markus Stange
14e8e85cab Bug 914437 - Don't composite windows that are not open. r=mattwoodrow 2013-10-09 10:39:22 -04:00
Masayuki Nakano
c2d6606a1c Bug 920425 part.28 Use mozilla::WidgetEvent::AsMouseEvent() r=smaug 2013-10-22 17:55:20 +09:00
David Anderson
fc34a69277 Fix resize jank on Linux with OMTC (bug 926618, r=mattwoodrow). 2013-10-21 13:14:47 -07:00
Arnaud Bienner
1db6f7c6cc Bug 917917 - Make the Gtk color picker modal. r=karlt 2013-10-20 23:44:55 +02:00
Phil Ringnalda
c4652f43ed Merge f-t to m-c 2013-10-19 18:52:09 -07:00
Ryan VanderMeulen
16895bd84d Merge m-c to fx-team. 2013-10-18 15:41:57 -04:00
Jim Mathies
213f73a38a Bug 928157 - Fix for swipe gestures triggering scrollbars on the start tab. r=tabraldes 2013-10-18 12:33:52 -05:00
Peter Chang
f2befa9556 Bug 922510 - Extend GonkNativeWindow to support android JB 4.2.2, r=sotaro,gps 2013-10-18 10:42:43 +08:00
Masayuki Nakano
92e611a583 Bug 920425 part.27 Use mozilla::WidgetEvent::AsInputEvent() r=smaug 2013-10-18 15:10:26 +09:00
Masayuki Nakano
87eb530a19 Bug 920425 part.26 Use mozilla::WidgetEvent::AsMouseEventBase() r=smaug 2013-10-18 15:10:26 +09:00
Masayuki Nakano
21f49f071d Bug 920425 part.22 Use mozilla::WidgetEvent::AsSelectionEvent() r=smaug 2013-10-18 15:10:25 +09:00
Masayuki Nakano
d9506a35f8 Bug 920425 part.20 Use mozilla::WidgetEvent::AsCompositionEvent() r=smaug 2013-10-18 15:10:25 +09:00
Masayuki Nakano
be61dffd74 Bug 920425 part.19 Use mozilla::WidgetEvent::AsTextEvent() r=smaug 2013-10-18 15:10:24 +09:00
Masayuki Nakano
fbe6c7ac3e Bug 920425 part.18 Use mozilla::WidgetEvent::AsKeyboardEvent() r=smaug 2013-10-18 15:10:24 +09:00
Masayuki Nakano
113d2cb05c Bug 920425 part.2 Implement mozilla::WidgetEvent::As*Event() methods r=roc 2013-10-18 15:10:20 +09:00
Masayuki Nakano
93a8575635 Bug 920425 part.1 Create widget/EventClassList.h r=roc 2013-10-18 15:10:20 +09:00
Ehsan Akhgari
0c07e88a8b Bug 928041 - Remove some prtypes.h inclusions from widget/; r=roc 2013-10-18 00:11:58 -04:00
Vladimir Vukicevic
bf3132c6d2 b=927727; support OpenGL OMTC layers on Windows; r=bgirard 2013-10-17 00:16:40 -04:00
Masayuki Nakano
7bcf047f5b Bug 600117 part.8 Implement KeyboardEvent.repeat on GTK r=karlt 2013-11-07 20:17:34 +09:00
Masayuki Nakano
41ab6ff98c Bug 600117 part.7 Implement KeyboardEvent.repeat on Qt r=romaxa 2013-11-07 20:17:33 +09:00
Masayuki Nakano
9bb2a5bd9a Bug 600117 part.6 Implement KeyboardEvent.repeat on OS/2 r=daveryeo 2013-11-07 20:17:33 +09:00
Masayuki Nakano
de3fb19ddd Bug 600117 part.5 Implement KeyboardEvent.repeat on Gonk r=mwu 2013-11-07 20:17:33 +09:00
Masayuki Nakano
7448bd613c Bug 600117 part.4 Implement KeyboardEvent.repeat on Android r=nchen 2013-11-07 20:17:33 +09:00
Masayuki Nakano
10e9175c49 Bug 600117 part.3 Implement KeyboardEvent.repeat on Mac r=smichaud 2013-11-07 20:17:33 +09:00
Masayuki Nakano
193fd83275 Bug 600117 part.2 Implement KeyboardEvent.repeat on Windows r=jimm 2013-11-07 20:17:32 +09:00
Masayuki Nakano
0070ecb340 Bug 600117 part.1 Implement KeyboardEvent.repeat r=smaug, sr=jst 2013-11-07 20:17:32 +09:00
Allison Naaktgeboren
659e5ac146 Bug 895581 Double tap should zoom content instead of selecting text.r=mbrubeck 2013-11-18 23:13:05 -08:00
Matt Brubeck
30a8cf94ed Bug 936754 - Fire dblclick event for double-taps in Metro.r=jimm 2013-11-18 23:13:05 -08:00
Mark Finkle
24dbdc00cd Backout 86253e0141c8 to avoid cross-branch merge isses from fx-team and bug 913985 2013-11-18 23:52:01 -05:00
Mark Finkle
462cd597b5 Bug 939680 - Implement nsINetworkLinkService.linkType on Android r=blassey 2013-11-18 23:43:09 -05:00
Mike Hommey
5e41d2d75c Bug 932197 - Put QT generated files in GENERATED_SOURCES. r=gps 2013-11-01 10:30:45 +09:00
Markus Stange
454295facd Bug 851652 - Change position of the standardWindowButtons for Australis [r=smichaud r=mnoorenberghe+bmo r=jaws r=roc]
--HG--
extra : rebase_source : 4936bfc62a4712871caa5d767b1dd2e496e0826c
2013-06-12 23:42:00 +02:00
Gijs Kruitbosch
a7d75a9eb1 Merge mozilla-central and ux 2013-10-29 17:23:48 +01:00
Gijs Kruitbosch
97c232392f Merge mozilla-central and ux 2013-10-29 09:07:46 +01:00
Gijs Kruitbosch
48b73406da Merge mozilla-central and ux 2013-10-28 23:41:12 +01:00
Gijs Kruitbosch
686af64168 Merge m-c to ux 2013-10-28 10:18:27 +01:00
Gijs Kruitbosch
aceea3dc8b merge m-c to UX 2013-10-27 21:18:18 +01:00
Gijs Kruitbosch
d3774ed08c Merge m-c to ux 2013-10-25 11:45:31 +02:00
Gijs Kruitbosch
0aa036514a Merge mozilla-central and ux 2013-10-25 10:23:03 +02:00
Gijs Kruitbosch
7af76e1cdc Merge mozilla-central and ux 2013-10-24 10:18:26 +02:00
Gijs Kruitbosch
0dcf8beb08 Merge mozilla-central and ux 2013-10-23 15:41:02 +02:00
Gijs Kruitbosch
cf532beaaa Merge mozilla-central and ux 2013-10-23 00:37:14 +02:00
Gijs Kruitbosch
ef9057f594 Merge mozilla-central and ux 2013-10-22 10:34:17 +02:00
Mike Conley
e4e1d0f7e2 Automated merge with https://hg.mozilla.org/mozilla-central 2013-10-19 21:58:39 -04:00
Gijs Kruitbosch
b16f361a83 Merge mozilla-central and ux 2013-10-19 12:28:13 +02:00
Gijs Kruitbosch
9e08212619 Merge mozilla-central and ux 2013-10-17 13:48:43 +02:00
Gijs Kruitbosch
6ad1150e33 Merge mozilla-central and ux 2013-10-16 23:24:59 +02:00
Ryan VanderMeulen
044738c1a0 Merge b2g-inbound to m-c. 2013-10-16 17:01:40 -04:00
Ryan VanderMeulen
9d5f8da860 Merge fx-team to m-c. 2013-10-16 17:00:57 -04:00
Jim Mathies
42e157ed18 Bug 917385 - Move precise/imprecise input tracking down to widget thus making it more reliable with apz enabled. r=tabraldes, mbrubeck 2013-10-16 12:14:55 -05:00
Sushil Chauhan
00e8b12999 Bug 920654 - Enable plane alpha support for HWC layers in newer H/W Composer. r=mwu, r=dwilson 2013-10-15 15:37:13 -07:00
Sushil Chauhan
2217191e09 Bug 915729 - Add mixed HWC and GPU Composition. r=ncameron, r=dwilson 2013-10-15 14:01:42 -07:00
Gijs Kruitbosch
3f4d9d7b7e Merge mozilla-central and ux 2013-10-16 13:15:41 +02:00
Gijs Kruitbosch
2f4b343115 Merge mozilla-central and ux 2013-10-15 15:37:45 +02:00
Matt Woodrow
b30699f56f Bug 922942 - Use Moz2D for android snapshots. r=roc 2013-10-15 16:23:20 +13:00
Gijs Kruitbosch
a5d4fcfa22 Merge m-c to ux 2013-10-13 23:58:05 +02:00
Matt Woodrow
12137347af Bug 923542 - Draw to the correct destination rect when computing alpha masks. r=ajones 2013-10-15 14:55:15 +13:00
Mina Almasry
a4c51500ad Bug 698437 - Allow spatial navigation with directional controller. r=kats 2013-10-12 13:59:50 -04:00
Gijs Kruitbosch
b4a7a6d253 Merge mozilla-central and ux 2013-10-11 10:08:05 +02:00
Gijs Kruitbosch
cf76828190 Merge mozilla-central and ux 2013-10-10 20:23:18 +02:00
Steven Michaud
9c2b8c282f Bug 925411 - Temporarily backout patch for bug 868646 for causing this bug. r=spohl 2013-10-10 16:22:02 -05:00
Birunthan Mohanathas
ffe5416a8e Bug 784739 - Switch from NULL to nullptr in widget/android/; r=ehsan 2013-10-10 16:42:52 -04:00
Ehsan Akhgari
bb7810ceea Bug 924019 - Do not assume that PRUnichar and UniChar/unichar are the same type; r=smichaud 2013-10-10 12:59:40 -04:00
Gijs Kruitbosch
e6d6f1269e Merge mozilla-central and ux 2013-10-10 09:27:14 +02:00
Ryan VanderMeulen
c430ecd99d Merge m-c to inbound.
CLOSED TREE
2013-10-09 15:34:02 -04:00