Commit Graph

23970 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
293d5a86e7 Backed out changeset 42f348168125 (bug 966452) 2014-07-04 08:23:38 +02:00
Carsten "Tomcat" Book
2b96ad9a31 Backed out changeset 97708994eae6 (bug 857648) 2014-07-04 08:23:37 +02:00
Carsten "Tomcat" Book
362be5f5ca Backed out changeset b617c11c9476 (bug 857648) 2014-07-04 08:23:35 +02:00
Carsten "Tomcat" Book
0860f3621e Backed out changeset 04b06ee60ebf (bug 857648) 2014-07-04 08:23:34 +02:00
Carsten "Tomcat" Book
4c088305f3 Backed out changeset e4dd7f8cf275 (bug 857648) 2014-07-04 08:23:32 +02:00
Carsten "Tomcat" Book
02c6251d29 Backed out changeset a4524d7aec4f (bug 857648) 2014-07-04 08:23:31 +02:00
Boris Zbarsky
6e9b9f3392 Bug 857648 part 5. Expose a .stack property on DOMExceptions. r=khuey 2014-07-04 01:25:16 -04:00
Boris Zbarsky
b4fdd35537 Bug 857648 part 4. Add a formattedStack attribute on nsIStackFrame. r=khuey 2014-07-04 01:25:16 -04:00
Boris Zbarsky
dd908642fb Bug 857648 part 3. Switch from using JS::DescribeStack to JS::CaptureCurrentStack for producing JSStackFrames. r=khuey 2014-07-04 01:25:16 -04:00
Boris Zbarsky
d38c157620 Bug 857648 part 2. Split JSStackFrame into a generic class and a JS-specific class. r=khuey 2014-07-04 01:25:16 -04:00
Boris Zbarsky
f00b467362 Bug 857648 part 1. Remove unnecessary code that tries to filter out non-JS stack frames from a known-JS-only stack. r=khuey 2014-07-04 01:25:15 -04:00
Boris Zbarsky
db8db7f239 Bug 966452 part 2. Report all unhandled Promise rejections. r=nsm 2014-07-04 01:24:59 -04:00
Boris Zbarsky
eb7c1c0611 Bug 1018583 part 1. Remove the execute-in-sandbox mode for javascript: URIs, and use the don't-execute mode wherever we used the sandbox one. r=bholley,dao 2014-07-04 01:21:57 -04:00
Ben Kelly
87bc910d78 Backout 303027a0da95 (bug 1013571) due to persistent oranges (bug 1032011, bug 1032605, bug 1032783) 2014-07-04 00:31:59 -04:00
Reed Koser
5ccdac7668 Bug 965967, part 2 - Get rid of the remaining Thebes backed gfxContexts in PluginInstanceChild.cpp. r=mattwoodrow 2014-07-04 03:36:21 +01:00
Ryan VanderMeulen
736184d2ff Backed out changeset 9cb84e8bbb30 (bug 1032415) for frequent Windows XP debug mochitest-other asserts.
CLOSED TREE
2014-07-03 20:53:31 -04:00
Kyle Huey
5b2eee04b3 Bug 1032415: Mark nsGlobalWindow::GetContextForEventHandlers as inner only. r=smaug 2014-07-03 15:19:03 -07:00
Kyle Huey
8dfc1cbe57 Bug 1033343: Handle an uninitialized CustomEvent correctly. r=smaug 2014-07-03 15:19:03 -07:00
Ryan VanderMeulen
a5bbac22a2 Merge m-c to inbound on a CLOSED TREE. a=merge 2014-07-03 17:05:19 -04:00
Ryan VanderMeulen
19918db2e4 Merge inbound to m-c. a=merge 2014-07-03 17:03:48 -04:00
Robert Longson
a8f6234be4 Bug 556441 - Interpolation fails for stroke-width and stroke-dashoffset when animating between unitless values & values with units. r=dbaron 2014-07-03 20:05:43 +01:00
Luke Wagner
4fcaf80bcf Bug 1030446 - dom/asmjscache/tests should pass if isAsmJSCompilationEnabled is false (r=me)
--HG--
extra : rebase_source : c9f2ef6114cf1d29a4081cb9e3aa72b7e9a800b1
2014-07-03 12:39:53 -05:00
Ryan VanderMeulen
661e77b06d Backed out changesets 4cd69faa8bc0 and 54252e150439 (bug 976963) for B2G mochitest failures. 2014-07-03 13:31:31 -04:00
Ryan VanderMeulen
2ab343d76c Backed out changesets 4a19dcbc7e7a and 4907115e02e3 (bug 1029248) for non-unified bustage.
CLOSED TREE
2014-07-03 13:19:29 -04:00
Bill McCloskey
c6d95353ef Bug 1029248 - Add helpers to simplify CPOW unwrapping (r=mrbkap) 2014-07-03 09:48:21 -07:00
Ryan VanderMeulen
446d864f2f Bug 967614 - Comment out bogus assertion and re-enable test_closeOnGC.html on Android and B2G. r=khuey 2014-07-03 12:47:38 -04:00
Bobby Holley
268db82b97 Bug 1032317 - Make CompartmentPrivate and XPCWrappedNativeScope accessors infallible. r=gabor 2014-07-03 09:40:52 -07:00
Bobby Holley
66eabb813a Bug 1032317 - Remove XPCWrappedNativeScope::GetNewOrUsed. r=gabor 2014-07-03 09:40:52 -07:00
Ryan VanderMeulen
6933930a60 Merge m-c to b2g-inbound. a=merge 2014-07-03 12:38:30 -04:00
Carsten "Tomcat" Book
946a8bf47e merge mozilla-inbound to mozilla-central a=merge 2014-07-03 13:46:41 +02:00
Shawn Huang
a9d0030d0e Bug 1033273 - Part 2: Add InitHfpInterface/DeinitHfpinterface. r=btian 2014-07-03 00:05:00 -04:00
Shawn Huang
82df54a710 Bug 1033273 - Part 1: Add InitHfpInterface/DeinitHfpinterface. r=btian 2014-07-03 00:04:00 -04:00
Shawn Huang
897601714b Bug 1033234 - Fix build break when building JB 4.2. r=tzimmermann 2014-07-02 22:58:00 -04:00
Nils Ohlmeier [:drno]
7bc674c0ad Bug 1020024 - fix data channel connecting race conditions. r=jib 2014-07-02 18:08:00 +02:00
Yuan Xulei
4ec5eecc73 Bug 1027127 - Remove setTimeout to avoid intermittent test failure. r=dchan 2014-07-03 14:07:06 +08:00
Jed Davis
64a64fe325 Bug 956961 - Open content processes' DMD log files in the parent process. r=njn
--HG--
extra : rebase_source : 2958f582f43bfac86ec29d784b4fb8825ca17257
extra : histedit_source : 96e39e36cbe506332d761c375b902284a695901a%2C245fc9ec3c6a3bbf4e5e5ce7b0da63f4477f36b9
2014-07-02 15:59:02 -07:00
Nikhil Marathe
ff66d7f07e Bug 984048 - Patch 5 - ServiceWorker [[Install]] algorithm. r=ehsan, khuey
--HG--
extra : rebase_source : 6c710937fde2ebe679908690c1295927eb4c195d
2014-07-02 17:48:50 -07:00
Nikhil Marathe
24b72efa5f Bug 984048 - Patch 4 - Handle parse and uncaught errors. r=khuey
--HG--
extra : rebase_source : 463146233c874c2f2c63c018f2a43a66ca9ea49a
2014-07-02 17:48:35 -07:00
Wes Kocher
0908f44530 Merge m-c to inbound 2014-07-02 17:44:20 -07:00
Wes Kocher
b56c8610ac Backed out 2 changesets (bug 1028187) for mochitest-oth orange
Backed out changeset 01cba8ff52dd (bug 1028187)
Backed out changeset caf43baf3306 (bug 1028187)
2014-07-02 17:29:33 -07:00
Wes Kocher
b375915382 Merge b2g-inbound to m-c a=merge 2014-07-02 17:00:33 -07:00
Michael Wu
b01b9ff98d Bug 1033209 - Lazily initialize gps callbacks, r=kanru 2014-07-02 22:59:46 +08:00
Szu-Yu Chen [:aknow]
73624ccc17 Bug 1031239 - Part 2: Select clientId for emergency call. r=hsinyi 2014-07-02 03:47:00 -04:00
Szu-Yu Chen [:aknow]
0bf899573e Bug 1031239 - Part 1: Refactoring. r=hsinyi 2014-07-02 03:47:00 -04:00
Dimi Lee
38d8da26a1 Bug 1028037 - NFC testcase failure with error message 'Accessing TypedArray data over Xrays is slow'. r=bholley 2014-07-03 14:55:13 +08:00
Hsin-Yi Tsai
ef2825cac2 Bug 1023141 - query ril.ecclist per dial request - part 3 - fix xpcshell. r=aknow 2014-06-30 14:48:41 +08:00
Tim Taubert
348efb07eb Bug 1028187 - Enable IndexedDB for about:looppanel and about:loopconversation, sharing an origin r=bz 2014-06-28 11:56:06 +02:00
Wes Kocher
d92a5b23cd Backed out 3 changesets (bug 956961) for non-unified build bustage
Backed out changeset f1be89cb58b9 (bug 956961)
Backed out changeset 272b01e4f856 (bug 956961)
Backed out changeset 56907af18c66 (bug 956961)
2014-07-02 15:03:29 -07:00
Anup-Allamsetty
52e4297e97 Bug 1030299 - Cleanup a build warning in Volume.cpp. r=dhylands 2014-06-27 18:50:00 -04:00
Robert Longson
f8dd9d1270 Bug 1024860 - getTotalLength on an empty path should not throw but return 0 instead. r=jwatt,bzbarsky 2014-07-03 19:50:42 +01:00
Hsin-Yi Tsai
88505d6a41 Bug 1023141 - query ril.ecclist per dial request - part 2 - test case. r=aknow 2014-06-24 18:47:12 +08:00
Hsin-Yi Tsai
c72fb36aee Bug 1023141 - query ril.ecclist per dial request - part 1 - fix. r=aknow 2014-06-24 18:32:41 +08:00
Hsin-Yi Tsai
29e1b3fd69 Bug 1023141 - query ril.ecclist per dial request - part 0 - rename. r=aknow 2014-06-24 18:36:59 +08:00
Wes Kocher
8258011392 Merge m-c to b2g-inbound 2014-07-02 17:40:55 -07:00
Mike Habicher
8a6543f672 Bug 1029367 - handle ISO modes without "ISO" prefixes, r=dhylands 2014-07-02 18:49:54 -04:00
Qeole
4c2d644b75 Bug 1011339 - Closing OOPP plugin container in TryUnloadPlugin, even if mLibrary is loaded. r=bsmedberg 2014-07-02 08:34:00 -04:00
Maksim Lebedev
e17f0a7284 Bug 976963 - After invoking the releasePointerCapture method on an element, subsequent events for the specified pointer must follow normal hit testing mechanisms for determining the event target. r=smaug 2014-06-20 09:20:00 -04:00
Thomas Zimmermann
1e1abb5f92 Bug 1029386: Asynchronous Bluedroid DUT and LE interfaces, r=shuang 2014-07-03 09:53:39 +02:00
Thomas Zimmermann
7fc27209e5 Bug 1029386: Asynchronous authentification in Bluedroid, r=shuang 2014-07-03 09:53:32 +02:00
Thomas Zimmermann
5ad7032e90 Bug 1029386: Asynchronous Bluedroid device bonding, r=shuang 2014-07-03 09:53:20 +02:00
Thomas Zimmermann
920ff4a3a8 Bug 1029386: Asynchronous discovery methods in Bluedroid, r=shuang 2014-07-03 09:53:06 +02:00
Thomas Zimmermann
de027ee659 Bug 1029386: Asynchronous remote-service methods in Bluedroid, r=shuang 2014-07-03 09:52:52 +02:00
Thomas Zimmermann
9a7c41c9e2 Bug 1029386: Asynchronous Bluedroid device-property methods, r=shuang 2014-07-03 09:52:35 +02:00
Thomas Zimmermann
32dc1214e2 Bug 1029386: Asynchronous Bluedroid adapter methods, r=shuang 2014-07-03 09:52:19 +02:00
Thomas Zimmermann
25befc9c4f Bug 1029386: Asynchronous Bluedroid starting and stopping, r=shuang 2014-07-03 09:51:57 +02:00
Thomas Zimmermann
104df52f65 Bug 1029386: Split Bluedroid start/stop code, r=shuang
This patch prepares refactoring of the Bluedroid start and stop
code towards an asynchronous design.
2014-07-03 09:51:40 +02:00
Thomas Zimmermann
e2ec3ca124 Bug 1029386: Add result handler for Bluetooth Core profile, r=shuang
The result-handler class contains a method for each interface
in the Core profile and a method for failed calls. The patch
also adds runnable classes that execute a result handler's
method on the main thread.
2014-07-03 09:51:27 +02:00
Boris Zbarsky
0ddb61e498 Bug 1033100. Fix event codegen to compile when an event has a sequence-of-non-null-interface-type member. r=smaug 2014-07-02 15:16:43 -04:00
Boris Zbarsky
1fd4559d36 Bug 1033157. Move the setup of the JSRuntime DOM callbacks into the CycleCollectedJSRuntime constructor, so we don't have to separatedly do it for workers, windows, and xpcshell. r=khuey 2014-07-02 15:16:42 -04:00
Jed Davis
ce696ef6d9 Bug 956961 - Open content processes' DMD log files in the parent process. r=njn 2014-07-02 11:27:48 -07:00
Kestrel
d6e54f0575 Bug 378775 - Implement Opera's behavior for selecting text inside of a link and link drag and drop. r=Enn 2014-07-03 04:26:00 -04:00
Carsten "Tomcat" Book
4aa75dcb7b Merge mozilla-central to mozilla-inbound 2014-07-03 14:16:06 +02:00
Jan de Mooij
b5ea9e5fa4 Bug 1032726 part 6 - Some followup changes. r=bz 2014-07-03 13:05:03 +02:00
Carsten "Tomcat" Book
f6711b3600 Backed out changeset b191be106cae (bug 744896) for B2G ICS Emulator Opt Test failures on a CLOSED TREE 2014-07-03 11:52:23 +02:00
Carsten "Tomcat" Book
c5d0014779 Backed out changeset d8350c756910 (bug 744896) for B2G ICS Emulator Opt Test failures on a CLOSED TREE 2014-07-03 11:52:07 +02:00
Jan de Mooij
1043d3cf9c Bug 1032726 part 5 - Make new DOM bindings work with Latin1 strings. r=bz 2014-07-03 10:03:56 +02:00
Bobby Holley
b4d5c952de Bug 1031988 - Grab the principal from the object rather than the window when resolving the controller shim. r=bz 2014-07-02 10:13:14 -07:00
Bob Owen
0ac4ef8e6d Bug 1030707 - Part 8: Replace AutoCxPusher in WorkerPrivateParent<Derived>::DispatchMessageEventToMessagePort. r=bholley 2014-07-02 11:26:49 +01:00
Bob Owen
429d016ee8 Bug 1030707 - Part 7: Replace AutoPushJSContext in WorkerPrivateParent<Derived>::DispatchMessageEventToMessagePort. r=bholley 2014-06-30 20:39:15 +01:00
Bob Owen
ea0d7fb015 Bug 1030707 - Part 6: Replace AutoPushJSContext in RuntimeService::ResumeWorkersForWindow. r=bholley 2014-06-30 20:37:25 +01:00
Bob Owen
5039b773cf Bug 1030707 - Part 5: Replace AutoPushJSContext in SynchronizeAndResumeRunnable::Run. r=bholley 2014-07-01 11:25:27 +01:00
Bob Owen
731683de0a Bug 1030707 - Part 4: Replace AutoPushJSContext in RuntimeService::SuspendWorkersForWindow. r=bholley 2014-06-30 20:17:09 +01:00
Bob Owen
60e6460c8f Bug 1030707 - Part 3: Replace AutoPushJSContext in RuntimeService::CancelWorkersForWindow. r=bholley 2014-06-30 16:21:27 +01:00
Bob Owen
459ceab3bb Bug 1030707 - Part 2: Replace AutoPushJSContext in DataStoreAddRunnable::MainThreadRun. r=bholley 2014-06-30 16:05:22 +01:00
Bob Owen
b7eb3076e8 Bug 1030707 - Part 1: Replace AutoPushJSContext in DataStorePutRunnable::MainThreadRun. r=bholley 2014-06-26 13:47:52 +01:00
Jan de Mooij
23294e95c6 Bug 1032726 part 3 - Make FindEnumStringIndex work with Latin1 strings. r=bz,terrence
--HG--
extra : rebase_source : dd266d1453f926438eec533502d75e2a7de37795
2014-07-02 15:45:04 +02:00
Jan de Mooij
7ee62a47c5 Bug 1032726 part 2 - Make GetArrayIndexFromId work with Latin1 strings. r=bz,terrence
--HG--
extra : rebase_source : b6f8fe3df3946dfe05f5467c22c4fb157b6dcbf2
2014-07-02 15:45:02 +02:00
Carsten "Tomcat" Book
d6c884a0d2 Merge mozilla-central to mozilla-inbound 2014-07-02 15:09:37 +02:00
Carsten "Tomcat" Book
fb3b76b37b merge b2g-inbound to mozilla-central a=merge
--HG--
extra : amend_source : 7fa8699b38befea0f21f1b84a1c998efb03f614e
2014-07-02 15:05:32 +02:00
Ben Tian
145f5d24aa Bug 1006314 - Patch 3/3: Revise BluetoothAdapter, r=bz, r=echou 2014-07-02 16:25:50 +08:00
Ben Tian
fd8dc9104d Bug 1006314 - Patch 2/3: Implement BluetoothDiscoveryHandle, r=bz, r=echou 2014-07-02 11:16:37 +08:00
Ben Tian
77541ae68e Bug 1006314 - Patch 1/3: Revise BluetoothAdapter2.webidl and add BluetoothDiscoveryHandle.webidl, r=bz 2014-07-02 11:16:26 +08:00
Chuck Lee
2d322257ef Bug 1030591 - Send connectionInfoUpdate while IP change. r=vchang 2014-06-27 17:26:31 +08:00
Shawn Ku
d3b13a145c Bug 1007487 - Part 2: test patch - B2G RIL: incorrect isDisplayNetworkNameRequired for not matching both HPLMN and EF_SPDI. v2. r=HsinYi. 2014-07-01 11:52:17 +08:00
Shawn Ku
d939e5d300 Bug 1007487 - Part 1: RIL patch - B2G RIL: incorrect isDisplayNetworkNameRequired for not matching both HPLMN and EF_SPDI. v2. r=HsinYi. 2014-07-01 11:51:20 +08:00
Jessica Jong
5530874fb2 Bug 1013153 - Part 2: test cases for mvno type 'spn'. r=hsinyi 2014-07-01 02:10:00 +02:00
Jessica Jong
c97101ea93 Bug 1013153 - Part 1: support mvno type 'spn' in matchMvno() function. r=hsinyi 2014-07-01 02:09:00 +02:00
David Chan
7e2824c0c1 Bug 1025994 - Rewrite webapps-manage test. r=baku 2014-06-26 15:00:52 -07:00
Martin Thomson
c34497e879 Bug 1005152 - Testing the addition of multiple fingerprints. r=jib 2014-06-30 14:31:00 +02:00
Martin Thomson
b54a82f382 Bug 1005152 - Permitting the use of multiple fingerprints. r=jib 2014-06-20 11:09:00 +02:00
Randy Lin
2d56102806 Bug 951008 - Media Recorder - fire onstart event when encoder start to generate encoded data. r=roc, sr=khuey. 2014-06-27 11:07:45 +08:00
Boris Zbarsky
5118eea016 Bug 966471. Add some facilities for examining the state of a promise via a PromiseDebugging utility namespace. r=nsm,peterv 2014-07-02 00:19:48 -04:00
Wes Kocher
591066be60 Backed out 3 changesets (bug 984048) for breaking hazard builds.
Backed out changeset 2d0c34b7045f (bug 984048)
Backed out changeset c18211a2afa1 (bug 984048)
Backed out changeset 30fa36882d57 (bug 984048)
2014-07-01 20:29:08 -07:00
Wes Kocher
cfc078059e Merge m-c to inbound a=merge 2014-07-01 17:38:49 -07:00
Wes Kocher
5e0cc95707 Merge b2g-inbound to m-c a=merge 2014-07-01 17:34:32 -07:00
Nikhil Marathe
f42a07f1f7 Bug 965644 - Fix intermittent oranges on promise tests. r=bz 2014-07-01 17:33:00 -07:00
Steve Fink
6b4c20ca18 Bug 1022773 - Fix AutoJSAPI initialization rooting by annotating nsIScriptContext.GetWindowProxy and (temporarily) runtime-rooting, r=bholley 2014-07-01 09:02:10 -07:00
Thomas Zimmermann
2f14c73f68 Bug 1031185: Convert Bluetooth to use Bluedroid wrappers (under bluedroid2/), r=btian
This patch converts the Bluedroid backend to use the wrapper
classes. The affected interfaces are Core, Sockets, Handsfree,
A2DP, and AVRCP.
2014-07-01 17:50:46 +02:00
Thomas Zimmermann
241bc819da Bug 1031185: Wrap Bluedroid interfaces in classes (under bluedroid2/), r=btian
This patch adds classes around all Bluedroid interfaces that are
currently used by Gecko. These are Core, Socket, Handsfree, A2DP,
and AVRCP.

