Commit Graph

16172 Commits

Author SHA1 Message Date
Milan Sreckovic
710bd9d8f9 Bug 971942: 3. layers.bufferrotation.enabled, layers.componentalpha.enabled, layers.scroll-graph, layers.acceleration.disabled, layers.acceleration.force-enabled moved to gfxPrefs. r=clord 2014-02-26 21:53:27 -05:00
Ryan VanderMeulen
dd1b2d8290 Merge m-c to inbound. 2014-02-26 16:42:16 -05:00
Oleg Romashin
6cea53ee81 Bug 970964 - Implement generic mouse/touch -> Pointer events converter. r=smaug,jimm
--HG--
extra : rebase_source : 165dc4e5c598f9e9f9de928efe16824037b95ff3
2014-02-26 13:37:01 -08:00
L. David Baron
03ba2e465b Bug 976350 patch 1: Move the contents of nsTraceRefcnt.h into nsISupportsImpl.h. r=bsmedberg
This makes sense since the file no longer contains anything with the
nsTraceRefcnt name in it, and it will allow renaming nsTraceRefcntImpl
back to nsTraceRefcnt.
2014-02-26 13:36:35 -08:00
Ryan VanderMeulen
e8b0013422 Merge b2g-inbound to m-c. 2014-02-26 16:35:43 -05:00
Solomon Chiu
e1e9ed8026 Bug 959505 - Modify nativewindow relative files which affected by KK's change. r=sotaro 2014-02-25 15:51:46 +08:00
Solomon Chiu
7948634b9e Bug 959505 - Rename GonkBufferQueue/GonkConsumerBase to JB version. r=sotaro
--HG--
rename : widget/gonk/nativewindow/GonkBufferQueue.cpp => widget/gonk/nativewindow/GonkBufferQueueJB.cpp
rename : widget/gonk/nativewindow/GonkBufferQueue.h => widget/gonk/nativewindow/GonkBufferQueueJB.h
rename : widget/gonk/nativewindow/GonkConsumerBase.cpp => widget/gonk/nativewindow/GonkConsumerBaseJB.cpp
rename : widget/gonk/nativewindow/GonkConsumerBase.h => widget/gonk/nativewindow/GonkConsumerBaseJB.h
2014-02-20 18:42:31 +08:00
Solomon Chiu
55b0059b4b Bug 959505 - Modify BufferQueue/ConsumerBase/NativeWindow/NativeWindowClient/GraphicBufferConsumer for Gonk. r=sotaro 2014-02-20 18:42:17 +08:00
Solomon Chiu
0f74fe0b37 Bug 959505 - Rename KK's file to corrensponding Gonk version. r=sotaro
--HG--
rename : widget/gonk/nativewindow/BufferQueue.cpp => widget/gonk/nativewindow/GonkBufferQueueKK.cpp
rename : widget/gonk/nativewindow/BufferQueue.h => widget/gonk/nativewindow/GonkBufferQueueKK.h
rename : widget/gonk/nativewindow/ConsumerBase.cpp => widget/gonk/nativewindow/GonkConsumerBaseKK.cpp
rename : widget/gonk/nativewindow/ConsumerBase.h => widget/gonk/nativewindow/GonkConsumerBaseKK.h
rename : widget/gonk/nativewindow/Surface.cpp => widget/gonk/nativewindow/GonkNativeWindowClientKK.cpp
rename : widget/gonk/nativewindow/Surface.h => widget/gonk/nativewindow/GonkNativeWindowClientKK.h
rename : widget/gonk/nativewindow/BufferItemConsumer.cpp => widget/gonk/nativewindow/GonkNativeWindowKK.cpp
rename : widget/gonk/nativewindow/BufferItemConsumer.h => widget/gonk/nativewindow/GonkNativeWindowKK.h
rename : widget/gonk/nativewindow/IGraphicBufferConsumer.cpp => widget/gonk/nativewindow/IGonkGraphicBufferConsumer.cpp
rename : widget/gonk/nativewindow/IGraphicBufferConsumer.h => widget/gonk/nativewindow/IGonkGraphicBufferConsumer.h
2014-02-20 18:42:02 +08:00
Solomon Chiu
a1e762aee8 Bug 959505 - Rename KK's file to corrensponding Gonk version. r=sotaro 2014-02-20 18:41:45 +08:00
Carsten "Tomcat" Book
b890bb080b merge b2g-inbound to mozilla-central 2014-02-25 14:30:13 +01:00
Makoto Kato
2836727c88 Bug 976394 - NS_QUERY_SELECTED_TEXT on e10s is sometimes wrong value. r=masayuki 2014-02-25 14:51:01 +09:00
Phil Ringnalda
478c62f613 Back out b157f5d0c235 (bug 974197) for b2g reftest-4 and reftest-6 failures
CLOSED TREE
2014-02-24 21:06:18 -08:00
Masayuki Nakano
4fac2c03ae Bug 961704 part.2 Add an option to nsIMEUpdatePreference which prevents to be notified selection/text changes caused by composition r=smaug 2014-02-26 09:48:02 +09:00
Masayuki Nakano
00d71213cf Bug 962140 Log more details in the queue when PeekMessage() fails to remove found char message r=jimm 2014-02-26 09:43:45 +09:00
Sotaro Ikeda
c5c7a00346 Bug 957323 - Handle android's fence on gonk r=nical,doublec,pchang 2014-02-24 20:23:41 -08:00
Jim Chen
a6e6fc47d1 Bug 974560 - Send compositionupdate event for each text event; r=cpeterson 2014-02-24 12:27:58 -05:00
Martin Stransky
f7ba210919 Bug 972382 - [GTK3] Theme is not loaded in other WM's (MATE, XFCE and so). r=karlt 2014-02-24 10:09:55 -05:00
Tom Schuster
807457ab88 Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm 2014-02-23 21:19:43 +01:00
Phil Ringnalda
39a0501f12 Back out 5e4cee2fcbc6 (bug 963294) for build bustage
CLOSED TREE
2014-02-23 12:59:52 -08:00
Tom Schuster
1a72f691ab Bug 963294 - [e10s] Implement a proxy for the color picker. r=jdm 2014-02-23 21:19:43 +01:00
Phil Ringnalda
25fe193a1b Merge b-i to m-c 2014-02-23 08:52:08 -08:00
Phil Ringnalda
29441a5173 Back out ab395abf96b9:837481767455 (bug 972312) for Windows build bustage
CLOSED TREE
2014-02-22 21:39:13 -08:00
Boris Zbarsky
b458b3ad8d Bug 972312 part 2. Get rid of InternalScriptErrorEvent and just use mozilla::dom::ErrorEvent for the cases that used to use it. r=smaug 2014-02-23 00:01:12 -05:00
Jim Mathies
b3dc4c674a Bug 974901 - Cleanup FrameworkView static variable use in winrt widget, plus other misc. nits. r=tabraldes 2014-02-22 17:24:54 -06:00
Sotaro Ikeda
f640a7757e Bug 957276 - Fix YFlipped buffer's source crop r=sushil 2014-02-22 04:56:02 -08:00
Ryan VanderMeulen
0141bd5b93 Merge m-c to inbound. 2014-02-21 15:01:16 -05:00
Ryan VanderMeulen
6946d60028 Merge b2g-inbound to m-c. 2014-02-21 14:58:49 -05:00
Ryan VanderMeulen
18a2214a78 Backed out changeset a00bd379adb2 (bug 950371) for breaking OSX non-unified builds. 2014-02-21 14:58:34 -05:00
Jonathan Watt
26597c713b Bug 950371 - Convert the Cocoa widget consumers of imgIContainer::GetFrame to act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow,mstange 2014-02-21 14:50:36 +00:00
Ehsan Akhgari
7e41f47adf Bug 935778 - Part 0.4: Spray even more MOZ_DECLARE_REFCOUNTED_TYPENAME across the tree 2014-02-21 09:11:33 -05:00
Carsten "Tomcat" Book
7bb450e8c7 Backed out changeset f2cade11e3c0 (bug 926830) for mochitest memory leak on a CLOSED TREE 2014-02-21 14:32:28 +01:00
Jerry Shih
1816a1dc11 Bug 970794 - Support hardware composer base on android JB 4.2.2. r=mwu 2014-02-21 08:30:20 -05:00
Ehsan Akhgari
9a39fcfd00 Bug 935778 - Part 0.3: Spray some more MOZ_DECLARE_REFCOUNTED_TYPENAME across the tree 2014-02-20 23:07:24 -05:00
Oleg Romashin
5b8bccef6f Bug 974335 - Refactor Qt Widget Backend implementation. Qt Only changes NPDB. r=romaxa
--HG--
rename : dom/system/unix/Makefile.in => dom/system/qt/Makefile.in
rename : dom/system/unix/QTMLocationProvider.cpp => dom/system/qt/QTMLocationProvider.cpp
rename : dom/system/unix/QTMLocationProvider.h => dom/system/qt/QTMLocationProvider.h
rename : dom/system/unix/nsHapticFeedback.cpp => dom/system/qt/QtHapticFeedback.cpp
rename : dom/system/unix/nsHapticFeedback.h => dom/system/qt/QtHapticFeedback.h
rename : dom/system/unix/moz.build => dom/system/qt/moz.build
2014-02-20 18:09:02 -08:00
Oleg Romashin
8b54bec8cc Bug 974335 - Refactor Qt Widget Backend implementation. Shared Widget part . r=doug 2014-02-20 18:08:53 -08:00
Bill McCloskey
4d1519077d Bug 974007 - Change OMTC behavior when browser.tabs.remote is set (r=mattwoodrow,felipe) 2014-02-20 17:26:41 -08:00
Georg Fritzsche
4639861d12 Bug 926830 - Test cleanup for plugin enabledState usage, widget. r=roc 2014-02-17 15:58:06 +01:00
Carsten "Tomcat" Book
3b6b988ef6 Backed out changeset 05a5f08f1278 (bug 950371) for OS X mochitest bustage on a CLOSED TREE 2014-02-21 11:44:52 +01:00
Jonathan Watt
6dd0142b48 Bug 950371 - Convert the Cocoa widget consumers of imgIContainer::GetFrame to act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow 2014-02-21 08:42:12 +00:00
Jonathan Watt
687b238274 Bug 950371 - Convert the Cocoa widget consumers of imgIContainer::GetFrame to act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow,mstange 2014-02-21 19:07:42 +00:00
Ed Morley
36321accbc Backed out changeset a00bd379adb2 (bug 950371) for build failures; CLOSED TREE 2014-02-21 17:31:12 +00:00
Carsten "Tomcat" Book
f3825c1c94 merge fx-team to mozilla-central 2014-02-20 12:55:32 +01:00
Mark Capella
adf9f2c495 Bug 927882 - Standardize TextSelection caret positioning logic for soft keyboards, r=jchen, wesj, f=margaret 2014-02-19 22:19:43 -05:00
Makoto Kato
640fed18f9 Bug 973489 - Part 2. Fix memory leak. r=jimm 2014-02-20 11:29:16 +09:00
Makoto Kato
ea965699b4 Bug 973489 - Part 1. Support toast notification on desktop mode. r=jimm 2014-02-20 11:28:57 +09:00
Arnaud Bienner
230ff68730 Bug 966417 - Restore initial color when closing color picker/canceling color selection. r=karlt 2014-02-18 20:46:00 +01:00
Tom Schuster
63a2ecd06a Bug 966417 - Call Update from nsColorPicker on Gtk. r=karlt 2014-02-18 20:44:01 +01:00
Phil Schaf
25ab080eb6 Bug 310924 - GTK: Try named cursors before defaulting to hardcoded glyphs. r=karlt 2014-02-19 11:30:08 -05:00
Kartikaya Gupta
886d3fd038 Bug 966507 - Recenter the displayport around the composition bounds if layout doesn't accept the scroll update calculated by APZ. r=tn,Cwiiis 2014-02-19 09:50:46 -05:00
Nicholas Cameron
df696acd03 Backed out changeset 4887f7d34df2 (bug 896896) for causing bug 933733. a=lsblakk 2013-11-11 13:59:45 -05:00
George Wright
884e199312 Bug 910754 - Update include paths for gonk's build as Skia's directory structure has changed r=snorp 2013-12-11 20:41:42 -05:00
Kartikaya Gupta
a6da33b738 Bug 941995 - Disable double-tapping and click delay on pages that are device-width or narrower (B2G). r=mbrubeck,botond 2014-02-24 19:22:45 -05:00
Matt Woodrow
31f16514d3 Bug 974197 - Fire MozAfterPaint after the compositor runs. r=roc 2014-02-25 12:55:39 +13:00
Boris Zbarsky
2ab672042c Bug 972312 part 2. Get rid of InternalScriptErrorEvent and just use mozilla::dom::ErrorEvent for the cases that used to use it. r=smaug,khuey 2014-02-23 00:01:12 -05:00
Bill McCloskey
40617f3160 Bug 910384 - [e10s] Use blobs for cross-cross file picker (r=bent) 2014-02-24 13:09:03 -08:00
Masayuki Nakano
e88d76a23b Bug 975688 part.17 Rename dom/events/MutationEvent.h to dom/Events/InternalMutationEvent.h r=smaug+roc
--HG--
rename : dom/events/MutationEvent.h => dom/events/InternalMutationEvent.h
2014-02-27 19:51:15 +09:00
George Wright
309648f662 Back out changesets from bug 910754 due to build bustage 2014-02-18 17:54:04 -05:00
George Wright
56fda9d61e Bug 910754 - Update include paths for gonk's build as Skia's directory structure has changed r=snorp 2013-12-11 20:41:42 -05:00
Ryan VanderMeulen
8a4698657b Merge inbound to m-c. 2014-02-18 15:18:19 -05:00
Ed Morley
ec4eb16f4a Backed out changeset e9055e7476f1 (bug 970895) for causing bug 973824 2014-02-18 17:52:27 +00:00
Tom Schuster
fcfec864b1 Bug 910384 - Change nsFilePickerProxy to be asynchronous and add a proper IPDL protocol for it. r=jdm 2014-02-18 01:30:06 +01:00
Masayuki Nakano
e173e98fbd Bug 965685 Use IMENotification struct for nsIWidget::NotifyIME() and merge NotifyIMEOfTextChange() with it r=smaug, sr=roc 2014-02-18 09:00:15 +09:00
Phil Ringnalda
c80a590a3f Merge m-c to m-i 2014-02-17 15:28:16 -08:00
Masatoshi Kimura
8ddf7de8a5 Bug 969918 - Use decltype to declare pointers for dynamic-loaded functions. r=jimm sr=roc 2014-02-18 07:32:52 +09:00
Thomas Zimmermann
2a45fa7105 Bug 970895: Use I/O loop for polling memory-pressure events, r=dhylands
The code for polling sysfs for memory-pressure events currently
runs on a separate thread. This patch implements this functionality
for the I/O thread. This unifies the code base a bit and also safes
some resources.
2014-02-17 12:29:26 +01:00
Phil Ringnalda
89c3345063 Merge f-t to m-c 2014-02-15 10:10:31 -08:00
Phil Ringnalda
7d3085e511 Merge b-i to m-c 2014-02-15 10:01:36 -08:00
Phil Ringnalda
2ff6e6f32a Back out 024e6835e6ea:bece94ce2310 (bug 326743) for frequent 10.6 debug failures in browser_bug537013.js 2014-02-14 23:58:49 -08:00
Mike Habicher
557d8c2d5c Bug 909542 - refactor CameraControl API, r=dhylands,jst,jesup,onecyrenus 2014-02-14 17:41:07 -05:00
Mike de Boer
e6d70963f2 Bug 326743: add find clipboard to the list of available clipboard on OSX. r=joshmoz 2014-02-14 14:04:19 +01:00
Masayuki Nakano
a6beb97339 Bug 971489 Simplify constructor of WidgetSimpleGestureEvent r=smaug 2014-02-15 10:06:06 +09:00
Masayuki Nakano
57dfe31218 Bug 970248 Simplify constructor of InternalUIEvent r=smaug 2014-02-15 10:06:06 +09:00
Masayuki Nakano
a183cc5385 Bug 969247 part.1 Remove or replace DOM_VK_ENTER and NS_VK_ENTER users r=smaug 2014-02-15 09:57:39 +09:00
Wes Johnston
c1bd2f002f Bug 946344 - Remove GeckoEventResponder. r=mfinkle,blassey,kats
--HG--
rename : mobile/android/base/util/EventDispatcher.java => mobile/android/base/EventDispatcher.java
2014-02-11 09:16:00 -08:00
Aaron Klotz
1a55b7e482 Bug 852117: Modify nsBaseAppShell to notify the crash reporter when the event loop nesting level changes; r=roc
--HG--
extra : rebase_source : 4216520beb56f4e87bb77c89a4edc0cf9a02b658
2014-02-13 10:54:10 -07:00
Bill McCloskey
ac6dae6f29 Bug 963952 - [e10s] Don't use basic compositor when using D3D11 compositor (r=mattwoodrow) 2014-02-13 08:53:50 -08:00
Markus Stange
788246cd20 Bug 941325 - Fix focus ring drawing when building with the 10.8 SDK or higher. r=smichaud
--HG--
extra : rebase_source : 07fa26673188c4d5fb5450ec2344a794e4d67aad
2014-02-13 12:09:59 +01:00
Morris Tseng
d4cdf301e3 Bug 926128 - Use a single configurable shader in OpenGL layers backend. r=vlad, r=nical, r=gal 2013-11-07 22:22:05 -08:00
Jonathan Watt
2da383b364 Bug 966861 - Make the <input type=number> up/down spin buttons appear for classic WinXP/7 theming. r=roc 2014-02-04 01:10:37 +00:00
Richard Marti
501407982c Bug 907373 - Fix -moz-os-version media query on Windows 8.1. r=jimm 2014-02-17 18:43:08 +01:00
Masayuki Nakano
cf2d9778f3 Bug 962140 NativeKey should not check scan code at comparing found char message and removed char message r=jimm 2014-02-18 21:42:04 +09:00
Bas Schouten
26c2269500 Bug 806406: Remove some lingering references to gfxD2DSurface. r=jrmuizel 2014-02-13 02:59:12 +01:00
Jeff Walden
d1872d42a6 Bug 969165 - Convert Atomic<T> where T != bool but is used as a bool over to Atomic<bool>, now that it's supported, in widget/. r=vlad
--HG--
extra : rebase_source : 29bf1f696e8952ea7056d2417522dcc0f88cecc4
2014-02-06 22:17:07 -08:00
Masayuki Nakano
5bda7611c7 Bug 960866 part.3 Remove nsEditor::mIsIMEComposing r=ehsan+smaug 2014-02-12 22:02:56 +09:00
Jacek Caban
3bfaf86a69 Bug 970429 - Don't allow using INITGUID in unified sources. r=Ehsan 2014-02-12 10:59:05 +01:00
Bas Schouten
8f604d6596 Bug 805406: Never draw directly to a window with Direct2D. r=jrmuizel 2014-02-11 21:54:02 +01:00
John Schoenick
eb682dbd31 Bug 967694 - Fix tests that expect old behavior. r=bsmedberg 2014-02-11 12:14:42 -08:00
Brian O'Keefe
56341318f9 Bug 772828 - Part b: use RESOURCE_FILES in moz.build instead of manual rules in Makefile.in; r=mshal 2013-11-05 13:37:54 -05:00
Oleg Romashin
f82bb788b2 Bug 967796 - Implement Pointer Enter/Leave events support. implementation for pointer's. r=smaug 2014-02-10 22:34:51 -08:00
Masayuki Nakano
66d81c3ef0 Bug 969219 Simplify constructor of InternalTransitionEvent r=smaug 2014-02-11 14:35:25 +09:00
Masayuki Nakano
47672f20db Bug 968725 Simplify constructor of InternalAnimationEvent r=smaug 2014-02-11 14:35:25 +09:00
Masayuki Nakano
cb44c44528 Bug 968721 Remove constructor of WidgetPointEvent which takes a lot of arguments for initializing its members r=smaug 2014-02-11 14:35:25 +09:00
Masayuki Nakano
064b77ec0a Bug 964153 Remove unnecessary constructor of WidgetTouchEvent and don't copy its widget in Duplicate() r=smaug 2014-02-11 14:35:25 +09:00
Masayuki Nakano
ad71ce4872 Bug 962140 Remove following char message of keydown message with found message r=jimm 2014-02-11 14:29:17 +09:00
Ehsan Akhgari
d91d200572 Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg 2014-02-10 17:57:01 -05:00
Ehsan Akhgari
096d1fad98 Bug 968642 - Port RCFILE and RESFILE to moz.build; r=gps 2014-02-10 09:03:53 -05:00
Bill McCloskey
c637f05bd4 Bug 966467 - Proxy clipboard service in content process (r=vlad) 2014-02-09 16:13:10 -08:00
Bill McCloskey
e63f9dd033 Bug 966467 - Enable some service proxies only in content processes (r=vlad) 2014-02-09 16:13:05 -08:00
Bill McCloskey
9cea9b25bb Bug 966467 - Disable some unused services in content processes (r=vlad) 2014-02-09 16:13:01 -08:00
Ehsan Akhgari
806d2d0e33 Bug 970042 - Stop checking the result of nsTArray::SetLength in the Windows widget code; r=roc 2014-02-09 18:36:41 -05:00
Ms2ger
42aa546e2f Bug 952033 - Part b: Use IntSize in CreateOffscreenSurface; r=roc 2014-02-09 09:04:38 +01:00
Doug Sherk
c2424a51a2 Bug 964421 - Add a mechanism to HandleLongTap(Up) to allow content to preventDefault touches and stop panning while long tapping. r=kats 2014-02-07 18:13:50 +01:00
Phil Ringnalda
df7c3c109f Back out ed6e04e6fc0c (bug 968642) for breaking Windows plugin tests
CLOSED TREE
2014-02-07 21:26:02 -08:00
Ehsan Akhgari
3d39780674 Bug 968642 - Port RCFILE and RESFILE to moz.build; r=gps 2014-02-07 23:22:31 -05:00
Oskar Eisemut
ef90629377 Bug 968141 - nsDeviceContextSpecGTK: Remove nsPrinterFeatures (spaming print.tmp.printerfeatures into the prefs) not used by current code. r=roc 2014-02-05 12:32:07 +01:00
Chris Pearce
e83cf62240 Bug 968603 - Add screen WakeLockListener on Win32 to disable screensaver. r=jimm 2014-02-07 13:27:46 +13:00
Ryan VanderMeulen
c38a20a8ce Merge m-c to inbound on a CLOSED TREE. 2014-02-06 16:29:41 -05:00
Alex Henrie
5b028ed455 Bug 968029 - Use unprefixed box-sizing in content/, dom/, layout/, and widget/. r=dbaron 2014-02-06 12:32:05 -07:00
Sushil Chauhan
b46aeead83 Bug 965086 - Add support for sourceCropf in HwcComposer2D. r=dwilson 2014-02-05 14:55:00 -08:00
Carsten "Tomcat" Book
4c8a63af86 merge b2g-inbound to mozilla-central 2014-02-06 13:17:08 +01:00
Ryan VanderMeulen
da76ec6dfe Merge m-c to b2g-inbound on a CLOSED TREE. 2014-02-05 16:12:18 -05:00
Jim Mathies
b2c22c6993 Bug 819613 - Move app command code to nsWindowBase so it can be shared between win32 and metro widgets (plus missing include fix). r=tabraldes 2014-02-05 09:36:59 -06:00
Vivien Nicolas
2d9332319c Bug 961769 - Implement event loop responsiveness instrumentation for Gonk. r=gal 2014-02-05 19:53:53 +01:00
Makoto Kato
fb46140e84 Bug 966130 - Turn off listening ipc:content-created observer if not e10s. r=blassey 2014-02-05 16:43:59 +09:00
Masayuki Nakano
5c7c5ab5a5 Bug 964623 OnSelectionChange() and OnLayoutChange() should be called immediately after the document is unlocked completely r=emk 2014-02-05 16:36:17 +09:00
Masayuki Nakano
7511b97318 Bug 962140 Append unexpected message log to crash report r=jimm 2014-02-04 20:46:20 +09:00
Markus Stange
a16062d39b Bug 958674 - Return true from nsCocoaWindow::IsVisible while nsCocoaWindow::Show(true) is running. r=smichaud
--HG--
extra : rebase_source : 566f89c38316440243b178eb46d5048bcf416a32
2014-02-03 17:55:26 +01:00
Markus Stange
f2de24d7ff Bug 958674 - Paint popup synchronously when showing the window, like we do for normal windows. r=smichaud
--HG--
extra : rebase_source : f0c62a48c4410ad293f8a9ed0b4a1b30abe349e9
2014-02-03 17:54:55 +01:00
Olli Pettay
e84a8e90a5 Backout Bug 953435 to fix bug 959281, a=backout 2014-02-02 20:12:27 +02:00
Ryan VanderMeulen
1151d8d8c4 Merge m-c to inbound. 2014-01-31 21:16:16 -05:00
Blake Kaplan
d552cb63bb Bug 966398 - Kill nsIBidiKeyboard::SetLangFromBidiLevel. r=roc
--HG--
extra : rebase_source : 3a8a5a58e6bf56f8201a0ffbe0efc22e686507ec
2014-01-31 15:02:44 -08:00
Ryan VanderMeulen
4dd29179e9 Merge m-c to fx-team. 2014-01-31 16:59:29 -05:00
Masayuki Nakano
825a645a66 Bug 962140 Use PeekMessage() instead of GetMessage() in KeyboardLayout.cpp r=jimm 2014-02-01 01:31:01 +09:00
Carsten "Tomcat" Book
bd8f07df4d Merge mozilla-central to mozilla-inbound 2014-01-31 13:03:35 +01:00
Carsten "Tomcat" Book
f1a2c94d74 merge fx-team to mozilla-central 2014-01-31 12:52:17 +01:00
Masayuki Nakano
b8a91c449d Bug 964626 Fix some nits of logging code in nsTextStore r=jimm 2014-01-31 20:23:36 +09:00
Olli Pettay
ab4411fee4 Backout Bug 930793 - Remove favor performance mode (we have still racy b2g tests), a=backout
--HG--
extra : rebase_source : 6f6de1cbf54670d63b74c44ca0134ed9c5354d2b
2014-01-30 21:35:44 -08:00
Masayuki Nakano
f374be11a1 Bug 789706 part.2 nsTextStore::CreateNativeCaret() should be called only when active TIP is ATOK r=emk 2014-01-31 11:17:25 +09:00
Masayuki Nakano
2419808fb6 Bug 789706 part.1 Create native caret over our caret when ITextStoreACP::GetTextExt() is called during composition r=emk 2014-01-31 11:17:24 +09:00
Ryan VanderMeulen
36edb17218 Merge m-c to fx-team. 2014-01-30 16:40:31 -05:00
Tim Abraldes
25eb38555a bug 961157. Don't append "metrobrowser" to our command lines. Don't expect "metrobrowser" on our command lines. r=jimm 2014-01-30 12:29:12 -08:00
Carsten "Tomcat" Book
6ed80db29e Merge mozilla-central to mozilla-inbound 2014-01-30 12:08:09 +01:00
Carsten "Tomcat" Book
6d78047748 merge b2g-inbound to mozilla-central 2014-01-30 10:59:15 +01:00
Carsten "Tomcat" Book
c41c7a464e merge mozilla-inbound to mozilla-central 2014-01-30 10:57:47 +01:00
Dave Hylands
e5402936a4 Bug 851680 - Set kernel timezone so that external sdcards get local time rather than UTC time.
--HG--
extra : rebase_source : 74745fda004671a7c02df132877db7b6be4c5d54
2014-01-28 13:33:15 -08:00
Marina Samuel
f7b91a8106 Bug 962815 - Update pin button after pin decision is made. r=rsilveira 2014-01-29 16:20:29 -05:00
Neil Deakin
a2d526d45d Bug 943759, [Australis], support mousethrough on panels to allow mouse events to pass through to the content behind, implemented on Windows, Mac and Linux, use this for the UI tour highlight, r=neil,jmathies,karlt 2014-01-31 08:27:43 -05:00
Vladimir Vukicevic
466a30db76 b=951799, cache uniforms in OGLShaderProgram, part 2 - fix LayerProgramProjectionMatrix; r=bjacob 2014-01-29 17:53:38 -05:00
Matt Woodrow
924bb34c92 Bug 962786 - Convert nsDragService to use Moz2D. r=roc
* * *
Bug 962786 - Bustage fix on a CLOSED TREE
2014-01-29 13:10:33 +13:00
Nick Lebedev
cd5f69c3b6 Bug 822898. Add maxTouchPoints attribute to navigator. r=romaxa,smaug
--HG--
extra : rebase_source : e3f84cb38ee2a0c75bf775027c8a59e4f9e64908
2014-01-28 08:09:34 -08:00
Makoto Kato
be574cbe7a Bug 960877 - Part 3. Always notice IME information to parent process for supporting NS_QUERY event if not B2G. r=masayuki 2014-01-29 18:32:39 +09:00
Makoto Kato
95d1734bbb Bug 960877 - Part 2. Remove mWantHints from nsIMEUpdatePreference. r=masayuki 2014-01-29 18:32:35 +09:00
Makoto Kato
4e744b9599 Bug 960877 - Part 1. Add helper method to nsIMEUpdatePreference. r=masayuki 2014-01-29 18:31:57 +09:00
Phil Ringnalda
cc60a4deef Backed out 5 changesets (bug 962786, bug 952011) for svg test_text_selection.html bustage
CLOSED TREE

