Commit Graph

7419 Commits

Author SHA1 Message Date
Gijs Kruitbosch
2312eb362b Merge mozilla-central and ux 2013-11-02 11:33:53 +01:00
Gijs Kruitbosch
63530f7b09 Merge mozilla-central and ux 2013-11-01 23:24:47 +01:00
Ryan VanderMeulen
74df168528 Merge fx-team to m-c. 2013-11-01 14:51:36 -04:00
Gijs Kruitbosch
98d35e6ed5 Merge mozilla-central and ux 2013-11-01 19:51:09 +01:00
Ed Morley
b0b384ebfc 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
a13ed4741f Merge mozilla-central and ux 2013-11-01 09:20:15 +01:00
Ed Morley
a4072422f1 Merge mozilla-central and fx-team 2013-11-01 13:19:18 +00:00
Ed Morley
a5ba3dddeb Merge latest green b2g-inbound changeset and mozilla-central 2013-11-01 13:14:45 +00:00
Fabrice Desré
1d9cff071b Bug 914843 - fix gfx issue on oop b2g linux. r=nrc 2013-10-31 23:36:02 -07:00
Ryan VanderMeulen
1e3f5ba856 Merge m-c to inbound on a CLOSED TREE. 2013-10-31 16:10:29 -04:00
Carsten "Tomcat" Book
12456cd937 merge mozilla-central to mozilla-inbound 2013-11-06 14:55:48 +01:00
Jonathan Watt
0d6ce00781 Bug 866659 - Avoid bad cast in nsNativeTheme::IsRangeHorizontal. r=bz 2013-11-06 10:05:18 +00:00
Jim Mathies
eba45acefb 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
169a6e38df Bug 907635 - Move metro utils logging functions over to WinUtils. r=masayuki 2013-11-01 05:09:32 -05:00
Nathan Froyd
3879d8a3ee Bug 933071 - add --with-macos-private-frameworks to support cross-compiling; r=mshal 2013-10-31 09:50:26 -04:00
Ryan VanderMeulen
b3ebc15f66 Merge m-c to inbound on a CLOSED TREE. 2013-10-30 22:42:13 -04:00
Ryan VanderMeulen
abd2954c9f Merge b2g-inbound to m-c on a CLOSED TREE. 2013-10-30 22:36:56 -04:00
Rodrigo Silveira
8b610b8339 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
c8ae5cbe5d 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
62c8486192 Bug 927172 - Can't touch scroll when second monitor is attached r=jimm 2013-10-29 21:29:07 -07:00
Jim Mathies
ae9375a41d Bug 933748 - Remove rotate and pinch simple gesture support from MetroInput. r=tabraldes 2013-11-01 12:45:38 -05:00
Jim Mathies
0e3dfd1e00 Bug 918273 - Add touch input target debugging to MetroInput. r=tabraldes 2013-11-01 12:45:30 -05:00
Jim Mathies
8db51f7e62 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
f965af767b 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
6c5eeabba0 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
7d7395860e Merge m-c to inbound 2013-11-07 17:56:10 -08:00
Randell Jesup
52771d4abf 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
1839307160 Bug 936005 - Allow chrome to cancel gesture recognition with preventDefault [r=jimm] 2013-11-07 13:13:24 -08:00
Jim Mathies
3bbefc16dd Bug 927033 - Dispatch touchcancel to APZC when content consumes touch input [r=mbrubeck] 2013-11-07 13:12:53 -08:00
Oleg Romashin
01fd808ef1 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
89d161b5c1 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
58a91e67d8 Bug 784739 - Switch from NULL to nullptr in miscellaneous directories; r=ehsan 2013-11-11 14:17:14 -05:00
Ryan VanderMeulen
8a61b50bc9 Merge m-c to fx-team. 2013-11-07 14:49:21 -05:00
Kartikaya Gupta
4fdf8f87b9 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
ca6539f2a1 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
54ac8e3135 Bug 923961 - Force b2g-desktop to composite on OSX. r=mstange 2013-10-29 13:57:16 -07:00
Jeff Muizelaar
6e0332f3e8 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
28945cc676 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
4d0e3ba7a3 Bug 936989 - Fix -Wunused-variable warnings in nsIdleService.cpp. r=vladv 2013-10-27 23:12:55 -07:00
Nathan Froyd
86db9223fa 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
6ebb2651ba Merge m-c to b2g-inbound 2013-11-11 16:19:56 -08:00
Michael Wu
38931e9196 Bug 890186 - Assign charCodes on key events, r=fabrice 2013-11-11 18:19:04 -05:00
Daniel Holbert
f7383bedda 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
7d84fb168e 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
07faf96a6d 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
c703710c2f Bug 933748 - Follow up to remove a couple of noisy LogFunction calls. r=nobug 2013-11-04 09:51:43 -06:00
Markus Stange
7252b25018 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
6e7ce5d9af 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
2cd58faebc Bug 937843 - Make some things in APZCCallbackHelper const. r=botond 2013-11-13 13:22:34 -05:00
Kartikaya Gupta
bc389873b6 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
8b6dd7fcb5 Bug 937688 - Some small cosmetic changes to existing code. r=botond 2013-11-13 13:20:29 -05:00
Masayuki Nakano
17ce24d4dd 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
f531a41e2f 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
33786fae4e Bug 930855 Replace WidgetEvent::Is*EventDerivedClass() with WidgetEvent::As*Event() r=smaug 2013-10-29 13:14:42 +09:00
Tim Stullich
baaf4c4b13 Bug 722605 - AndroidGraphicBuffer whitelist uses linear search. r=snorp 2013-10-28 15:03:12 -05:00
James Willcox
681bbaf832 Backed out changeset d79efecfad97
--HG--
extra : rebase_source : 4bc0cb740f5a666fa70a6095d1bb05f9d2ef06f5
2013-10-28 14:31:44 -05:00
Tim Stullich
6b8295b38e Bug 722605 - AndroidGraphicBuffer whitelist uses linear search. r=snorp 2013-10-28 14:04:04 -05:00
Birunthan Mohanathas
a200d5d674 Bug 784739 - Switch from NULL to nullptr in widget/; r=ehsan 2013-10-28 10:05:51 -04:00
Masayuki Nakano
16d3cdfc12 Bug 930860 Move IsLeftClickEvent() and IsContextMenuKeyEvent() from WidgetEvent to WidgetMouseEvent(Base) r=smaug 2013-10-28 18:03:19 +09:00
Nicholas Nethercote
ba1e9bce90 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
a1f80ad10b Back out f872d288480b:9b86b4e60b29 (bug 929513) for failing to build on Windows
CLOSED TREE
2013-10-27 15:38:40 -07:00
David Zbarsky
2efa410faa Bug 929513 Part 10: Convert ScreenSizeChanged to use gfx::IntSize r=nical 2013-10-27 17:53:28 -04:00
Cykesiopka
a3710e5c11 Bug 914270 - Part 1: Simple/Automated moves. r=joey 2013-10-24 18:51:00 +01:00
Carsten "Tomcat" Book
f19f416288 Merge Fx-Team to Mozilla-Central 2013-10-25 11:21:15 +02:00
Mike Hommey
1d566f7586 Bug 929905 - Consolidate sources in moz.build. r=gps 2013-10-25 08:23:05 +09:00
Jim Mathies
6f1261f4e1 Bug 930177 - Consolidate async scroll event handling with keyboard handling. r=tabraldes 2013-10-24 16:35:07 -05:00
Mike Hommey
61124c1afc Bug 921492 - Make StrictOrderingOnAppendList use actual alphabetical sorting. r=mshal,r=gps 2013-10-24 08:05:43 +09:00
Mike Hommey
e2ae65f67a Bug 913268 - Make CPP_SOURCES a StrictOrderingOnAppendList. r=mshal 2013-10-24 08:00:23 +09:00
Carsten "Tomcat" Book
d6f8ae99e9 Merge Fx-team to Mozilla-Central 2013-10-23 14:49:38 +02:00
Rodrigo Silveira
4f84b94327 Bug 918225 - Right-click drop down options are offset r=mbrubeck,jimm 2013-10-22 17:30:19 -07:00
Wes Kocher
abc9a053f3 Merge inbound to m-c 2013-10-22 18:11:06 -04:00
Jim Mathies
1cafa0210f Bug 927979 - Register the gecko thread correctly in the profiler for FxMetro. r=bgirard 2013-10-22 08:30:06 -05:00
Masayuki Nakano
15be48ff2e Bug 602787 part.10 Create TextRange.h for separating TextEvents.h r=roc 2013-10-22 22:27:36 +09:00
Masayuki Nakano
cfb1d04a6c 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
6d0b7bb736 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
4f6130396e 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
6ecca6e2e5 Bug 602787 part.6 Use EventForwards.h in gtk/nsWindow.h r=karlt 2013-10-22 22:27:35 +09:00
Masayuki Nakano
e06e08ecad Bug 602787 part.2 Don't implement nsIWidgetListener in its header file r=roc 2013-10-22 22:27:34 +09:00
Markus Stange
0b3685fead Bug 886999 - Wait until composition has finished before tearing down our NSView. r=mattwoodrow 2013-10-09 10:39:23 -04:00
Markus Stange
d07e924a75 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
26514642ad 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
b241a49105 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
250234dfb9 Bug 923133 - Remove unneeded main thread GL context management in -[ChildView lockFocus]. r=mattwoodrow 2013-10-09 10:39:22 -04:00
Markus Stange
b13425b166 Bug 914437 - Don't composite windows that are not open. r=mattwoodrow 2013-10-09 10:39:22 -04:00
Masayuki Nakano
40483897f3 Bug 920425 part.28 Use mozilla::WidgetEvent::AsMouseEvent() r=smaug 2013-10-22 17:55:20 +09:00
David Anderson
6ccb791a64 Fix resize jank on Linux with OMTC (bug 926618, r=mattwoodrow). 2013-10-21 13:14:47 -07:00
Arnaud Bienner
4a20af3579 Bug 917917 - Make the Gtk color picker modal. r=karlt 2013-10-20 23:44:55 +02:00
Phil Ringnalda
5a88b3ad4a Merge f-t to m-c 2013-10-19 18:52:09 -07:00
Ryan VanderMeulen
08697c95b4 Merge m-c to fx-team. 2013-10-18 15:41:57 -04:00
Jim Mathies
8aa06f6035 Bug 928157 - Fix for swipe gestures triggering scrollbars on the start tab. r=tabraldes 2013-10-18 12:33:52 -05:00
Peter Chang
4290a36c9a Bug 922510 - Extend GonkNativeWindow to support android JB 4.2.2, r=sotaro,gps 2013-10-18 10:42:43 +08:00
Masayuki Nakano
ef2ba2f3e7 Bug 920425 part.27 Use mozilla::WidgetEvent::AsInputEvent() r=smaug 2013-10-18 15:10:26 +09:00
Masayuki Nakano
e872789a92 Bug 920425 part.26 Use mozilla::WidgetEvent::AsMouseEventBase() r=smaug 2013-10-18 15:10:26 +09:00
Masayuki Nakano
73393acc11 Bug 920425 part.22 Use mozilla::WidgetEvent::AsSelectionEvent() r=smaug 2013-10-18 15:10:25 +09:00
Masayuki Nakano
97c0a3e332 Bug 920425 part.20 Use mozilla::WidgetEvent::AsCompositionEvent() r=smaug 2013-10-18 15:10:25 +09:00
Masayuki Nakano
5e19b1e59b Bug 920425 part.19 Use mozilla::WidgetEvent::AsTextEvent() r=smaug 2013-10-18 15:10:24 +09:00
Masayuki Nakano
ef196343d5 Bug 920425 part.18 Use mozilla::WidgetEvent::AsKeyboardEvent() r=smaug 2013-10-18 15:10:24 +09:00
Masayuki Nakano
452744c70c Bug 920425 part.2 Implement mozilla::WidgetEvent::As*Event() methods r=roc 2013-10-18 15:10:20 +09:00
Masayuki Nakano
47b4d7ee54 Bug 920425 part.1 Create widget/EventClassList.h r=roc 2013-10-18 15:10:20 +09:00
Ehsan Akhgari
4c70bce7c3 Bug 928041 - Remove some prtypes.h inclusions from widget/; r=roc 2013-10-18 00:11:58 -04:00
Vladimir Vukicevic
ec836bccf2 b=927727; support OpenGL OMTC layers on Windows; r=bgirard 2013-10-17 00:16:40 -04:00
Masayuki Nakano
9daea3e47d Bug 600117 part.8 Implement KeyboardEvent.repeat on GTK r=karlt 2013-11-07 20:17:34 +09:00
Masayuki Nakano
85da5e6a03 Bug 600117 part.7 Implement KeyboardEvent.repeat on Qt r=romaxa 2013-11-07 20:17:33 +09:00
Masayuki Nakano
b8abd43bf8 Bug 600117 part.6 Implement KeyboardEvent.repeat on OS/2 r=daveryeo 2013-11-07 20:17:33 +09:00
Masayuki Nakano
0c8f5605d8 Bug 600117 part.5 Implement KeyboardEvent.repeat on Gonk r=mwu 2013-11-07 20:17:33 +09:00
Masayuki Nakano
c04601249a Bug 600117 part.4 Implement KeyboardEvent.repeat on Android r=nchen 2013-11-07 20:17:33 +09:00
Masayuki Nakano
f5ea2a922c Bug 600117 part.3 Implement KeyboardEvent.repeat on Mac r=smichaud 2013-11-07 20:17:33 +09:00
Masayuki Nakano
f0fc1b27ae Bug 600117 part.2 Implement KeyboardEvent.repeat on Windows r=jimm 2013-11-07 20:17:32 +09:00
Masayuki Nakano
94dd316fd4 Bug 600117 part.1 Implement KeyboardEvent.repeat r=smaug, sr=jst 2013-11-07 20:17:32 +09:00
Allison Naaktgeboren
b5d0411402 Bug 895581 Double tap should zoom content instead of selecting text.r=mbrubeck 2013-11-18 23:13:05 -08:00
Matt Brubeck
5205e58f56 Bug 936754 - Fire dblclick event for double-taps in Metro.r=jimm 2013-11-18 23:13:05 -08:00
Mark Finkle
61fb8d46c5 Backout 86253e0141c8 to avoid cross-branch merge isses from fx-team and bug 913985 2013-11-18 23:52:01 -05:00
Mark Finkle
d13e52dceb Bug 939680 - Implement nsINetworkLinkService.linkType on Android r=blassey 2013-11-18 23:43:09 -05:00
Mike Hommey
d56e743f1b Bug 932197 - Put QT generated files in GENERATED_SOURCES. r=gps 2013-11-01 10:30:45 +09:00
Markus Stange
f2115d6bbf 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
e9c0b9a2ba Merge mozilla-central and ux 2013-10-29 17:23:48 +01:00
Gijs Kruitbosch
ef17a5ed9f Merge mozilla-central and ux 2013-10-29 09:07:46 +01:00
Gijs Kruitbosch
22c6a04002 Merge mozilla-central and ux 2013-10-28 23:41:12 +01:00
Gijs Kruitbosch
940ab43e16 Merge m-c to ux 2013-10-28 10:18:27 +01:00
Gijs Kruitbosch
ce93f74110 merge m-c to UX 2013-10-27 21:18:18 +01:00
Gijs Kruitbosch
ca3e353986 Merge m-c to ux 2013-10-25 11:45:31 +02:00
Gijs Kruitbosch
b05750dcee Merge mozilla-central and ux 2013-10-25 10:23:03 +02:00
Gijs Kruitbosch
169105946a Merge mozilla-central and ux 2013-10-24 10:18:26 +02:00
Gijs Kruitbosch
ce4da8edb8 Merge mozilla-central and ux 2013-10-23 15:41:02 +02:00
Gijs Kruitbosch
b3de82cf5d Merge mozilla-central and ux 2013-10-23 00:37:14 +02:00
Gijs Kruitbosch
de9ce9d493 Merge mozilla-central and ux 2013-10-22 10:34:17 +02:00
Mike Conley
47f24916ac Automated merge with https://hg.mozilla.org/mozilla-central 2013-10-19 21:58:39 -04:00
Gijs Kruitbosch
a8896f14d4 Merge mozilla-central and ux 2013-10-19 12:28:13 +02:00
Gijs Kruitbosch
19083f9692 Merge mozilla-central and ux 2013-10-17 13:48:43 +02:00
Gijs Kruitbosch
d4bd26596b Merge mozilla-central and ux 2013-10-16 23:24:59 +02:00
Ryan VanderMeulen
2bd7718b9a Merge b2g-inbound to m-c. 2013-10-16 17:01:40 -04:00
Ryan VanderMeulen
5ea6eb0b72 Merge fx-team to m-c. 2013-10-16 17:00:57 -04:00
Jim Mathies
5c86824164 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
ee28fb74fe 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
8df8a608bb Bug 915729 - Add mixed HWC and GPU Composition. r=ncameron, r=dwilson 2013-10-15 14:01:42 -07:00
Gijs Kruitbosch
7bfb0d8a76 Merge mozilla-central and ux 2013-10-16 13:15:41 +02:00
Gijs Kruitbosch
841c32e084 Merge mozilla-central and ux 2013-10-15 15:37:45 +02:00
Matt Woodrow
e74644cd8e Bug 922942 - Use Moz2D for android snapshots. r=roc 2013-10-15 16:23:20 +13:00
Gijs Kruitbosch
e81f7e529c Merge m-c to ux 2013-10-13 23:58:05 +02:00
Matt Woodrow
7f649f59e5 Bug 923542 - Draw to the correct destination rect when computing alpha masks. r=ajones 2013-10-15 14:55:15 +13:00
Mina Almasry
eaf7fb5d88 Bug 698437 - Allow spatial navigation with directional controller. r=kats 2013-10-12 13:59:50 -04:00
Gijs Kruitbosch
abc599e28f Merge mozilla-central and ux 2013-10-11 10:08:05 +02:00
Gijs Kruitbosch
5e082bb2fd Merge mozilla-central and ux 2013-10-10 20:23:18 +02:00
Steven Michaud
061bf53f0e Bug 925411 - Temporarily backout patch for bug 868646 for causing this bug. r=spohl 2013-10-10 16:22:02 -05:00
Birunthan Mohanathas
235ca630a8 Bug 784739 - Switch from NULL to nullptr in widget/android/; r=ehsan 2013-10-10 16:42:52 -04:00
Ehsan Akhgari
a7cfe4f5a9 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
f1ea73ec9b Merge mozilla-central and ux 2013-10-10 09:27:14 +02:00
Ryan VanderMeulen
5669fdc343 Merge m-c to inbound.
CLOSED TREE
2013-10-09 15:34:02 -04:00
Ryan VanderMeulen
1ccc84a275 Backed out 8 changesets (bug 914437, bug 886999, bug 890997, bug 923114, bug 923133) for suspicion of causing frequent OSX mochitest-2 timeouts on a CLOSED TREE.
Backed out changeset e934fda24887 (bug 890997)
Backed out changeset 058c2432bff5 (bug 886999)
Backed out changeset 34d9056bf553 (bug 886999)
Backed out changeset 3f053c13cf4e (bug 914437)
Backed out changeset 1f436fd67cdb (bug 886999)
Backed out changeset 7c914b3e8d27 (bug 923133)
Backed out changeset e6fdf5fd28c5 (bug 923114)
Backed out changeset b0700255080c (bug 914437)
2013-10-09 14:33:01 -04:00
Gijs Kruitbosch
291eea969e Merge mozilla-central and ux 2013-10-09 13:39:14 +02:00