All arguments and return values are still Bluedroid types and
constants. Future patches will convert them to interface-neutral
artifacts.
2014-07-01 17:50:30 +02:00
Carsten "Tomcat" Book
98ef7c48ac Merge mozilla-central to b2g-inbound 2014-07-01 15:52:10 +02:00
Carsten "Tomcat" Book
7c04ea4089 Backed out changeset 66c50c46b452 (bug 1023141) for causing bug 1032716 2014-07-01 15:36:36 +02:00
Carsten "Tomcat" Book
6c6bb8b39e Backed out changeset c6fee4d37e2a (bug 1023141) 2014-07-01 15:35:54 +02:00
Carsten "Tomcat" Book
02874601c2 Backed out changeset cbfa2a0f8a14 (bug 1023141) 2014-07-01 15:35:50 +02:00
Carsten "Tomcat" Book
953496b437 Backed out changeset 3e0f23a63700 (bug 1023141) 2014-07-01 15:35:31 +02:00
Carsten "Tomcat" Book
b8feefc866 Merge mozilla-central to b2g-inbound 2014-07-01 14:34:41 +02:00
Carsten "Tomcat" Book
d321710e2a merge mozilla-inbound to mozilla-central a=merge 2014-07-01 14:01:21 +02:00
Dimi Lee
cb06ef8c86 Bug 1023683 - Testcase for reading NDEF data from type 3 tag. r=tzimmermann 2014-07-01 14:44:39 +08:00
Wes Kocher
7eb86ccbc0 Merge m-c to inbound a=merge 2014-06-30 18:47:26 -07:00
Wes Kocher
e585edf880 Merge b2g-inbound to m-c a=merge 2014-06-30 18:31:38 -07:00
Myk Melez
381e9481c6 Bug 1030464 - log mozApps debug messages only if pref is set; r=fabrice 2014-06-30 17:27:34 -07:00
Kyle Huey
c9a0eb19e2 Bug 1032340: Make Has/SetMutationListeners available on the inner window only. r=smaug 2014-06-30 16:02:04 -07:00
Kyle Huey
b0f4a14fc1 Bug 1031051: Part 18 - Kill the old XPIDL-based event generator. r=smaug 2014-06-30 16:02:04 -07:00
Kyle Huey
2a8f98fb8a Bug 1031051: Part 17 - Manually implement CustomEvent. r=smaug
CustomEvent can't be generated because we still need the XPCOM interface which is used by a11y among others.
2014-06-30 16:02:04 -07:00
Kyle Huey
46449c2b20 Bug 1031051: Part 16 - Migrate Style*ChangeEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:04 -07:00
Kyle Huey
c45823d923 Bug 1031051: Part 15 - Migrate Speech events to the WebIDL code generator. r=smaug 2014-06-30 16:02:03 -07:00
Kyle Huey
49c62f1910 Bug 1031051: Part 14 - Migrate DOMTransactionEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:03 -07:00
Kyle Huey
a422390560 Bug 1031051: Part 13 - Support ToJSValue()ing CallbackObjects and nsTArrays of raw pointers. r=bz
Without special handling CallbackObject subclasses will fall into the "nsISupports but not nsWrapperCache" case which goes through an XPConnect wrapping path that has no idea how to cope with a CallbackObject.  We need both the CallbackObject overload and the EnableIf bit in the template because the template will bind to the subclass and thus be preferred to the CallbackObject overload which requires an implicit conversion to the base class.