Backed out changeset d7a6a64b42f0 (bug 962786)
Backed out changeset e50ced4f4040 (bug 952011)
Backed out changeset c9e6fd6d5a03 (bug 952011)
Backed out changeset 406540ed9da0 (bug 952011)
Backed out changeset d6f164b6421a (bug 962786)
2014-01-28 19:37:54 -08:00
Matt Woodrow
0a300fcc44 Bug 962786 - Bustage fix on a CLOSED TREE 2014-01-29 13:54:17 +13:00
Jim Chen
da60164273 Bug 964813 - Make HandleUncaughtException JNI wrapper multithreaded; r=kats 2014-01-28 18:32:28 -06:00
Jim Chen
41aab2c23f Bug 963242 - Only save JNI env in TLS when first attaching; r=kats 2014-01-28 18:32:28 -06:00
Matt Woodrow
d8146d0c04 Bug 962786 - Convert nsDragService to use Moz2D. r=roc 2014-01-29 13:10:33 +13:00
Doug Sherk
d3c32f0cca Bug 960846: Round Gonk touches instead of truncating them. r=mwu 2014-01-28 12:55:46 -05:00
Kartikaya Gupta
9904e24f5a Bug 961280 - Prevent the APZ repaint request from clobbering a layout-driven async scroll. r=tn 2014-01-28 17:54:59 -05:00
Oskar Eisemuth
5703f760a4 Bug 701479 - Remove usage of EnumPrintersW to test if port is FILE:. nsDeviceContextSpecWin shouldn't start UI for asking for a filename nor query all possible printers. r=jimm 2014-01-28 16:31:20 +01:00
Masayuki Nakano
08bdd1a835 Bug 749123 Don't use GtkIMContextSimple for IME disabled editor (GTK3 build) r=karlt 2014-01-28 18:02:08 +09:00
Masayuki Nakano
5c5c1e6b47 Bug 931378 Set input purpose to IM context r=karlt 2014-01-28 18:02:08 +09:00
Masayuki Nakano
95852769e5 Bug 962005 Make mozilla::TextComposition ref-countable class r=smaug 2014-01-28 17:19:29 +09:00
Markus Stange
fc6f4b74e8 Bug 958674 - Invalidate the popup content view when showing the popup. r=smichaud 2014-01-28 00:04:41 +01:00
ISHIKAWA, Chiaki
47514259f1 Bug 963550 - Warn about OpenGL non-support only once during execution instead of spamming the log. r=bjacob 2014-01-27 15:40:50 -05:00
David Zbarsky
c3de69e906 Bug 952977: Convert PrepareViewport to gfx::Matrix4x4 r=nical 2014-01-27 15:25:20 -05:00
David Zbarsky
25f1d1607d Bug 952977: Convert OGLShaderProgram to gfx::Matrix r=nical 2014-01-27 15:25:20 -05:00
Jim Mathies
70a1b7c59e Bug 951120 - Detach ICoreWindow related events prior to shutdown, plus some misc. code cleanup. r=bbondy 2014-01-27 09:09:33 -06:00
Jim Mathies
26a6db08e9 Bug 951120 - Don't process native events on the main thread during xpcom shutdown in metro widget. r=bbondy 2014-01-27 09:09:33 -06:00
Jim Mathies
f45fea2d50 Bug 950241 - Add new metrofx restart command line flag in MetroAppShell. r=bbondy 2014-01-30 13:32:48 -06:00
Jim Mathies
12608a4a26 Bug 950241 - Add update restart flag to metro utils. r=bbondy 2014-01-30 13:32:47 -06:00
Birunthan Mohanathas
02d0812720 Bug 828300 - Replace NS_ARRAY_LENGTH with mozilla::ArrayLength/MOZ_ARRAY_LENGTH. r=ehsan 2014-01-30 13:26:54 -05:00
Kartikaya Gupta
3195471b3f Bug 963278 - Better fix to deal with concurrent scroll updates from APZ and other places. r=tn,botond,jimm 2014-02-05 17:43:20 -05:00
Ryan VanderMeulen
d4bc412934 Merge m-c to inbound on a CLOSED TREE. 2014-02-05 15:54:37 -05:00
Jim Chen
8cc0f19e61 Bug 959214 - Use unwinder when getting ANR native stack; r=blassey 2014-02-05 12:37:54 -06:00
Marco Chen
e531ad5bf0 Bug 958963 - Headset status from input device didn't be recorded by GonkSwitch.r=dhylands. 2014-01-20 17:35:24 +08:00
Daniel Holbert
187c3e6ab2 Bug 964073: Drop unused NS_DEFINE_CID for kNativeFilePickerCID in gtk/nsWidgetFactory.cpp, to fix clang warning. r=karlt 2014-01-26 22:24:56 -08:00
Masayuki Nakano
298c1f399c Bug 329127 Create WidgetEvent::Duplicate() for nsDOMEvent::DuplicatePrivateData() r=smaug 2014-01-27 15:10:44 +09:00
Phil Ringnalda
6253dc2dfe Merge b-i to m-c 2014-01-25 19:58:13 -08:00
Phil Ringnalda
129c8e17d5 Merge m-i to m-c 2014-01-25 19:55:19 -08:00
Andreas Gal
b7ded41bdb Bug 961505 - use the mid-point as boundary for xhdpi and beyond as well. r=fabrice 2014-01-25 13:21:01 +01:00
James Willcox
d25beb2d07 Bug 963242 - Add null checks in AndroidBridge::JavaThreadDetachFunc() r=kats 2014-01-24 11:04:15 -06:00
Rodrigo Silveira
27d3cc4795 Bug 960144 - Toast notification image implementation r=msamuel
--HG--
extra : rebase_source : e412fda60c6a0ab964e62a209e1a732eb8e74b5e
2014-01-24 16:45:12 -08:00
David Zbarsky
b339e3cd5c Bug 952977: Convert GetEffectiveTransform to gfx::Matrix4x4 r=nical 2014-01-24 17:49:19 -08:00
Doug Sherk
2ccf81cd36 Bug 962278 - Propagate device DPI to APZC on B2G/gonk. r=kats 2014-01-23 16:34:31 -05:00
Ryan VanderMeulen
3f3b90ac89 Merge m-c to inbound. 2014-01-23 15:58:06 -05:00
Ryan VanderMeulen
d64c974566 Merge b2g-inbound to m-c. 2014-01-23 15:39:44 -05:00
Ryan VanderMeulen
154c073fb8 Backed out changeset 5297eafc36e2 (bug 962911) for making B2G reftests much more failure-prone.
CLOSED TREE
2014-01-23 11:50:52 -05:00
Jonathan Watt
6b3eea9e92 Bug 950647 - Make nsImageToPixbuf::ImgSurfaceToPixbuf act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow 2014-01-23 11:33:23 +00:00
Olli Pettay
89b7eff82a Bug 962911 - Bring back more-than-one-native-event-per-gecko-event processing, r=avih 2014-01-23 14:49:39 +02:00
Carsten "Tomcat" Book
f32b14e35a Backed out changeset a5c71a784e33 (bug 950647) for Linux Build Bustage on a CLOSED TREE 2014-01-23 13:34:56 +01:00
Jonathan Watt
882fe9dcf2 Bug 950647 - Make nsImageToPixbuf::ImgSurfaceToPixbuf act on a Moz2D SourceSurface instead of a Thebes gfxASurface. r=mattwoodrow 2014-01-23 11:33:23 +00:00
Masayuki Nakano
d50712b914 Bug 961703 Commit or cancel composition when text/selection/focus is changed during composition for avoiding making some TIPs confused r=m_kato 2014-01-23 18:36:01 +09:00
Masayuki Nakano
4b8b74f442 Bug 544779 part.2 Remove WM_USER_TSF_TEXTCHANGE from nsTextStore r=m_kato 2014-01-23 17:01:16 +09:00
Sotaro Ikeda
f9f2c44031 Bug 951732 - Keep TextureClient until Transaction complete. r=nical 2014-01-23 09:31:12 -05:00
Arnaud Bienner
ec8e80e938 Bug 929496 - Make GTK color-picker dialog non-modal again. r=dholbert
This reverts changes made in bug 917917, which are not needed anymore now we allow only one color picker to be opened at a time for an input element (since bug 946479).
2014-01-20 22:09:51 +01:00
Sotaro Ikeda
4d758c0459 Bug 961405 - Change GraphicBufferLocked as to use AtomicRefCountedWithFinalize. r=nical, r=pchang, r=doublec, r=mikeh 2014-01-21 13:53:48 -05:00
Nathan Froyd
9950acfd20 Bug 962119 - fix offset table for GetDOMKeyName; r=masayuki 2014-01-21 11:41:24 -05:00
Benoit Jacob
61df69f208 Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
2014-01-23 13:26:41 -05:00
Benoit Jacob
aebf0bb92a Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
ed427f9600 Bug 959380 - 3/5 - Make gfxSurfaceType a typed enum - r=jrmuizel
find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxSurfaceType\(Image\|PDF\|PS\|Xlib\|Xcb\|Glitz\|Quartz\|Win32\|BeOS\|DirectFB\|SVG\|OS2\|Win32Printing\|QuartzImage\|Script\|QPainter\|Recording\|VG\|GL\|DRM\|Tee\|XML\|Skia\|Subsurface\|D2D\|Max\)\($\|[^A-Za-z0-9_]\)/\1gfxSurfaceType::\2\3/g'
2014-01-23 13:26:40 -05:00
Benoit Jacob
e5ed95579b Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
2014-01-23 13:26:40 -05:00
Masayuki Nakano
9869bc00d5 Bug 959999 Clean up nsTextStore::Initialize() r=jimm 2014-01-21 21:33:52 +09:00
Phil Ringnalda
27963a40d2 Merge m-c to m-i 2014-01-20 18:46:36 -08:00
David Zbarsky
d5aee5db72 Bug 952977: Convert CreateMatrix to gfx::Matrix r=nical 2014-01-20 16:52:04 -05:00
Tim Taubert
8d9d0410f6 Bug 899011 - Make WinTaskbar.GetAvailable() return false if initializing the taskbar fails r=jimm 2014-01-11 23:02:00 +01:00
Ryan VanderMeulen
fdae3860b4 Merge b2g-inbound to m-c. 2014-01-19 15:40:48 -05:00
stefanh@inbox.com
6194468ed2 Bug 889085 - Make our sheets semi-transparent. r=mstange. 2014-01-18 12:52:22 +01:00
Sushil Chauhan
d008525ff7 Bug 953303 - HwcComposer2D should honor HWC_HINT_CLEAR_FB set by hwcomposer. r=ncameron 2014-01-17 18:55:30 -08:00
Jim Chen
c137c2f965 Bug 958706 - Make generated JNI wrappers handle uncaught exceptions; r=blassey
This patch adds AndroidBridge::HandleUncaughtException calls to generated JNI wrappers. Also, the JNI annotation now accepts the noThrow flag to indicate that the JNI caller wishes to handle Exceptions manually.
2014-01-17 23:32:25 -06:00
Jim Chen
2b53995aca Bug 958706 - Add ThrowException and HandleUncaughtException methods to AndroidBridge; r=blassey
ThrowException throws a new exception with the appropriate message, meant for native JNI methods that return to Java code (i.e. methods in AndroidJNI.cpp).