Before this patch nsTArray<T*> will eventually try to ToJSValue a T* which will select the boolean overload.  Thanks C++!  The new template overload that takes a T and attempts to dereference it will be preferred because it can bind to the type directly and does not require the implicit (and terrible!) conversion to bool.  This template is written in terms of T and not T* so we can test to see if T is a pointer type (and not merely something that can be coerced to a T*, such as a T[N]).
2014-06-30 16:02:03 -07:00
Kyle Huey
fa19fcd2c5 Bug 1031051: Part 12 - Migrate DeviceStorageChangeEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:03 -07:00
Kyle Huey
872d591aa2 Bug 1031051: Part 11 - Migrate DeviceOrientationEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:03 -07:00
Kyle Huey
d6a2b3b898 Bug 1031051: Part 10 - Migrate MozSettingsEvent and MozApplicationEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Kyle Huey
e4940ba33b Bug 1031051: Part 9 - Migrate RecordErrorEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Kyle Huey
217b65221f Bug 1031051: Part 8 - Migrate SmartCardEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Kyle Huey
81efb10283 Bug 1031051: Part 7 - Migrate PageTransitionEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Kyle Huey
e375b0aae7 Bug 1031051: Part 6 - Migrate PopStateEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:02 -07:00
Kyle Huey
760b7d243b Bug 1031051: Part 5 - Migrate PopupBlockedEvent to the WebIDL code generator. r=smaug 2014-06-30 16:02:01 -07:00
Kyle Huey
ee70914a12 Bug 1031051: Part 4 - Remove ReplaceElementEvent. r=khuey,wchen 2014-06-30 16:01:11 -07:00
Kyle Huey
9fdab2c0a8 Bug 1031051: Part 3 - Migrate CloseEvent to the WebIDL code generator. r=smaug 2014-06-30 16:00:31 -07:00
Kyle Huey
726d8c16de Bug 1031051: Part 2 - Migrate HashChangeEvent to the WebIDL code generator. r=smaug 2014-06-30 16:00:31 -07:00
Kyle Huey
3a67a40bfc Bug 1031051: Part 1 - Allow codegenerating an InitFooEvent method for legacy event types. r=smaug,bz 2014-06-30 16:00:31 -07:00
Jon Morton
3cce0e05ec Bug 1032417: Move nsPluginElement's destructor to the implementation file. r=khuey 2014-06-30 16:00:30 -07:00
Andrew Osmond
d43c37f88e Bug 1030821 - Fix broken zoom by making recording hint be set as boolean. r=mikeh 2014-06-30 06:33:00 -04:00
Bill McCloskey
61c2c19dc4 Bug 1030343 - Fix compile error in UnionTypes.cpp in old gcc (r=bz) 2014-06-30 14:36:45 -07:00
Ryan VanderMeulen
1c2cc9d12b Backed out changesets bacfdc83424a and 7d12b5d7446f (bug 984048) for crashes. 2014-06-30 17:22:47 -04:00
Eric Faust
ae2d610abf Bug 1027402 - Part 4: Mark Proxy Handler uses const. (r=jorendorff, r=bz) 2014-06-27 04:44:08 -07:00
Eric Faust
83a8fc2004 Bug 1027402 - Part 3: Mark all Proxy Handler methods const. (r=jorendorff, r=bz) 2014-06-27 04:44:06 -07:00
Eric Faust
79682b184f Bug 1027402 - Part 2: Mark Proxy Handler instances as const. (r=bholley, r=bz over IRC) 2014-06-27 04:44:04 -07:00
Eric Faust
da64b8a93e Bug 1027402 - Part 1: Remove set* from BaseProxyHandler. (r=bholley) 2014-06-27 04:44:02 -07:00
Nikhil Marathe
9e1ac294fa Bug 984048 - Patch 5 - ServiceWorker [[Install]] algorithm. r=ehsan, khuey
--HG--
extra : rebase_source : 5f9d890c655d7f5e77851a8a3bd6b6fd3f9bf108
2014-06-30 13:31:24 -07:00
Nikhil Marathe
b8acd50491 Bug 984048 - Patch 4 - Handle parse and uncaught errors. r=khuey
--HG--
extra : rebase_source : 9cc36dea950be96fba079877c2d67b76f8383635
2014-06-30 13:31:02 -07:00
Steve Fink
7ae797ae01 Bug 1022773 - Return value rooting for workers, r=bent
--HG--
extra : rebase_source : 5793c693fb00a71f203202beed491de8ef492093
2014-06-25 15:35:36 -07:00
Steve Fink
331764b88b Bug 1022773 - Return value rooting for dom/, r=bz
--HG--
extra : rebase_source : 24732cd3aff732c5c3d3eb8e19ee8a95f588ebd7
2014-06-25 15:35:36 -07:00
Steve Fink
ad8ab618ed Bug 1022773 - Switch all JS Compile functions to use MutableHandle, r=terrence
--HG--
extra : rebase_source : e7542a31e4818e6beafd2b1dab096606370534bb
2014-06-25 15:35:35 -07:00
Nikhil Marathe
1b42d15b04 Bug 984048 - Promise::MaybeReject ErrorEvent overload no longer needed. Fix compile error. r=bustage
--HG--
extra : amend_source : 5fcbc1c3912503e98f36fce514ddc2433da31a3e
2014-07-01 17:07:47 -07:00
Nikhil Marathe
95f2b45933 Bug 984048 - Patch 5 - ServiceWorker [[Install]] algorithm. r=ehsan, khuey 2014-07-01 16:43:22 -07:00
Nikhil Marathe
77b17981a3 Bug 984048 - Patch 4 - Handle parse and uncaught errors. r=khuey 2014-07-01 16:43:13 -07:00
Steven Michaud
5005bd4d9d Bug 1021240 - Calling alert from property getter can freeze Firefox. r=bz 2014-07-01 13:30:13 -05:00
Garvan Keeley
7e42011b98 Bug 1010278 - Check if the type is gsm-ish or wcdma-ish and assign to either one of those categories. r=dougt 2014-06-19 14:45:00 -04:00
Carsten "Tomcat" Book
c38121f322 Merge mozilla-central to b2g-inbound 2014-06-30 15:53:28 +02:00
Carsten "Tomcat" Book
3d917f97d0 merge b2g-inbound to mozilla-central a=merge 2014-06-30 15:35:24 +02:00
Carsten "Tomcat" Book
2be592142a Backed out changeset d758e85bbe8b (bug 1030821) for bustage 2014-06-30 14:45:52 +02:00
Hsin-Yi Tsai
7c1eb4aff9 Bug 1023141 - query ril.ecclist per dial request - part 3 - fix xpcshell. r=aknow 2014-06-30 14:48:41 +08:00
Michael Pruett
bb1b9224ce Bug 1024360 - Remove usage of deprecated mozIStorageBaseStatement methods. r=mak 2014-06-27 09:59:09 -05:00
Andrew Osmond
5b13035ec1 Bug 1030821 - Fix broken zoom by making recording hint be set as boolean. r=mikeh 2014-06-27 12:33:00 +02:00
Tim Chien
1fa0e6607e Bug 1022852 - Fix setInputMethodActive test that rely on order of async message. r=yxl 2014-06-29 03:47:00 +02:00
Jonathan Watt
3cc9012603 Bug 965967 - Use Moz2D instead of a Thebes backed gfxContext in PluginInstanceChild::PaintRectToSurface. r=mattwoodrow 2014-06-30 03:00:10 +01:00
Ms2ger
225cbcad0b Bug 968804 - Part u: Add outer window assertions to OpenInternal; r=khuey 2014-06-29 17:36:03 +02:00
Ms2ger
6ea91dd9b5 Bug 968804 - Part t: Add outer window assertions to OpenNoNavigate; r=khuey 2014-06-29 17:36:03 +02:00
Ms2ger
f3685b4620 Bug 968804 - Part s: Add inner window assertions to CloneStorageEvent; r=khuey 2014-06-29 17:36:03 +02:00
Ms2ger
0b08e443dc Bug 968804 - Part r: Point out the outer window assertion in SetArguments in the documentation; r=khuey 2014-06-29 17:36:02 +02:00
Ms2ger
c02410550f Bug 968804 - Part q: Add inner window assertions to the gamepad methods; r=khuey 2014-06-29 17:36:02 +02:00
Ms2ger
e31b1e7f88 Bug 968804 - Part p: Add outer window assertions to SetFullScreenInternal; r=khuey 2014-06-29 17:36:02 +02:00
Ms2ger
ecb03459d1 Bug 968804 - Part o: Add inner window assertions to RefreshCompartmentPrincipal; r=khuey 2014-06-29 17:36:01 +02:00
Ms2ger
c8134f4584 Bug 968804 - Part n: Split nsGlobalWindow::GetFullScreen into a forwarding and an asserting part; r=khuey 2014-06-29 17:35:56 +02:00
Ms2ger
86c542e365 Bug 968804 - Part m: Add outer window assertions to DispatchCustomEvent; r=khuey 2014-06-29 17:31:13 +02:00
Ms2ger
cb7346e3b5 Bug 968804 - Part l: Add outer window assertions to DispatchResizeEvent; r=khuey 2014-06-29 17:31:12 +02:00
Ms2ger
a4c74db93d Bug 968804 - Part k: Add outer window assertions to GetScrollXY; r=khuey 2014-06-29 17:31:12 +02:00
Ms2ger
6bc14095b5 Bug 968804 - Part j: Add inner window assertions to CreatePerformanceObjectIfNeeded; r=khuey 2014-06-29 17:31:12 +02:00
Ms2ger
b34c7f18dc Bug 968804 - Part i: Add inner window assertions to AudioContext methods; r=khuey 2014-06-29 17:31:11 +02:00
Ms2ger
a71c972206 Bug 968804 - Part h: Add inner window assertions to DefineArgumentsProperty; r=khuey 2014-06-29 17:31:09 +02:00
Kyle Huey
d7ce3f886a Bug 1027163: Using fallible allocation in DOMStorage::SetItem. r=bz 2014-06-28 20:12:48 -07:00
Edgar Chen
2bce20cfb2 Bug 1027514 - Add marionette test cases for callforwarding MMI code. r=hsinyi 2014-06-23 20:05:32 +08:00
Birunthan Mohanathas
f79a7b1f41 Bug 1032377 - Add missing #include to nsPluginArray.h; r=ehsan 2014-06-30 15:36:24 -04:00
Jonathan Kew
ea578b286e bug 1030829 part 2 - preload 'hidden' fonts on FirefoxOS into the user-font cache. r=roc 2014-06-30 19:05:29 +01:00
Carsten "Tomcat" Book
1134cc33ea Merge mozilla-central to mozilla-inbound 2014-06-30 15:44:54 +02:00
John Shih
73a60e46e3 Bug 1023341 - Fix test_networkstats_alarm.html. r=gene 2014-06-26 16:51:45 +08:00
Ralph Giles
041f8497bf Bug 996331 - Remove TextTrack.oncuechange. r=cpearce,smaug
This event isn't currently implemented. Removing it from
the DOM interface provides a way for authors to detect
that it cannot be expected to work.
2014-06-30 16:12:11 -07:00
Carsten "Tomcat" Book
ec6c733076 Merge mozilla-central to mozilla-inbound 2014-07-01 15:48:30 +02:00
Bob Owen
d23c0e3b03 Bug 1029494 Part 5: Replace AutoPushJSContext in nsNPAPIPlugin _getpluginelement. r=bholley 2014-06-26 12:08:49 +01:00
Bob Owen
ad71668fce Bug 1029494 Part 4: Replace AutoPushJSContext in MobileMessageCursorCallback::NotifyCursorSuccess. r=bholley 2014-06-26 00:47:12 +01:00
Bob Owen
4e5ab3c2af Bug 1029494 Part 3: Replace AutoPushJSContext in MobileMessageCallback::NotifyMessageDeleted. r=bholley 2014-06-26 00:35:51 +01:00
Bob Owen
cb382c8b27 Bug 1029494 Part 2: Replace AutoPushJSContext in MobileMessageCallback::NotifySuccess. r=bholley 2014-06-25 22:09:40 +01:00
Bob Owen
36cf6c034b Bug 1029494 Part 1: Replace AutoPushJSContext in IDBRequest::NotifyHelperCompleted. r=bholley 2014-07-01 10:09:46 +01:00
Jan de Mooij
adb0b402f0 Bug 1032726 part 1 - Make ConvertJSValueToByteString work with Latin1 strings. r=bz,terrence 2014-07-02 13:04:14 +02:00
Peter Van der Beken
d73f6e3936 Bug 1029104 - Convert XPathExpression to WebIDL bindings, add WebIDL API and switch to the WebIDL binding. r=bz.
--HG--
extra : rebase_source : 2b3459ddf41e258469c31e0e7c4d515ef7a7c83f
2014-06-27 21:39:50 +02:00
Peter Van der Beken
bc51078f27 Bug 1029104 - Convert XPathExpression to WebIDL bindings, make XPathExpression hold a weak reference to the document. r=bz.
--HG--
rename : dom/xslt/xpath/nsXPathExpression.cpp => dom/xslt/xpath/XPathExpression.cpp
rename : dom/xslt/xpath/nsXPathExpression.h => dom/xslt/xpath/XPathExpression.h
extra : rebase_source : b011030bee7c16e098069452d6fdbfd43c080611
2014-06-26 15:32:20 +02:00
Shelly Lin
22dc859a85 Bug 744896 - Part 2: Enable track interfaces for media elements that are consuming a MediaStream. r=roc,bz 2014-05-23 17:34:14 +08:00
Wes Kocher
98332681f5 Merge m-c to b2g-inbound a=merge 2014-06-30 18:50:28 -07:00
Fabrice Desré
d7b7369be8 Bug 1032121 - Remove content handler leftover code in ActivitiesService.jsm r=fabrice 2014-06-30 16:37:11 -07:00
Ed Morley
f4b34b75ea Backed out changeset 38831e922852 (bug 1026314) for test_interfaces.html failures
--HG--
rename : dom/crypto/CryptoKey.cpp => dom/crypto/Key.cpp
rename : dom/crypto/CryptoKey.h => dom/crypto/Key.h
rename : dom/crypto/CryptoKeyPair.cpp => dom/crypto/KeyPair.cpp
rename : dom/crypto/CryptoKeyPair.h => dom/crypto/KeyPair.h
2014-07-04 16:17:51 +01:00
Tim Taubert
4f942527d3 Bug 1026314 - Rename Key to CryptoKey in WebCrypto r=rbarnes,bz
--HG--
rename : dom/crypto/Key.cpp => dom/crypto/CryptoKey.cpp
rename : dom/crypto/Key.h => dom/crypto/CryptoKey.h
rename : dom/crypto/KeyPair.cpp => dom/crypto/CryptoKeyPair.cpp
rename : dom/crypto/KeyPair.h => dom/crypto/CryptoKeyPair.h
2014-06-23 23:25:13 +02:00
Marco Castelluccio
502488e17f Bug 1029674 - Fix installation of apps with custom origin. r=myk,keeler
--HG--
rename : toolkit/webapps/tests/test_packaged_launch.xul => toolkit/webapps/tests/test_custom_origin.xul
2014-07-04 15:23:16 +02:00
Ms2ger
5e7f19500d Bug 1034204 - Implement unforgeable methods; r=bz 2014-07-04 15:02:10 +02:00
Kartikaya Gupta
737bb4f80d Bug 1034258 - Change mCompositionBounds to be a ParentLayerRect instead of a ParentLayerIntRect. r=Cwiiis 2014-07-04 08:12:41 -04:00
Carsten "Tomcat" Book
6b573fb299 Merge mozilla-central to mozilla-inbound 2014-07-04 14:05:54 +02:00
Shelly Lin
bd62cf13ed Bug 744896 - Part 2: Enable track interfaces for media elements that are consuming a MediaStream. r=bz,roc 2014-05-23 17:34:14 +08:00
Borting Chen
702ff05ae0 Bug 951976 - part 2, Test cases. r=gene 2014-05-12 18:55:49 +08:00
Fabrice Desré
6a00695aa4 Bug 1024157 - Lazy load more js modules - Part 3: RIL r=gene 2014-05-07 15:53:17 -07:00
Fabrice Desré
481ef86e6d Bug 1024157 - Lazy load more js modules - Part 2: contacts r=gwagner 2014-05-07 15:53:16 -07:00
Fabrice Desré
24d088957f Bug 1024157 - Lazy load more js modules - part 1: NFC r=psiddh 2014-05-07 15:53:16 -07:00
Hsin-Yi Tsai
8933ead71d Bug 1023141 - query ril.ecclist per dial request - part 2 - test case. r=aknow 2014-06-24 18:47:12 +08:00
Hsin-Yi Tsai
9fdd9aeaf9 Bug 1023141 - query ril.ecclist per dial request - part 1 - fix. r=aknow 2014-06-24 18:32:41 +08:00
Hsin-Yi Tsai
79fa19386b Bug 1023141 - query ril.ecclist per dial request - part 0 - rename. r=aknow 2014-06-24 18:36:59 +08:00
William Chen
bbc6063351 Bug 1000199 - Enable web components for certified apps. r=gabor,smaug 2014-07-07 19:02:03 -07:00
Wes Kocher
fa8c67f1bb Merge m-c to inbound 2014-07-07 16:34:44 -07:00
Bobby Holley
b3a9b29482 Bug 1033927 - Drop support for custom [object XrayWrapper [object ClassName]] stringification. r=peterv 2014-07-07 13:11:24 -07:00
Benoit Jacob
b697419b07 Bug 1028588 - Fix dangerous public destructors in Gonk-specific dom/media code - r=ehsan 2014-07-07 14:27:29 -04:00
Shelly Lin
3cc807deaf Bug 744896 - Part 1: Implement AudioTrack, VideoTrack and other related interfaces. r=bz,roc 2014-04-16 11:06:45 +08:00
Shelly Lin
d6fa324fba Bug 744896 - Part 1: Implement AudioTrack, VideoTrack and other related interfaces. r=bz,roc 2014-04-16 11:06:45 +08:00
Boris Zbarsky
98d7fb77a1 Bug 1018583 part 1. Remove the execute-in-sandbox mode for javascript: URIs, and use the don't-execute mode wherever we used the sandbox one. r=bholley,dao 2014-07-04 01:21:57 -04:00
Borting Chen
d54cb8eaef Bug 951976 - part 1, WebIDL implementation. r=gene 2014-03-10 11:54:15 +08:00
Peter Van der Beken
ae0fcf2811 Bug 1032748 - Make ConvertJSValueToString work on ns*String. r=bz. 2014-01-23 10:18:35 +01:00
Sotaro Ikeda
7155d97f84 Bug 1034294 - Fix SharedBufferManagerParent r=nical 2014-07-08 06:46:17 -07:00
Carsten "Tomcat" Book
c3991b34ec Merge mozilla-central to mozilla-inbound 2014-07-08 15:21:16 +02:00
Yuan Xulei
bd85602c7b Bug 1019627 - Check DOMRequest window before processing callback. r=dhylands 2014-07-08 13:44:22 +08:00
Richard Barnes
cb4e8d0cd0 Bug 1033492 - Add test. r=keeler 2014-07-08 07:56:56 -04:00
Henry Chang
c536ce434d Bug 937528 - Initialize port and host for the tcp server accepted socket. r=jduell 2013-12-19 11:21:12 +08:00
Borting Chen
5ca5a93bef Bug 951976 - part 0, WebIDL definition. r=ehsan, sr=jonas 2013-12-13 19:29:33 +08:00
Dimi Lee
4a8bbee469 Bug 1027479 - Testcase for reading NDEF data from type 4 tag. r=tzimmermann 2014-07-02 14:23:02 +08:00
Ben Tian
9050098bc7 Bug 1033130 - [bluetooth2] Add missing including of BluetoothInterface.h in BluetoothA2dpManager.cpp, r=shuang 2014-07-02 10:36:28 +08:00
Jocelyn Liu
80735bb339 Bug 1031253 - Patch: Reject promise if StartStopGonkBluetooth failed. r=btian 2014-07-02 10:13:39 +08:00
Jocelyn Liu
df8c5674c3 Bug 1031252 - Patch: Reject promise for setProperty requests if BT is not enabled. r=btian 2014-07-02 09:41:33 +08:00
Marco Castelluccio
7469713bc4 Bug 967302 - Fix leak caused by the XUL alert shown at the end of an installation by mocking the alerts service. r=myk 2014-07-12 02:59:51 +02:00
Boris Zbarsky
13b4ac0823 Bug 832014 part 8. Switch Location to WebIDL bindings. r=peterv,bholley 2014-07-11 19:32:46 -04:00
Boris Zbarsky
296f475579 Bug 832014 part 7. Fix Xray support for unforgeable methods. r=peterv 2014-07-11 19:32:16 -04:00
Boris Zbarsky
7769b8f593 Bug 832014 part 6. Make it possible to specify that only a particular interface that implements a given consequential interface gets cross-origin-settable behavior for a particular property. r=bholley 2014-07-11 19:32:14 -04:00
Boris Zbarsky
5de410d5a0 Bug 832014 part 5. Add WebIDL API to nsLocation. r=peterv,bholley 2014-07-11 19:31:46 -04:00
Boris Zbarsky
d04696eb6f Bug 832014 part 4. Make the URLUtils APIs able to throw, since Location needs to be able to do that so far. r=peterv 2014-07-11 19:30:27 -04:00
Boris Zbarsky
d88c077ec5 Bug 832014 part 3. Start using nsLocation for the Location interface in bindings. r=peterv 2014-07-11 19:30:27 -04:00
Boris Zbarsky
11d5cdb1c8 Bug 832014 part 2. Add codegen support for [Unforgeable] interfaces. r=peterv 2014-07-11 19:30:27 -04:00
Boris Zbarsky
2c178b67e0 Bug 832014 part 1. Add parser support for an [Unforgeable] annotation on WebIDL interfaces. r=peterv 2014-07-11 19:30:26 -04:00
Jeff Gilbert
f55a1f1612 Bug 1037147 - Purge EOL whitespace again. - r=mattwoodrow 2014-07-11 15:41:41 -07:00
Jeff Gilbert
2bcd725268 Bug 1037151 - Merge SharedSurface_GL into SharedSurface. - r=mattwoodrow 2014-07-11 15:10:49 -07:00
Nikhil Marathe
9e3ee145e5 Bug 984048 - Patch 6 - Scope ordering and utility functions. r=ehsan,khuey
Added r=khuey via IRC to validate webidl DOM peer check.