HandleUncaughtException will be called by the generated JNI stubs that C++ code uses. HandleUncaughtException calls the new GeckoAppShell.handleUncaughtException method, which behaves exactly like the normal uncaught exception handler (annotates the crash report and crashes). GeckoAppShell.handleUncaughtException has the noThrow annotation that will be seen by the generated code; as a result, its generated stub will not call HandleUncaughtException and result in a loop.
2014-01-17 23:32:24 -06:00
Jim Chen
9a3802b401 Bug 959237 - Add AndroidBridge::HasEnv checks; r=blassey
For certain tests, the AndroidBridge is not initialized, but some GeckoAppShell functions are still called indirectly. For now, this patch adds checks to skip these calls if there's no AndroidBridge. However, in the future, most of the affected code should be refactored to not require these checks.
2014-01-17 23:32:24 -06:00
Jim Chen
9305d633e9 Bug 959237 - Define GetVM, GetJNIEnv, and GetJNIForThread as infallible; r=blassey
Currently when either of these methods fail, we log something and rely on the calling code to null check. Since these failures are serious and likely unrecoverable, it's better to define these methods as infallible and just crash if they do fail.
2014-01-17 23:32:24 -06:00
Ryan VanderMeulen
b989384c30 Merge b2g-inbound to m-c. 2014-01-17 15:04:32 -05:00
Ryan VanderMeulen
b087bd1e55 Backed out changeset efdeaff02f48 (bug 937713) for causing bug 958771. 2014-01-17 10:48:55 -05:00
Carsten "Tomcat" Book
e11313960c merge mozilla-inbound to mozilla-central 2014-01-17 10:11:39 +01:00
Wes Kocher
ae977ba967 Merge b2g-inbound to m-c 2014-01-16 17:22:23 -08:00
Sushil Chauhan
4c4cedfeea Bug 959719 - Add support for HWC_BLIT composition in HwcComposer2D. r=dwilson 2014-01-16 09:47:35 -08:00
Ryan VanderMeulen
127438a7eb Merge inbound to m-c. 2014-01-16 15:06:12 -05:00
Olli Pettay
124795557f Bug 930793 - Remove favor performance mode, r=roc,avih
--HG--
extra : rebase_source : e936e5b02dc2e613816fb6f97f9af5a303dc6f6d
2014-01-16 16:09:08 +02:00
Rodrigo Silveira
61a09809fe Bug 952835 - screen goes to sleep while video still playing in Metro Firefox r=jimm
--HG--
extra : rebase_source : 07926a411418a61e20df832ebb032fff5b218a77
2014-01-15 16:11:36 -08:00
Jim Mathies
cb8a9f5e7a Bug 959792 - Accomidate content that doesn't support apz scroll or zoom in widget hit testing. Fixes an issue with selection in the navbar while viewing about pages. r=mbrubeck 2014-01-15 15:31:54 -06:00
Ryan VanderMeulen
3f5d1cb811 Merge inbound to m-c. 2014-01-15 14:34:05 -05:00
Ryan VanderMeulen
e4e6ae0380 Backed out changeset 347d5704cbe1 (bug 930793) for frequent Linux mochitest-bc orange.
CLOSED TREE
2014-01-15 14:11:20 -05:00
Ed Morley
c73e589fc3 Merge mozilla-central and b2g-inbound
--HG--
rename : content/events/src/nsDOMEvent.h => dom/events/nsDOMEvent.h
2014-01-15 18:09:12 +00:00
Ryan VanderMeulen
74d9bb87aa Backed out changeset bcf74bd6c78f (bug 959719) for JB bustage. 2014-01-15 11:37:15 -05:00
Ed Morley
1f2e5a9f7a Merge latest green b2g-inbound changeset and mozilla-central 2014-01-15 15:57:30 +00:00
Sushil Chauhan
ffef159727 Bug 959719 - Add support for HWC_BLIT composition in HwcComposer2D. r=dwilson 2014-01-14 14:10:53 -08:00
Yuan Xulei
c17f701bb8 Bug 946068 - Fix composition events' synthesizing in chrome process. r=masayuki 2014-01-15 09:41:39 -05:00
Robert O'Callahan
1dca717865 Bug 946065. Part 5: Move content/events to dom/ and flatten away 'src' directory. r=Ms2ger
--HG--
rename : content/events/src/DOMWheelEvent.cpp => dom/events/DOMWheelEvent.cpp
rename : content/events/src/DOMWheelEvent.h => dom/events/DOMWheelEvent.h
rename : content/events/src/EventTarget.cpp => dom/events/EventTarget.cpp
rename : content/events/public/EventTarget.h => dom/events/EventTarget.h
rename : content/events/public/MutationEvent.h => dom/events/MutationEvent.h
rename : content/events/src/PointerEvent.cpp => dom/events/PointerEvent.cpp
rename : content/events/src/PointerEvent.h => dom/events/PointerEvent.h
rename : content/events/src/SpeechRecognitionError.cpp => dom/events/SpeechRecognitionError.cpp
rename : content/events/src/SpeechRecognitionError.h => dom/events/SpeechRecognitionError.h
rename : content/events/src/TextComposition.cpp => dom/events/TextComposition.cpp
rename : content/events/src/TextComposition.h => dom/events/TextComposition.h
rename : content/events/src/Touch.cpp => dom/events/Touch.cpp
rename : content/events/src/Touch.h => dom/events/Touch.h
rename : content/events/crashtests/104310-1.html => dom/events/crashtests/104310-1.html
rename : content/events/crashtests/116206-1.html => dom/events/crashtests/116206-1.html
rename : content/events/crashtests/135345-1.html => dom/events/crashtests/135345-1.html
rename : content/events/crashtests/422009-1.xhtml => dom/events/crashtests/422009-1.xhtml
rename : content/events/crashtests/457776-1.html => dom/events/crashtests/457776-1.html
rename : content/events/crashtests/496308-1.html => dom/events/crashtests/496308-1.html
rename : content/events/crashtests/682637-1.html => dom/events/crashtests/682637-1.html
rename : content/events/crashtests/crashtests.list => dom/events/crashtests/crashtests.list
rename : content/events/crashtests/eventctor-nulldictionary.html => dom/events/crashtests/eventctor-nulldictionary.html
rename : content/events/crashtests/eventctor-nullstorage.html => dom/events/crashtests/eventctor-nullstorage.html
rename : content/events/crashtests/recursive-DOMNodeInserted.html => dom/events/crashtests/recursive-DOMNodeInserted.html
rename : content/events/crashtests/recursive-onload.html => dom/events/crashtests/recursive-onload.html
rename : content/events/src/moz.build => dom/events/moz.build
rename : content/events/src/nsAsyncDOMEvent.cpp => dom/events/nsAsyncDOMEvent.cpp
rename : content/events/public/nsAsyncDOMEvent.h => dom/events/nsAsyncDOMEvent.h
rename : content/events/src/nsContentEventHandler.cpp => dom/events/nsContentEventHandler.cpp
rename : content/events/src/nsContentEventHandler.h => dom/events/nsContentEventHandler.h
rename : content/events/src/nsDOMAnimationEvent.cpp => dom/events/nsDOMAnimationEvent.cpp
rename : content/events/src/nsDOMAnimationEvent.h => dom/events/nsDOMAnimationEvent.h
rename : content/events/src/nsDOMBeforeUnloadEvent.cpp => dom/events/nsDOMBeforeUnloadEvent.cpp
rename : content/events/src/nsDOMBeforeUnloadEvent.h => dom/events/nsDOMBeforeUnloadEvent.h
rename : content/events/src/nsDOMClipboardEvent.cpp => dom/events/nsDOMClipboardEvent.cpp
rename : content/events/src/nsDOMClipboardEvent.h => dom/events/nsDOMClipboardEvent.h
rename : content/events/src/nsDOMCommandEvent.cpp => dom/events/nsDOMCommandEvent.cpp
rename : content/events/src/nsDOMCommandEvent.h => dom/events/nsDOMCommandEvent.h
rename : content/events/src/nsDOMCompositionEvent.cpp => dom/events/nsDOMCompositionEvent.cpp
rename : content/events/src/nsDOMCompositionEvent.h => dom/events/nsDOMCompositionEvent.h
rename : content/events/src/nsDOMDataContainerEvent.cpp => dom/events/nsDOMDataContainerEvent.cpp
rename : content/events/src/nsDOMDataContainerEvent.h => dom/events/nsDOMDataContainerEvent.h
rename : content/events/src/nsDOMDataTransfer.cpp => dom/events/nsDOMDataTransfer.cpp
rename : content/events/src/nsDOMDataTransfer.h => dom/events/nsDOMDataTransfer.h
rename : content/events/src/nsDOMDeviceMotionEvent.cpp => dom/events/nsDOMDeviceMotionEvent.cpp
rename : content/events/src/nsDOMDeviceMotionEvent.h => dom/events/nsDOMDeviceMotionEvent.h
rename : content/events/src/nsDOMDragEvent.cpp => dom/events/nsDOMDragEvent.cpp
rename : content/events/src/nsDOMDragEvent.h => dom/events/nsDOMDragEvent.h
rename : content/events/src/nsDOMEvent.cpp => dom/events/nsDOMEvent.cpp
rename : content/events/src/nsDOMEvent.h => dom/events/nsDOMEvent.h
rename : content/events/src/nsDOMEventTargetHelper.cpp => dom/events/nsDOMEventTargetHelper.cpp
rename : content/events/src/nsDOMEventTargetHelper.h => dom/events/nsDOMEventTargetHelper.h
rename : content/events/src/nsDOMFocusEvent.cpp => dom/events/nsDOMFocusEvent.cpp
rename : content/events/src/nsDOMFocusEvent.h => dom/events/nsDOMFocusEvent.h
rename : content/events/public/nsDOMKeyNameList.h => dom/events/nsDOMKeyNameList.h
rename : content/events/src/nsDOMKeyboardEvent.cpp => dom/events/nsDOMKeyboardEvent.cpp
rename : content/events/src/nsDOMKeyboardEvent.h => dom/events/nsDOMKeyboardEvent.h
rename : content/events/src/nsDOMMessageEvent.cpp => dom/events/nsDOMMessageEvent.cpp
rename : content/events/src/nsDOMMessageEvent.h => dom/events/nsDOMMessageEvent.h
rename : content/events/src/nsDOMMouseEvent.cpp => dom/events/nsDOMMouseEvent.cpp
rename : content/events/src/nsDOMMouseEvent.h => dom/events/nsDOMMouseEvent.h
rename : content/events/src/nsDOMMouseScrollEvent.cpp => dom/events/nsDOMMouseScrollEvent.cpp
rename : content/events/src/nsDOMMouseScrollEvent.h => dom/events/nsDOMMouseScrollEvent.h
rename : content/events/src/nsDOMMutationEvent.cpp => dom/events/nsDOMMutationEvent.cpp
rename : content/events/src/nsDOMMutationEvent.h => dom/events/nsDOMMutationEvent.h
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.cpp => dom/events/nsDOMNotifyAudioAvailableEvent.cpp
rename : content/events/src/nsDOMNotifyAudioAvailableEvent.h => dom/events/nsDOMNotifyAudioAvailableEvent.h
rename : content/events/src/nsDOMNotifyPaintEvent.cpp => dom/events/nsDOMNotifyPaintEvent.cpp
rename : content/events/src/nsDOMNotifyPaintEvent.h => dom/events/nsDOMNotifyPaintEvent.h
rename : content/events/src/nsDOMScrollAreaEvent.cpp => dom/events/nsDOMScrollAreaEvent.cpp
rename : content/events/src/nsDOMScrollAreaEvent.h => dom/events/nsDOMScrollAreaEvent.h
rename : content/events/src/nsDOMSimpleGestureEvent.cpp => dom/events/nsDOMSimpleGestureEvent.cpp
rename : content/events/src/nsDOMSimpleGestureEvent.h => dom/events/nsDOMSimpleGestureEvent.h
rename : content/events/src/nsDOMTextEvent.cpp => dom/events/nsDOMTextEvent.cpp
rename : content/events/src/nsDOMTextEvent.h => dom/events/nsDOMTextEvent.h
rename : content/events/src/nsDOMTouchEvent.cpp => dom/events/nsDOMTouchEvent.cpp
rename : content/events/src/nsDOMTouchEvent.h => dom/events/nsDOMTouchEvent.h
rename : content/events/src/nsDOMTransitionEvent.cpp => dom/events/nsDOMTransitionEvent.cpp
rename : content/events/src/nsDOMTransitionEvent.h => dom/events/nsDOMTransitionEvent.h
rename : content/events/src/nsDOMUIEvent.cpp => dom/events/nsDOMUIEvent.cpp
rename : content/events/src/nsDOMUIEvent.h => dom/events/nsDOMUIEvent.h
rename : content/events/src/nsDOMXULCommandEvent.cpp => dom/events/nsDOMXULCommandEvent.cpp
rename : content/events/src/nsDOMXULCommandEvent.h => dom/events/nsDOMXULCommandEvent.h
rename : content/events/src/nsEventDispatcher.cpp => dom/events/nsEventDispatcher.cpp
rename : content/events/public/nsEventDispatcher.h => dom/events/nsEventDispatcher.h
rename : content/events/src/nsEventListenerManager.cpp => dom/events/nsEventListenerManager.cpp
rename : content/events/src/nsEventListenerManager.h => dom/events/nsEventListenerManager.h
rename : content/events/src/nsEventListenerService.cpp => dom/events/nsEventListenerService.cpp
rename : content/events/src/nsEventListenerService.h => dom/events/nsEventListenerService.h
rename : content/events/public/nsEventNameList.h => dom/events/nsEventNameList.h
rename : content/events/src/nsEventStateManager.cpp => dom/events/nsEventStateManager.cpp
rename : content/events/src/nsEventStateManager.h => dom/events/nsEventStateManager.h
rename : content/events/public/nsEventStates.h => dom/events/nsEventStates.h
rename : content/events/public/nsIEventListenerService.idl => dom/events/nsIEventListenerService.idl
rename : dom/base/nsIJSEventListener.h => dom/events/nsIJSEventListener.h
rename : content/events/src/nsIMEStateManager.cpp => dom/events/nsIMEStateManager.cpp
rename : content/events/src/nsIMEStateManager.h => dom/events/nsIMEStateManager.h
rename : content/events/public/nsIPrivateTextEvent.h => dom/events/nsIPrivateTextEvent.h
rename : content/events/public/nsIPrivateTextRange.h => dom/events/nsIPrivateTextRange.h
rename : dom/src/events/nsJSEventListener.cpp => dom/events/nsJSEventListener.cpp
rename : dom/src/events/nsJSEventListener.h => dom/events/nsJSEventListener.h
rename : content/events/src/nsPaintRequest.cpp => dom/events/nsPaintRequest.cpp
rename : content/events/src/nsPaintRequest.h => dom/events/nsPaintRequest.h
rename : content/events/src/nsPrivateTextRange.cpp => dom/events/nsPrivateTextRange.cpp
rename : content/events/src/nsPrivateTextRange.h => dom/events/nsPrivateTextRange.h
rename : content/events/public/nsVKList.h => dom/events/nsVKList.h
rename : content/events/test/bug226361_iframe.xhtml => dom/events/test/bug226361_iframe.xhtml
rename : content/events/test/bug299673.js => dom/events/test/bug299673.js
rename : content/events/test/bug322588-popup.html => dom/events/test/bug322588-popup.html
rename : content/events/test/bug415498-doc1.html => dom/events/test/bug415498-doc1.html
rename : content/events/test/bug415498-doc2.html => dom/events/test/bug415498-doc2.html
rename : content/events/test/bug426082.html => dom/events/test/bug426082.html
rename : content/events/test/bug457672.html => dom/events/test/bug457672.html
rename : content/events/test/bug591249_iframe.xul => dom/events/test/bug591249_iframe.xul
rename : content/events/test/bug602962.xul => dom/events/test/bug602962.xul
rename : content/events/test/bug656379-1.html => dom/events/test/bug656379-1.html
rename : content/events/test/chrome.ini => dom/events/test/chrome.ini
rename : content/events/test/empty.js => dom/events/test/empty.js
rename : content/events/test/file_bug679494.html => dom/events/test/file_bug679494.html
rename : content/events/test/mochitest.ini => dom/events/test/mochitest.ini
rename : content/events/test/test_addEventListenerExtraArg.html => dom/events/test/test_addEventListenerExtraArg.html
rename : content/events/test/test_all_synthetic_events.html => dom/events/test/test_all_synthetic_events.html
rename : content/events/test/test_bug226361.xhtml => dom/events/test/test_bug226361.xhtml
rename : content/events/test/test_bug238987.html => dom/events/test/test_bug238987.html
rename : content/events/test/test_bug288392.html => dom/events/test/test_bug288392.html
rename : content/events/test/test_bug299673-1.html => dom/events/test/test_bug299673-1.html
rename : content/events/test/test_bug299673-2.html => dom/events/test/test_bug299673-2.html
rename : content/events/test/test_bug322588.html => dom/events/test/test_bug322588.html
rename : content/events/test/test_bug328885.html => dom/events/test/test_bug328885.html
rename : content/events/test/test_bug336682.js => dom/events/test/test_bug336682.js
rename : content/events/test/test_bug336682_1.html => dom/events/test/test_bug336682_1.html
rename : content/events/test/test_bug336682_2.xul => dom/events/test/test_bug336682_2.xul
rename : content/events/test/test_bug367781.html => dom/events/test/test_bug367781.html
rename : content/events/test/test_bug368835.html => dom/events/test/test_bug368835.html
rename : content/events/test/test_bug379120.html => dom/events/test/test_bug379120.html
rename : content/events/test/test_bug391568.xhtml => dom/events/test/test_bug391568.xhtml
rename : content/events/test/test_bug402089.html => dom/events/test/test_bug402089.html
rename : content/events/test/test_bug405632.html => dom/events/test/test_bug405632.html
rename : content/events/test/test_bug409604.html => dom/events/test/test_bug409604.html
rename : content/events/test/test_bug412567.html => dom/events/test/test_bug412567.html
rename : content/events/test/test_bug415498.xul => dom/events/test/test_bug415498.xul
rename : content/events/test/test_bug422132.html => dom/events/test/test_bug422132.html
rename : content/events/test/test_bug426082.html => dom/events/test/test_bug426082.html
rename : content/events/test/test_bug427537.html => dom/events/test/test_bug427537.html
rename : content/events/test/test_bug428988.html => dom/events/test/test_bug428988.html
rename : content/events/test/test_bug432698.html => dom/events/test/test_bug432698.html
rename : content/events/test/test_bug443985.html => dom/events/test/test_bug443985.html
rename : content/events/test/test_bug447736.html => dom/events/test/test_bug447736.html
rename : content/events/test/test_bug448602.html => dom/events/test/test_bug448602.html
rename : content/events/test/test_bug450876.html => dom/events/test/test_bug450876.html
rename : content/events/test/test_bug456273.html => dom/events/test/test_bug456273.html
rename : content/events/test/test_bug457672.html => dom/events/test/test_bug457672.html
rename : content/events/test/test_bug489671.html => dom/events/test/test_bug489671.html
rename : content/events/test/test_bug493251.html => dom/events/test/test_bug493251.html
rename : content/events/test/test_bug502818.html => dom/events/test/test_bug502818.html
rename : content/events/test/test_bug508479.html => dom/events/test/test_bug508479.html
rename : content/events/test/test_bug517851.html => dom/events/test/test_bug517851.html
rename : content/events/test/test_bug534833.html => dom/events/test/test_bug534833.html
rename : content/events/test/test_bug545268.html => dom/events/test/test_bug545268.html
rename : content/events/test/test_bug547996-1.html => dom/events/test/test_bug547996-1.html
rename : content/events/test/test_bug547996-2.xhtml => dom/events/test/test_bug547996-2.xhtml
rename : content/events/test/test_bug556493.html => dom/events/test/test_bug556493.html
rename : content/events/test/test_bug563329.html => dom/events/test/test_bug563329.html
rename : content/events/test/test_bug574663.html => dom/events/test/test_bug574663.html
rename : content/events/test/test_bug586961.xul => dom/events/test/test_bug586961.xul
rename : content/events/test/test_bug591249.xul => dom/events/test/test_bug591249.xul
rename : content/events/test/test_bug591815.html => dom/events/test/test_bug591815.html
rename : content/events/test/test_bug593959.html => dom/events/test/test_bug593959.html
rename : content/events/test/test_bug602962.xul => dom/events/test/test_bug602962.xul
rename : content/events/test/test_bug603008.html => dom/events/test/test_bug603008.html
rename : content/events/test/test_bug605242.html => dom/events/test/test_bug605242.html
rename : content/events/test/test_bug607464.html => dom/events/test/test_bug607464.html
rename : content/events/test/test_bug613634.html => dom/events/test/test_bug613634.html
rename : content/events/test/test_bug615597.html => dom/events/test/test_bug615597.html
rename : content/events/test/test_bug617528.xul => dom/events/test/test_bug617528.xul
rename : content/events/test/test_bug624127.html => dom/events/test/test_bug624127.html
rename : content/events/test/test_bug635465.html => dom/events/test/test_bug635465.html
rename : content/events/test/test_bug641477.html => dom/events/test/test_bug641477.html
rename : content/events/test/test_bug648573.html => dom/events/test/test_bug648573.html
rename : content/events/test/test_bug650493.html => dom/events/test/test_bug650493.html
rename : content/events/test/test_bug656379-1.html => dom/events/test/test_bug656379-1.html
rename : content/events/test/test_bug656379-2.html => dom/events/test/test_bug656379-2.html
rename : content/events/test/test_bug656954.html => dom/events/test/test_bug656954.html
rename : content/events/test/test_bug659071.html => dom/events/test/test_bug659071.html
rename : content/events/test/test_bug659350.html => dom/events/test/test_bug659350.html
rename : content/events/test/test_bug662678.html => dom/events/test/test_bug662678.html
rename : content/events/test/test_bug667612.html => dom/events/test/test_bug667612.html
rename : content/events/test/test_bug667919-1.html => dom/events/test/test_bug667919-1.html
rename : content/events/test/test_bug679494.xul => dom/events/test/test_bug679494.xul
rename : content/events/test/test_bug689564.html => dom/events/test/test_bug689564.html
rename : content/events/test/test_bug698929.html => dom/events/test/test_bug698929.html
rename : content/events/test/test_bug741666.html => dom/events/test/test_bug741666.html
rename : content/events/test/test_bug742376.html => dom/events/test/test_bug742376.html
rename : content/events/test/test_bug812744.html => dom/events/test/test_bug812744.html
rename : content/events/test/test_bug822898.html => dom/events/test/test_bug822898.html
rename : content/events/test/test_bug847597.html => dom/events/test/test_bug847597.html
rename : content/events/test/test_bug855741.html => dom/events/test/test_bug855741.html
rename : content/events/test/test_bug864040.html => dom/events/test/test_bug864040.html
rename : content/events/test/test_bug930374-chrome.html => dom/events/test/test_bug930374-chrome.html
rename : content/events/test/test_bug930374-content.html => dom/events/test/test_bug930374-content.html
rename : content/events/test/test_bug944011.html => dom/events/test/test_bug944011.html
rename : content/events/test/test_bug944847.html => dom/events/test/test_bug944847.html
rename : content/events/test/test_bug946632.html => dom/events/test/test_bug946632.html
rename : content/events/test/test_clickevent_on_input.html => dom/events/test/test_clickevent_on_input.html
rename : content/events/test/test_continuous_wheel_events.html => dom/events/test/test_continuous_wheel_events.html
rename : content/events/test/test_dblclick_explicit_original_target.html => dom/events/test/test_dblclick_explicit_original_target.html
rename : content/events/test/test_dom_keyboard_event.html => dom/events/test/test_dom_keyboard_event.html
rename : content/events/test/test_dom_mouse_event.html => dom/events/test/test_dom_mouse_event.html
rename : content/events/test/test_dom_wheel_event.html => dom/events/test/test_dom_wheel_event.html
rename : content/events/test/test_draggableprop.html => dom/events/test/test_draggableprop.html
rename : content/events/test/test_dragstart.html => dom/events/test/test_dragstart.html
rename : content/events/test/test_eventctors.html => dom/events/test/test_eventctors.html
rename : content/events/test/test_eventctors.xul => dom/events/test/test_eventctors.xul
rename : content/events/test/test_focus_disabled.html => dom/events/test/test_focus_disabled.html
rename : content/events/test/test_messageEvent.html => dom/events/test/test_messageEvent.html
rename : content/events/test/test_moz_mouse_pixel_scroll_event.html => dom/events/test/test_moz_mouse_pixel_scroll_event.html
rename : content/events/test/test_wheel_default_action.html => dom/events/test/test_wheel_default_action.html
rename : content/events/test/window_bug493251.html => dom/events/test/window_bug493251.html
rename : content/events/test/window_bug617528.xul => dom/events/test/window_bug617528.xul
rename : content/events/test/window_bug659071.html => dom/events/test/window_bug659071.html
rename : content/events/test/window_wheel_default_action.html => dom/events/test/window_wheel_default_action.html
extra : rebase_source : 5eb1db8f1791b8842ddc683e3c0ea13e4e3a933b
2014-01-10 16:03:25 +13:00
Ryan VanderMeulen
fdd6001939 Merge m-c to inbound. 2014-01-16 15:07:22 -05:00
Terrence Cole
6beccf2363 Bug 959787 - Handlify several JSAPI interfaces that can GC, Part 3; r=sfink
--HG--
extra : rebase_source : ace7b0fa6ba93acbf0ec8ecaeb68ffa287a33665
2014-01-16 09:48:58 -08:00
Nathan Froyd
7cc4b6c4c7 Bug 957659 - slim down WidgetKeyboardEvent::GetDOMKeyName; r=masayuki
Instead of calling nsAString::Assign several hundred times along with a
switch statement that may or may not get translated into a jump table,
let's implement our own lookup table that we can guarantee will be
constant time.  The KeyNameTable struct is used instead of the more
obvious |const char* const table[]| idiom to avoid runtime relocations.
2014-01-08 11:45:30 -05:00
Kartikaya Gupta
2cc1258e72 Bug 951113 - Trigger a repaint request when getting a scroll offset update to cover a race condition allowed by async IPC. r=botond 2014-01-14 16:43:43 -05:00
Kartikaya Gupta
2bb20bdd8a Bug 951113 - Fix code to adjust the displayport when the scroll offset is changing. r=Cwiiis 2014-01-14 16:43:42 -05:00
Masayuki Nakano
29c7ba8ffb Bug 951966 part.5 nsTextStore should handle WM_INPUTLANGCHANGE on WinXP for caching if active IME is IMM-IME r=jimm 2014-01-14 11:01:00 +09:00
Masayuki Nakano
654879bf1b Bug 951966 part.4 nsIMM32Handler shouldn't handle any messages in TSF mode if active IME is not implemented with IMM r=jimm 2014-01-14 11:01:00 +09:00
Masayuki Nakano
240cbee368 Bug 951966 part.3 nsIMM32Handler should handle messages even in TSF mode r=jimm 2014-01-14 11:01:00 +09:00
Masayuki Nakano
e213d2ddd5 Bug 951966 part.2 Associate or disassociate IME context to focused window even in TSF mode r=jimm 2014-01-14 11:00:59 +09:00
Masayuki Nakano
6915530fae Bug 951966 part.1 Add new pref to support IMM-IME even in TSF mode and rename intl.enable_tsf_support to intl.tsf.enable r=jimm 2014-01-14 11:00:59 +09:00
Masayuki Nakano
7b4188b642 Bug 957019 Don't check mouse cursor position at handling non-mouse message in nsWindow::DealWithPopups() r=jimm+enndeakin 2014-01-14 09:13:25 +09:00
Ryan VanderMeulen
b998c68cd4 Merge m-c to inbound. 2014-01-13 17:52:40 -05:00
Ryan VanderMeulen
e7b8f32115 Merge inbound to m-c. 2014-01-13 17:44:24 -05:00
Steven Michaud
206c2946fb Bug 722676 - View menu item stays selected when returning from opened window. r=josh 2014-01-13 16:01:52 -06:00
Markus Stange
2e7d9d19a6 Bug 959570 - Don't draw rounded corners and a highlight line in fullscreen mode. r=smichaud 2014-01-17 11:06:15 +01:00
Makoto Kato
4b964949ae Bug 960493 - SelectionEvent doesn't call MOZ_CRASH for IPC. r=roc 2014-01-17 10:14:39 +09:00
Carsten "Tomcat" Book
8a0fd8f669 Merge mozilla-central to b2g-inbound 2014-01-13 14:44:08 +01:00
Solomon Chiu
e2d823b344 Bug 946245 - Port GonkDisplay to KK, r=mwu,sotaro,pchang 2014-01-09 18:42:54 +08:00
Ryan VanderMeulen
a87352cc59 Merge inbound to m-c. 2014-01-10 14:46:40 -05:00
Michael Wu
d4dab415de Bug 937713 - Replace gWindowToRedraw with a simpler mechanism, r=roc 2014-01-10 17:02:01 +08:00
Michael Wu
5683863a86 Bug 958383 - Make gonk nsWindow::Destroy act like other implementations, r=roc 2014-01-10 14:48:18 +08:00
Wes Kocher
f59e9b629f Merge b2g-inbound to m-c 2014-01-09 16:32:37 -08:00
Markus Stange
bd2820af26 Bug 958025 - Disable the scissor test in nsChildView::DrawWindowOverlay so that window controls are visible again. r=bjacob 2014-01-09 17:59:24 +01:00
Carsten "Tomcat" Book
0569382ec0 merge fx-team to mozilla-central 2014-01-09 12:59:42 +01:00
Matt Brubeck
b64a1950ab Bug 957490 - Fix initialization of MouseEvent.buttons on Metro [r=jimm] 2014-01-08 20:16:48 -08:00
Matt Brubeck
e7f0897f0a Bug 945438 - Set event.cancelable for mousedown correctly on Metro [r=jimm] 2014-01-08 20:16:48 -08:00
Ryan VanderMeulen
7b891e49c7 Merge m-c to inbound. 2014-01-08 15:37:08 -05:00
Ryan VanderMeulen
0486db7a28 Merge inbound to m-c. 2014-01-08 15:33:52 -05:00