--HG--
extra : rebase_source : 0aa1a6bcdc0f2ec8c5cd8af44d39afb62b1d4abf
2014-07-11 11:52:19 -07:00
Shashank Sabniveesu
4cd2d5a8ce Bug 1034910 - Make the dtor of nsJSArgArray protected. r=smaug 2014-07-11 13:19:00 -04:00
Jeff Gilbert
6facc4613e Bug 1037147 - Purge EOL whitespace. - r=mattwoodrow 2014-07-11 13:50:23 -07:00
Peter Van der Beken
03282794f1 Bug 1029104 - Convert XPathExpression to WebIDL bindings, move EvalContextImpl out of header. r=bz.
--HG--
rename : dom/xslt/xpath/nsXPathExpression.cpp => dom/xslt/xpath/XPathExpression.cpp
rename : dom/xslt/xpath/nsXPathExpression.h => dom/xslt/xpath/XPathExpression.h
extra : rebase_source : 4bdf4671ea04c76de76053282fc810d1f4c42aea
2013-07-09 12:09:39 -04:00
Peter Van der Beken
41a6dc5302 Bug 1029104 - Convert XPathExpression to WebIDL bindings, move files and rename class. r=bz.
--HG--
rename : dom/xslt/xpath/nsXPathExpression.cpp => dom/xslt/xpath/XPathExpression.cpp
rename : dom/xslt/xpath/nsXPathExpression.h => dom/xslt/xpath/XPathExpression.h
extra : rebase_source : bedd3da79f1a4c2df19cfe3e9b68f1270b0b5688
2013-07-04 17:40:10 +02:00
Peter Van der Beken
bd5d23028e Bug 1029104 - Convert XPathExpression to WebIDL bindings, remove txResultRecycler::init. r=bz.
--HG--
extra : rebase_source : 3c2f6f86c2e34c7ec32a22eb4f1a90e77d05cdfa
2014-06-05 15:14:56 +02:00
Wes Kocher
a8d4195694 Merge m-c to inbound a=merge 2014-06-27 17:51:36 -07:00
Wes Kocher
5963dd0010 Merge inbound to m-c a=merge 2014-06-27 17:40:49 -07:00