wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
142,124 Commits 1 Branch 166 Tags 1.2 GiB
48253755a9
Commit Graph

16450 Commits

Author SHA1 Message Date
David Zbarsky
acc60c2ae9 Bug 893117: Remove nsIDOMHTMLTableRowElement r=peterv 2013-08-01 15:24:22 -07:00
David Zbarsky
b54fa8ad32 Bug 893117: Remove nsIDOMHTMLTableSectionElement r=peterv 2013-08-01 15:24:22 -07:00
David Zbarsky
c9c3bb020c Bug 893117: Remove xpidl for nsIDOMHTMLTableElement r=peterv 2013-08-01 15:24:21 -07:00
Nathan Froyd
e5c7996134 Bug 900090 - make various bits of nsEventStates constexpr to avoid static constructors; r=smaug 2013-07-31 13:08:35 -04:00
Ryan VanderMeulen
42e1e42d76 Merge m-c to inbound. 2013-07-31 16:33:59 -04:00
Martijn Wargers
7f63b0ec1a Bug 898696 - Fix some content/media test files by adding preload=metadata to media element. r=cpearce 2013-07-31 09:35:44 +02:00
Shelly Lin
f9bc5baa95 Bug 895730 - AudioTrackEncoder should handle the case where audio chunk is null. r=roc 2013-07-31 12:21:29 +08:00
Shelly Lin
2e2b0af1b7 Bug 894341 - Stop encoding data when the eos flag has written to ContainerWriter. r=roc 2013-07-29 14:29:08 +08:00
Ed Morley
044db07f93 Backed out changeset 5a8a8ee17ab5 (bug 883364) for Android 2.2 armv6 reftest failures 2013-07-31 08:59:33 +01:00
Ed Morley
e425b0df95 Backed out changeset 85109095dd71 (bug 883364) 2013-07-31 08:58:40 +01:00
Ed Morley
73b237d7f9 Backed out changeset f10f7c79846c (bug 883364) 2013-07-31 08:58:32 +01:00
Ed Morley
7ad8ac55f6 Backed out changeset 3b1c068244a2 (bug 881681) 2013-07-31 08:58:23 +01:00
Nicholas Cameron
a2cdf1ab09 Bug 895873 - backout bug 893117 for Win8 mc bustage 2013-07-30 23:32:35 -04:00
Jeff Gilbert
d1c3e57be2 Bug 881681 - Add reftest to assure that resize is successful. r=dzbarsky 2013-07-30 20:52:20 -07:00
Jeff Gilbert
7ddeee4a15 Bug 883364 - Mark tests as failing on ARMv6. r=bjacob 2013-07-30 20:48:00 -07:00
Jeff Gilbert
bf071cb392 Bug 883364 - Allow tests to fail gracefully. r=dzbarsky 2013-07-30 20:47:26 -07:00
Jeff Gilbert
387764aac0 Bug 883364 - Remove fallbacks to canvas. r=dzbarsky 2013-07-30 20:46:42 -07:00
Bobby Holley
92b0bb5f15 Bug 898811 - Use the system error reporter for XBL compilation. r=mrbkap 
The current XBL error reporter logs things to the console service, but not to
stderr. And in certain situations (especially if there's a parse error in
frontend XBL that leaves the browser in a half-baked state), it can be very
difficult to get to the error console.

So we should log to stderr too, which is exactly what the system error reporter
does.
 2013-07-30 17:58:46 -07:00
Olli Pettay
fb405f012c Bug 899089 - Improve event listener reporting in CC graphs, r=khuey 2013-07-31 01:04:38 +03:00
David Zbarsky
09b669e023 Bug 893117: Remove nsIDOMHTMLDListElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
0d3882f4c1 Bug 893117: Remove nsIDOMHTMLMeterElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
cc5cdadf7d Bug 893117: Remove nsIDOMHTMLParamElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
aa7c54d744 Bug 893117: Remove nsIDOMHTMLLabelElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
5058a43793 Bug 893117: Remove nsIDOMHTMLFontElement r=bz 2013-07-30 14:55:13 -07:00
David Zbarsky
0ee6634734 Bug 893117: Remove nsIDOMHTMLLegendElement r=bz 2013-07-30 14:55:12 -07:00
David Zbarsky
5be64ca260 Bug 893117: Remove nsIDOMHTMLHeadingElement r=bz 2013-07-30 14:55:12 -07:00
David Zbarsky
287910005d Bug 893117: Remove nsIDOMHTMLModElement r=bz 2013-07-30 14:55:12 -07:00
David Zbarsky
9066c58bfc Bug 893117: Remove xpidl for nsIDOMHTMLDirectoryElement r=bz 2013-07-30 14:55:12 -07:00
David Zbarsky
51c60afc61 Bug 893117: Remove nsIDOMHTMLOutputElement r=bz 2013-07-30 14:55:11 -07:00
David Zbarsky
6310037dcf Bug 893117: Remove nsIDOMHTMLDataListElement r=bz 2013-07-30 14:55:11 -07:00
David Zbarsky
0a8ff9d696 Bug 893117: Remove nsIDOMHTMLUnknownElement r=peterv 2013-07-30 14:55:11 -07:00
David Zbarsky
46494d4c25 Bug 893117: Remove nsIDOMHTMLProgressElement r=peterv 2013-07-30 14:55:11 -07:00
David Zbarsky
24178c0c21 Bug 893117: Remove nsIDOMHTMLTableColElement r=peterv 2013-07-30 14:55:11 -07:00
David Zbarsky
693663f6f5 Bug 893117: Remove nsIDOMHTMLTableRowElement r=peterv 2013-07-30 14:55:10 -07:00
David Zbarsky
6791e960b1 Bug 893117: Remove nsIDOMHTMLTableSectionElement r=peterv 2013-07-30 14:55:10 -07:00
David Zbarsky
d86b43aa04 Bug 893117: Remove xpidl for nsIDOMHTMLTableElement r=peterv 2013-07-30 14:55:10 -07:00
David Zbarsky
db8538deb2 Bug 893117: Remove nsIDOMHTMLTableCellElement r=peterv 2013-07-30 14:55:10 -07:00
Justin Lebar
9befee6c8d Bug 896890 - TabContent::HasOwnApp() should be true iff TabContext::GetOwnApp() is non-null. 
This change reworks how TabContext stores its data.  Before, it stored
an app-id and translated that into an app; now we do the reverse.  This
lets us guarantee that HasOwnApp() is true iff GetOwnApp() is non-null.

We added a new class, MaybeInvalidTabContext to assist with converting
from an IPCTabContext to a TabContext.  This allows us to ensure that a
TabContext object is never invalid.
 2013-07-30 14:42:34 -07:00
Mook
0ce5f94aa5 content: sync load service: don't die when channels have unknown size (b=894586 r=ehsan r=jduell) 2013-07-30 14:38:26 -07:00
Martijn Wargers
644fe8405f Bug 899939 - Fix some tests that still use prefBranch instead of SpecialPowers.pushPrefEnv. r=jmaher 2013-07-31 11:30:54 +02:00
Tom Schuster
8ac55e5939 Bug 884410 - Handlify JS_GetPrototype. r=terrence 2013-07-31 12:20:33 -04:00
Guillaume Abadie
17868b9869 bug 896254 - disable WebGL 2 interfaces - r=jilbert,ehsan 2013-07-30 15:58:17 -04:00
Ryan VanderMeulen
77cb688076 Backed out changeset 4aeb00521c9d (bug 896890) for build bustage. 
CLOSED TREE
 2013-07-30 15:50:46 -04:00
Justin Lebar
c092dd4810 Bug 896890 - TabContent::HasOwnApp() should be true iff TabContext::GetOwnApp() is non-null. r=khuey 
This change reworks how TabContext stores its data.  Before, it stored
an app-id and translated that into an app; now we do the reverse.  This
lets us guarantee that HasOwnApp() is true iff GetOwnApp() is non-null.

We added a new class, MaybeInvalidTabContext to assist with converting
from an IPCTabContext to a TabContext.  This allows us to ensure that a
TabContext object is never invalid.

--HG--
extra : rebase_source : d43e858739a342ab420122a90336bfd585be268a
 2013-07-30 11:51:44 -07:00
Ehsan Akhgari
085494b95d Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo 
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
 2013-07-18 13:59:53 -04:00
Ed Morley
4b841ae8c6 Bug 893714 - Disable test_cpows.xul on OS X for too many intermittent assertions, whilst the fix is finished 
--HG--
extra : rebase_source : d3ad44b025610f5b1ec91f662eb9cbf5ba613a7d
 2013-07-30 17:28:59 +01:00
David Zbarsky
eb7e83b422 Bug 901060 - Make nsGenericHTMLElement implement nsIDOMHTMLElement r=bz 2013-08-07 16:23:08 -04:00
Ryan VanderMeulen
d4081c07e9 Backed out 2 changesets (bug 902474, bug 902462) due to Android 4.0 crashtest timeouts. 
Backed out changeset ecf856c21136 (bug 902474)
Backed out changeset 25c8d8674c1f (bug 902462)
 2013-08-07 15:32:24 -04:00
Neil Deakin
0f0430de5b Bug 894736, pass clipboard type to data transfer so that the correct clipboard is used when pasting, r=ehsan 2013-08-07 14:52:38 -04:00
Robert Longson
dd64aeeee3 Bug 835048 - ownerElement should return null rather than throwing for invalid content. r=jwatt 2013-08-07 18:40:52 +01:00
Olli Pettay
f42d06f785 Bug 902481 - Make EventTargetChainItem pool thread agnostic, r=jst 2013-08-07 20:28:34 +03:00
Robert Longson
2af94802d1 Bug 898915 - Fix Axis() is not valid abort. r=dholbert 2013-08-07 17:59:08 +01:00
James Willcox
7bf0a52242 Bug 902474 - Require a minimum size of 16x16 to use SkiaGL r=mattwoodrow 2013-08-05 16:46:31 -04:00
George Wright
99a97fd109 Bug 902470 - Re-enable the advanced compositing tests on Android/Gonk r=mattwoodrow 2013-07-25 17:20:45 -04:00
George Wright
4861214355 Bug 897635 - Demote to software canvas if we use a non-standard composite mode r=mattwoodrow 2013-07-24 15:14:27 -04:00
James Willcox
9e0264e300 Bug 902462 - Enable SkiaGL on all GPUs, not just NVIDIA r=mattwoodrow 2013-07-23 20:32:24 -04:00
Masatoshi Kimura
bf30ca0532 Bug 898817 - Stop exposing nsIDOM* interfaces on the global automatically. r=bz 2013-07-30 22:26:27 +09:00
Guillaume Abadie
76f5daf76f bug 894007 - WebGLContext::getParameter(GL_MAX_TEXTURE_SIZE) should be a power of two - r=jgilbert 2013-07-30 11:07:04 -04:00
Ehsan Akhgari
3717325909 Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted 2013-07-30 10:25:31 -04:00
Paul Adenot
2c94d0b2f4 Bug 895720 - Actually use the fuzz value. 2013-07-30 11:10:33 +01:00
Paul Adenot
a33021b0b3 Bug 895720 - On MacOS, increase the fuzz factor for test_audioBufferSourceNodeOffset.html. 2013-07-30 11:06:33 +01:00
Nicolas Silva
2b6a0c31a2 Bug 858914 - New texture classes + OGL backend (preffed off). r=bas, nrc 2013-07-30 11:59:51 +02:00
David Zbarsky
f0098e9a95 Bug 898947 - Remove nsIInlineEventHandlers from nodes r=bz 2013-07-30 01:47:28 -07:00
David Zbarsky
fdbb43c394 Backout b43b3d14ea16 for mochitest failures on CLOSED TREE 2013-07-29 22:46:45 -07:00
David Zbarsky
976615cfaa Backout f10e28d82786 for mochitest orange on a CLOSED TREE 2013-07-29 21:11:38 -07:00
David Zbarsky
10f3eae40e Backout 40683014a638 for causing mochitest orange 2013-07-29 21:11:01 -07:00
David Zbarsky
53f3f3f4df Backout a0868fe02c2a because I suspect it caused the debug mochitest failures resulting in the CLOSED TREE 2013-07-29 19:51:39 -07:00
Bobby Holley
99246966e4 Bug 899245 - Rename JS_GetGlobalForScopeChain to JS::CurrentGlobalOrNull. r=luke 
This was done with perl/grep.
 2013-07-29 16:45:27 -07:00
Bobby Holley
08f9b6fd28 Bug 899245 - Rename JS_SetGlobalObject and move it into jsfriendapi. r=luke 2013-07-29 16:45:26 -07:00
Bobby Holley
9f3d1e24f0 Bug 899245 - Rename js::GetDefaultGlobalForContext to js::DefaultObjectForContextOrNull. r=luke 
This is more correct, since the object very often is not a global.
 2013-07-29 16:45:25 -07:00
David Zbarsky
1a7436ff31 Bug 898947 - Remove nsIInlineEventHandlers from nodes r=bz 2013-07-29 16:04:09 -07:00
David Zbarsky
d3fdca2e8d Bug 898105 - Remove nsIDOMTouch r=reuben 2013-07-29 16:04:09 -07:00
David Zbarsky
bda9d28852 Bug 898104 - Remove nsIDOMTouchList r=smaug 2013-07-29 16:04:09 -07:00
David Zbarsky
0240aeb948 Bug 898930 - Remove nsIDOMTouchEvent r=smaug 2013-07-29 16:04:08 -07:00
John Schoenick
4f47c01ab7 Bug 889614 - Followup, don't erroneously cancel other events. r=josh 2013-07-29 13:50:55 -07:00
Tom Schuster
d02522a3b1 Bug 691610 - e10s support for useDefaultIcon. r=felipe sr=smaug 2013-07-29 11:03:41 -04:00
Tom Schuster
f880e0e412 Bug 893201 - Spot fix cross chrome/content focus handling. r=felipe 2013-07-29 11:03:41 -04:00
Daniel Holbert
760505dd24 Bug 898489: Mark content/xul/content/src/ and content/xul/document/src/ as FAIL_ON_WARNINGS. r=smaug r=gps 2013-07-29 12:29:42 -07:00
Daniel Holbert
deca8c5a97 Bug 898232: Remove unused variable 'existingScript' from nsXULPrototypeCache::GetScript(). r=jonco 2013-07-29 10:21:33 -07:00
Jon Coppeard
fd4d274d46 Bug 897484 - GC: Convert JS_GetProperty APIs to take MutableHandleValue r=terrence r=bholley r=smaug 2013-07-26 10:00:38 +01:00
Ed Morley
9243c1b657 Backed out changeset 0ad406a69f2c (bug 856361) for mochitest-1 failures in test_mediaElementAudioSourceNode.html on a CLOSED TREE 2013-07-29 09:56:06 +01:00
Ed Morley
0903e2af97 Backed out changeset 3f2c0edda4c2 (bug 856361) 2013-07-29 09:55:15 +01:00
Ed Morley
c9d0e6b7f2 Backed out changeset f211d6754796 (bug 856361) 2013-07-29 09:55:12 +01:00
Ed Morley
29f1f1c74b Backed out changeset 2af84c01ac0c (bug 856361) 2013-07-29 09:55:09 +01:00
Ed Morley
910ec19dd4 Backed out changeset 9e90a81b9e37 (bug 856361) 2013-07-29 09:55:06 +01:00
Ed Morley
d3f9d8e0ba Backed out changeset 3d6f6f06da5e (bug 856361) 2013-07-29 09:55:03 +01:00
Ed Morley
578087bb22 Backed out changeset 911a11878522 (bug 855568) 2013-07-29 09:55:01 +01:00
Ed Morley
9dce8cb0fe Backed out changeset 3fbe86d67b6a (bug 856361) 2013-07-29 09:54:58 +01:00
Ed Morley
e23310cad6 Backed out changeset f7496fddb076 (bug 856361) 2013-07-29 09:54:52 +01:00
Robert O'Callahan
24bd270877 Bug 856361. Fix test bustage. r=me 
--HG--
extra : rebase_source : fe7a3854f521518f80c3ae8d70bae13eadfca3b7
 2013-07-29 16:56:36 +12:00
Robert O'Callahan
89f722607a Bug 856361. Part 7: Address review comment. r=ehsan 2013-07-29 15:09:48 +12:00
Ehsan Akhgari
570b52a11a Bug 855568 - Implement MediaElementAudioSourceNode. r=roc 
--HG--
extra : rebase_source : f6b44a0400aeaa6a2075d16a3196f3db13d0afb5
 2013-07-25 15:01:49 +12:00
Robert O'Callahan
8b83880fa4 Bug 856361. Part 6: Make MediaStreamAudioSourceNode keep its DOMMediaStream alive, and make the DOMMediaStream keep the MediaStreamAudioSourceNode alive. r=ehsan 
--HG--
extra : rebase_source : b7172f79fbf0cacaaf10f812444444ba17ad00e9
 2013-07-25 14:07:34 +12:00
secretrobotron
8f02d85140 Bug 856361. Part 5: Implement MediaStreamAudioSourceNode. r=ehsan 
--HG--
extra : rebase_source : ee1a8c2dc39574aeb6165a063553489f08d19380
 2013-07-24 23:29:39 +12:00
Robert O'Callahan
36cf03dce0 Bug 856361. Part 4: Create AudioNodeExternalInputStream. r=ehsan 
--HG--
extra : rebase_source : 6e172f800942b0f9f1aff047a142764da2dd57a3
 2013-07-24 22:15:11 +12:00
Robert O'Callahan
126382b197 Bug 856361. Part 3: Refactor AudioNodeStream to create ComputeFinalOuputChannelCount, AccumulateInputChunk and AdvanceOutputSegment, and make AudioNodeStreams be treated as always consumed by the MediaStreamGraph. r=ehsan 
--HG--
extra : rebase_source : 3c1fe8769dc616d0ea70f00e41d6952346ead491
 2013-07-24 22:11:35 +12:00
Robert O'Callahan
0bcfa0b5cc Bug 856361. Part 2: Block data from a non-same-origin media resource entering a MediaStream from a media element. r=cpearce 
--HG--
extra : rebase_source : fd0ac711b6be627b87634b5a6c518c82ffd46448
 2013-07-24 21:55:23 +12:00
Robert O'Callahan
0c0de93e83 Bug 856361. Part 1: Fix documentation of MediaInputPort flags. r=jesup 
--HG--
extra : rebase_source : 509fc344912aa6da728ad8dd10398ae501921ebb
 2013-07-17 15:16:09 +12:00
Robert O'Callahan
343eac0301 Bug 837242. Part 1: Convert bool parameters to flags. r=mats 2013-07-26 14:31:41 +12:00
Robert O'Callahan
55f5153795 Backing out 6ba07a3e0c80 (bug 892978) to fix test failures 2013-07-29 11:51:37 +12:00
Chris Pearce
50e8d08a10 Bug 846769 - OggReader::SeekBisection() should use granule end times, not start times. r=rillian 2013-07-29 10:03:21 +12:00
Chris Pearce
89003737e2 Bug 846769 - Mark Ogg frames with MediaResource offset, instead of (incorrectly) trying to infer and then use the offset of pages. r=rillian 2013-07-29 10:03:06 +12:00
Guillaume Abadie
9948cf0afc bug 892978 - [WebGL 2.0] Query objects (GL_ARB_occlusion_query) - r=jgilbert 2013-07-28 11:59:03 -04:00
gkrizsanits@mozilla.com
b4128d7a53 Bug 877164, return early if nsDocument::Init fails, r=smaug 2013-07-27 12:12:38 +03:00
Ryan VanderMeulen
95c899b5cd Bug 894941 - Increase fuzz tolerance for the small-shot.ogg mediaDecoding test to resolve a CLOSED TREE. 2013-07-26 15:17:34 -04:00
David Zbarsky
6753f28dcc Bug 856472: CanvasPattern and CanvasGradient don't need to inherit nsISupports r=bz 2013-07-26 11:25:56 -07:00
David Zbarsky
a4a3a95214 Bug 865998: Implement WebIDL union return values r=bz 2013-07-26 11:25:54 -07:00
Ryan VanderMeulen
ba5199d8de Merge m-c to inbound. 2013-07-26 14:20:01 -04:00
Ryan VanderMeulen
c1de6c1439 Backed out changesets f2862e93b710, 4fe81f58dbef, and f8f855f0b7dc (bug 896353) for mochitest-1 asserts. 2013-07-26 14:08:29 -04:00
Ryan VanderMeulen
955f93f545 Bug 895303 - Annotate test_bug893537.html for sporadic asserts. r=bz 2013-07-26 13:35:33 -04:00
Martijn Wargers
a14788acd3 Bug 896582 - Implement a workaround to bug 838726 to get a bunch of content/media mochitests running on B2G. r=jgriffin 2013-07-25 22:32:17 +02:00
Randy Lin
a4a5e87045 Bug 896353 - Media Recording - Test case for record the MediaStream from audioContext. r=jsmith 2013-07-26 10:47:56 +08:00
Randy Lin
2de1bb6588 Bug 896353 - Media Recording - Can't record the mediaStream created by AudioContext. r=roc 2013-07-26 20:29:41 +08:00
JW Wang
80ae7609e9 Bug 896353 - Set principal for mDOMStream in MediaStreamAudioDestinationNode. r=roc. 2013-07-23 11:54:32 +08:00
Paul Adenot
3acf11a5f9 Bug 882543 - Use a linked list for ordering stream instead of an array. r=ehsan 2013-07-19 16:40:58 +02:00
Paul Adenot
8379599843 Bug 882543 - Register the MSG thread for in the profiler. r=benwa 2013-07-19 16:40:57 +02:00
Paul Adenot
a5bb1bd5f0 Bug 882543 - Don't spam the main thread when rendering an offline graph. r=ehsan,roc 2013-07-19 16:40:57 +02:00
Paul Adenot
b25740a375 Bug 882543 - Actually run offline MSG offline. r=roc 2013-07-19 16:40:57 +02:00
Paul Adenot
e20eef1de9 Bug 882543 - Retain storage for media streams accross iterations instead of reallocating. r=jlebar,roc 2013-07-19 16:40:56 +02:00
Boris Zbarsky
a0857fe689 Bug 894448 part 1. Move IsChromeOrXBL to xpcpublic.h. r=bholley 2013-07-25 19:41:46 -07:00
Ryan VanderMeulen
20fabd9691 Merge m-c to inbound. 2013-07-25 21:59:02 -04:00
Ryan VanderMeulen
577a1e0c70 Merge birch to m-c. 2013-07-25 21:56:14 -04:00
Sid Stamm
ec103f9648 bug 898190 - fix test for bug 888172 to use a valid CSP policy for testing. r=grobinson 2013-07-25 17:11:12 -07:00
Ed Morley
4cc671a850 Merge mozilla-central and birch 2013-07-25 17:05:50 +01:00
Ryan VanderMeulen
e38bf89d75 Backed out changesets 73188e11f7b1 and 7111c04c1158 (bug 896353) for mochitest-1 crashes. 2013-07-25 10:31:48 -04:00
Randy Lin
1a230903ad Bug 896353 - Media Recording - Can't record the mediaStream created by AudioContext. r=roc 2013-07-24 18:01:52 +08:00
JW Wang
6ea2aee300 Bug 896353 - Set principal for mDOMStream in MediaStreamAudioDestinationNode. r=roc 2013-07-23 11:54:32 +08:00
Randy Lin
bf14bb2a23 Bug 896303 - Media Recording - Calling start on a MediaRecorder object with no parameters results in ondataavailable events firing even though they shouldn't be. r=roc 2013-07-24 17:26:17 +08:00
Guillaume Abadie
1c838a60f4 bug 892546 - [WebGL 2.0] Instanced Rendering (GL_ARB_draw_instanced) - r=jgilbert 2013-07-25 20:38:58 -04:00
John Schoenick
3da5e26ba8 Bug 889614 - Fix test_object display:none checking issues found while testing. r=josh 2013-07-25 14:02:34 -07:00
John Schoenick
c97b82a961 Bug 889614 - Fix regression in plugin reparenting. r=josh 2013-07-25 14:02:33 -07:00
Masayuki Nakano
e7a1591617 Bug 501496 part.9 EventUtils and some tests shouldn't synthesize keypress event if precede keydown event is consumed r=smaug 2013-07-25 15:09:29 +09:00
Peter Chang
1dcb6e83b0 Bug 894262 - Merge GonkIOSurfaceImage to GrallocImage, r=nical, kanru 2013-07-25 10:13:35 +08:00
Ryan VanderMeulen
ece161737c Merge m-c to inbound. 2013-07-24 18:27:51 -04:00
Sotaro Ikeda
a332d766ca Bug 896374 - Fix infinite loop in MediaResourceManagerService::cancelClientLocked(). r=doublec 2013-07-24 08:55:30 -04:00
Ed Morley
64a7bad1b7 Merge mozilla-central and birch 2013-07-24 13:37:33 +01:00
Dale Harvey
2889bc6970 Bug 891884 - toBlob should support the quality parameter as toDataURL does r=joedrew sr=mrbkap 
--HG--
extra : rebase_source : 6b12921bf06a2ccf4154222bf19b2779d3bc68b3
 2013-07-24 12:17:00 +01:00
Ms2ger
8ab83f380e Merge m-c to inbound. 2013-07-24 11:53:22 +02:00
Ms2ger
3c5e135131 Bug 896280 - Pass MutableHandleValue to JS::Call(); r=terrence 2013-07-24 09:40:01 +02:00
Ms2ger
d7e09279b4 Bug 896385 - Use nsInterfaceHashtable for nsXBLPrototypeBinding::mInterfaceTable; r=mrbkap 2013-07-24 09:39:56 +02:00
Ms2ger
d34efeaec4 Bug 776517 - Move GetExistingAttrNameFromQName from nsIContent to dom::Element; r=smaug 2013-07-24 09:39:46 +02:00
Ms2ger
41fe2de641 Bug 893925 - Cleanup nsILayoutHistoryState and nsGenericHTMLElement::GetPrimaryPresState; r=smaug 2013-07-24 09:38:13 +02:00
Ms2ger
5f4b440755 Bug 893909 - Part n: Cleanup HTMLSelectElement::IsValueMissing; r=dzbarsky 2013-07-24 09:37:36 +02:00
Ms2ger
dc1a276d3d Bug 893909 - Part m: Cleanup HTMLSelectElement::SubmitNamesValues; r=dzbarsky 2013-07-24 09:37:32 +02:00
Ms2ger
063594b1ea Bug 893909 - Part l: Cleanup HTMLSelectElement::Reset; r=dzbarsky 2013-07-24 09:37:28 +02:00
Ms2ger
a8b9a26d9a Bug 893909 - Part k: Cleanup HTMLSelectElement::RestoreStateTo; r=dzbarsky 2013-07-24 09:37:24 +02:00
Ms2ger
7d56fcf87d Bug 893909 - Part j: Cleanup HTMLSelectElement::SaveState; r=dzbarsky 2013-07-24 09:37:20 +02:00
Ms2ger
c08467345c Bug 893909 - Part i: Cleanup SetOptionsSelectedByIndex; r=dzbarsky 2013-07-24 09:37:14 +02:00
Ms2ger
bb40aac086 Bug 893909 - Part h: Cleanup HTMLSelectElement::FindSelectedIndex; r=dzbarsky 2013-07-24 09:37:10 +02:00
Ms2ger
943ecc9fb1 Bug 893909 - Part g: Cleanup HTMLSelectElement::OnOptionSelected; r=dzbarsky 2013-07-24 09:37:07 +02:00
Ms2ger
09fadc2cfe Bug 893909 - Part f: Cleanup HTMLSelectElement::IsOptionSelectedByIndex; r=dzbarsky 2013-07-24 09:37:03 +02:00
Ms2ger
c381daafc8 Bug 893909 - Part e: Cleanup HTMLSelectElement::SetLength; r=dzbarsky 2013-07-24 09:36:59 +02:00
Ms2ger
8a29e33bef Bug 893909 - Part d: Cleanup HTMLSelectElement::Remove; r=dzbarsky 2013-07-24 09:36:54 +02:00
Ms2ger
e9f863a26f Bug 893909 - Part c: Cleanup HTMLSelectElement::InsertOptionsIntoList; r=dzbarsky 2013-07-24 09:35:44 +02:00
Ms2ger
d2fe183df0 Bug 893909 - Part b: Return void from InsertOptionsIntoList{,Recurse}; r=dzbarsky 2013-07-24 09:35:08 +02:00
Ms2ger
90b6bcd668 Bug 893909 - Part a: Add a HTMLSelectElement::IsOptionDisabled overload without an outparam; r=dzbarsky 2013-07-24 09:31:49 +02:00
Ms2ger
5ae654e2b6 Bug 885170 - Remove nsINode::GetClassInfo(); r=peterv 2013-07-24 09:31:06 +02:00
Ms2ger
7d7359c752 Bug 888643 - Part b: Move CPP_UNIT_TESTS definitions into moz.build files; r=gps 2013-07-24 09:23:06 +02:00
Garrett Robinson
2d5640ffce Bug 888172 - CSP 1.0 does not process 'unsafe-inline' or 'unsafe-eval' for default-src. r=imelven 2013-07-24 17:48:30 -04:00
Nicolas Silva
e6812e0741 Bug 858914 - Mark some Image related classes deprecated. r=jrmuizel DONTBUILD 2013-07-24 18:08:35 +02:00
Nicolas Silva
6677c99d45 Backed out changeset 9089fe288899 2013-07-24 18:01:39 +02:00
Nicolas Silva
3e4aab0b5a Bug 868914 - Mark some Image related classes deprecated. r=jrmuizel 2013-07-24 17:43:35 +02:00
Olli Pettay
4399ddbfe6 Bug 895222, improve skippability optimization for nodes, r=mccr8 
--HG--
extra : rebase_source : ce3ebc2020a26d22f7cf2636d63657a8fe6ebb2d
 2013-07-22 20:47:20 +03:00
David Zbarsky
287181f0bc Bug 897211: Remove nsITouchEventReceiver from nodes r=bz 2013-07-23 23:20:16 -07:00
David Zbarsky
404ebd49a1 Bug 897211: Remove nsIDOMDocumentTouch r=bz 2013-07-23 23:20:16 -07:00
Cameron McCormack
0e51d2f828 Bug 895285 - Handle viewBox="" setting optimization correctly. r=jwatt 2013-07-24 14:48:12 +10:00
Cameron McCormack
19489dc884 Bug 896159 - Expose textLength and lengthAdjust on SVGTextPathElements. r=jwatt 2013-07-24 10:01:35 +10:00
Matthew Gregan
8c5e04ae01 Bug 895754 - Update VideoPlaybackQuality to current MSE spec (remove playbackJitter, add totalFrameDelay). r=doublec 2013-07-24 11:46:43 +12:00
David Zbarsky
b9c20a7821 Bug 894646 - Various dom deCOM cleanups r=Ms2ger 2013-07-23 16:39:17 -07:00
James Kitchener
5b157af303 Bug 885289 - Improve context menu behaviour for srcdoc iframes. r=mconley, r=bz 2013-07-25 09:32:50 -04:00
Guillaume Abadie
17c8348d7a bug 896601 - WebGL draw commands overflow - r=bjacob 2013-07-25 13:15:24 -04:00
Ryan VanderMeulen
63993f347c Backed out changeset ed851bbfe997 (bug 885289) for mochitest-bc orange. 2013-07-25 11:26:21 -04:00
James Kitchener
f425c1e52e Bug 885289 - Improve context menu behaviour for srcdoc iframes. r=mconley, r=bz 2013-07-25 09:32:50 -04:00
Jon Coppeard
bd28d643f7 Bug 896540 - GC: Convert JS_SetProperty* to take MutableHandleValue - browser changes r=bz 2013-07-25 13:57:00 +01:00
Bob Owen
cbfd527a69 Bug 885140 - Fix intermittent timeout in content/html/content/test/test_iframe_sandbox_navigation.html. r=imelven 2013-06-21 18:33:39 +01:00
Ivan Alagenchev
2f05ea5a46 Bug 846918: adds hsts reporting from nsDocument. r=smaug. 2013-07-26 08:37:03 -07:00
Carsten "Tomcat" Book
ac22f0d0ad Backed out changeset ae8d72538dee (bug 897484) for b2g bustage 2013-07-26 12:34:25 +02:00
Jon Coppeard
fed22eac4c Bug 897484 - GC: Convert JS_GetProperty APIs to take MutableHandleValue r=terrence r=bholley r=smaug 2013-07-26 10:00:38 +01:00
Jon Coppeard
4258a261db Bug 896949 - JS_SetProperty APIs should take an immutable parameter r=waldo r=bz 2013-07-26 10:00:38 +01:00
Carsten "Tomcat" Book
f9fb745d15 Backed out changeset 44c751cee3b1 (bug 837242) for suspicion of causing OSX Bustage CLOSED TREE 2013-07-26 09:25:03 +02:00
William Chen
0c8fbf52b7 Bug 895805 - Ensure nsBindingManager hashtable is initialized before use. r=mrbkap 2013-07-25 22:58:39 -07:00
Robert O'Callahan
aa23ef7e8f Bug 837242. Part 1: Convert bool parameters to flags. r=mats 
--HG--
extra : rebase_source : e59fe41c41f2be6b4f0c78528cf954093f3011bd
 2013-07-26 14:31:41 +12:00
Robert O'Callahan
bb4a03e7ad Bug 890716. Fix race in Reverb::Reverb. r=padenot 
--HG--
extra : rebase_source : 65af577f5ffcf7f7a0b650f1693f4159ddac4ac6
 2013-07-26 13:35:22 +12:00
Guillaume Abadie
161d8f7039 bug 896875 - [WebGL 2.0] WebGL2 unable to create context. r=bjacob 2013-07-23 11:41:25 -04:00
Boris Zbarsky
6fe1316182 Bug 895974. Implement ParentNode on document fragments and documents and move previousElementSibling and nextElementSibling to ChildNode. r=smaug 2013-07-22 08:15:43 -04:00
Boris Zbarsky
76a7d33bf7 Bug 895009. Don't pass in NonNull/OwningNonNull arguments to WebIDL binding consumers. r=peterv 2013-07-22 08:15:43 -04:00
Joshua Cranmer
46c5cc932a Bug 884061 - Part 3d: Use NS_DECL_THREADSAFE_ISUPPORTS in content/, r=smaug 
--HG--
extra : rebase_source : ee869e0ec710259b1f3d1a328bff27c5d2960ea1
 2013-07-18 21:21:19 -05:00
Joshua Cranmer
0e3b26bd30 Bug 884061 - Part 1: Use mozilla::Atomic in NS_DECL_INLINE_THREADSAFE_REFCOUNTING, r=jlebar 
--HG--
extra : rebase_source : a3a987a2a4a52603e0461f40396cca06b6cbe989
 2013-07-13 20:18:03 -05:00
Jon Coppeard
aa621befb3 Bug 896506 - GC: Fix a couple of rooting hazards in XUL code r=smaug 2013-07-23 10:58:28 +01:00
Jon Coppeard
7345e3e7f2 Bug 891966 - 2 - Comment calls to Handle::fromMarkedLocation r=bz 2013-07-23 10:58:28 +01:00
Jon Coppeard
b216cf9603 Bug 891966 - 1 - Don't allow construction of Handle<T> from Heap<T> r=bz 2013-07-23 10:58:27 +01:00
Jon Coppeard
da545dc61a Bug 888338 - 6 - more browser post barriers r=mccr8 2013-07-23 10:58:27 +01:00
Jon Coppeard
6c0077c7f6 Bug 888338 - 1 - Add TenuredHeap<T> class r=terrence r=bz 2013-07-23 10:58:26 +01:00
Carsten "Tomcat" Book
550a9bb93d Merge m-c to inbound 2013-07-23 11:06:20 +02:00
David Zbarsky
2f0e22e174 Bug 888685: SVGAnimatedLengthList shouldn't inherit nsISupports r=Ms2ger 2013-07-23 01:34:18 -07:00
David Zbarsky
e6053c5ab9 Bug 888685: SVGAnimatedRect shouldn't inherit nsISupports r=Ms2ger 2013-07-23 01:34:17 -07:00
Carsten "Tomcat" Book
e494a7c228 Backed out changeset 1bbc7f3de64c (bug 891884) 2013-07-23 10:30:08 +02:00
Ryan VanderMeulen
3810885f9a Merge inbound to m-c. 2013-07-22 21:47:13 -04:00
Ryan VanderMeulen
4033000ea2 Backed out changesets 0a196c0e9f96 (bug 895974) and 0d8aa14f5ed3 (bug 895009) for causing intermittent Linux32 mochitest-1 asserts on a CLOSED TREE. 2013-07-22 18:18:17 -04:00
Guillaume Abadie
e6fff44d56 bug 896454 - WebGL Re-enable vertex array object - r=bjacob 2013-07-22 14:15:49 -04:00
Julien Wajsberg
a752a1ecdb Bug 891884 - toBlob should support the quality parameter as toDataURL does r=joedrew sr=mrbkap 
--HG--
extra : rebase_source : 22574a2852a6147019cc787ab1a8711adca7c0b2
 2013-07-19 20:19:48 +01:00
Ed Morley
1becf19348 Backed out changeset 9e7d1f4496ff (bug 888839) for B2G failures in test_copypaste.xhtml 2013-07-22 08:55:34 +01:00
Jason Smith
7fc34c76fa Bug 896302 - Add a mochitest for creation of a media recorder object. r=roc 2013-07-21 18:37:42 -07:00
Boris Zbarsky
e0a481867c Bug 895974. Implement ParentNode on document fragments and documents and move previousElementSibling and nextElementSibling to ChildNode. r=smaug 2013-07-22 08:15:43 -04:00
Boris Zbarsky
a0654061a1 Bug 895009. Don't pass in NonNull/OwningNonNull arguments to WebIDL binding consumers. r=peterv 2013-07-22 08:15:43 -04:00
Robert O'Callahan
a923ef07f1 Bug 891238. Don't resume reading from a paused connection if we still have plenty of data cached. This could save power. r=cpearce 
--HG--
extra : rebase_source : 89e0951e9e8ccef628a99ab4b3f07dbe7ff79989
 2013-07-19 21:00:19 +12:00
Drew Willcoxon
8a46894e04 Bug 888839 - Don't pretty print text/plain when copying and pasting non-(X)HTML documents. r=smaug 2013-07-19 19:56:18 -07:00
Edwin Flores
712c782a29 Bug 889699 - Make gstreamer backend return more accurate results for canPlayType() r=alessandro.d 2013-07-20 12:03:08 +12:00
Ryan VanderMeulen
fccc96d210 Bug 832768 - Disable test_playback_rate.html and test_seek.html due to frequent timeouts. 
CLOSED TREE
 2013-07-19 16:07:38 -04:00
Guillaume Abadie
b85cdb7050 Bug 895855 - [WebGL 2.0] Build error when using --disable-webgl. r=bjacob 2013-07-19 12:53:54 -04:00
Ryan VanderMeulen
e759c0e570 Backed out 5 changesets (bug 882543) for crashtest orange on a CLOSED TREE. 
Backed out changeset b36516aab389 (bug 882543)
Backed out changeset 07550003a24a (bug 882543)
Backed out changeset f4045c40afb4 (bug 882543)
Backed out changeset 1b87e0bd2858 (bug 882543)
Backed out changeset 8d76a3440800 (bug 882543)
 2013-07-19 12:00:48 -04:00
Benjamin Smedberg
dd57b47a65 Bug 889788 - Plugin doorhanger breaks when plugins are dynamically removed from a page. This implements the short-term solution of hiding the plugin doorhanger when no more plugins are on the page (the better long-term solution will keep showing the UI and track all the plugins a page ever uses). This also implements a short-term solution when a user enables a plugin. Also bug 887088 - Short-term UI solution: when a user loads multiple tabs from a site and enables a plugin on one of them, the plugins are not enabled on other tabs but the "continue allowing" button does nothing. This patch makes the "Continue Allowing" button enable existing plugins of that type. r=jaws r=jschoenick 
--HG--
extra : rebase_source : a60ae3259579ea63d51921dc3c70836da2d7ab3a
 2013-07-19 10:02:48 -04:00
Paul Adenot
ccf69241ce Bug 882543 - Use a linked list for ordering stream instead of an array. r=ehsan 2013-07-19 16:40:58 +02:00
Paul Adenot
20dac73d80 Bug 882543 - Register the MSG thread for in the profiler. r=benwa 2013-07-19 16:40:57 +02:00
Paul Adenot
a9cb9340ab Bug 882543 - Don't spam the main thread when rendering an offline graph. r=ehsan,roc 2013-07-19 16:40:57 +02:00
Paul Adenot
8b65e8ec62 Bug 882543 - Actually run offline MSG offline. r=roc 2013-07-19 16:40:57 +02:00
Paul Adenot
59bd9d9649 Bug 882543 - Retain storage for media streams accross iterations instead of reallocating. r=jlebar,roc 2013-07-19 16:40:56 +02:00
Paul Adenot
cf618f7fe9 Bug 886173 - Preserve playbackRate across pause/play. r=cpearce 2013-07-11 16:58:57 +02:00
Ed Morley
4ab9f816bf Backed out changeset 8cc680bb6ba2 (bug 883364) for Android webgl failures on a CLOSED TREE 2013-07-19 14:43:34 +01:00
Ed Morley
9da83fc49e Backed out changeset 0ad31c2bda31 (bug 883364) 2013-07-19 14:42:53 +01:00
Mike Hommey
839ae7c712 Backout changeset 40f9e902464a (bug 889699) because of Linux crashes on a CLOSED TREE 2013-07-19 15:59:42 +09:00
Edwin Flores
25fdeb80fd Bug 889699 - Make gstreamer backend return more accurate results for canPlayType() r=alessandro.d 2013-07-19 15:31:11 +12:00
Reuben Morais
b2074b59a7 Backed out changeset 8dfdebcc8ce6 (bug 893117) 2013-07-18 20:02:01 -07:00
Reuben Morais
67c8430e49 Backed out changeset 6515e55d4fb9 (bug 893117) 2013-07-18 20:02:00 -07:00
Reuben Morais
068f124b78 Backed out changeset 05ae078ca073 (bug 893117) 2013-07-18 20:01:58 -07:00
Reuben Morais
7d8b8794f5 Backed out changeset 6d1675c08598 (bug 893117) 2013-07-18 20:01:57 -07:00
Reuben Morais
06f1868366 Backed out changeset 8ea5fd72aa59 (bug 893117) 2013-07-18 20:01:55 -07:00
Reuben Morais
103d0db08f Backed out changeset 12a2fa9940f4 (bug 893117) 2013-07-18 20:01:54 -07:00
Reuben Morais
1fa0e17181 Backed out changeset 1b779d67a022 (bug 893117) 2013-07-18 20:01:52 -07:00
Reuben Morais
7bdc9b0b8f Backed out changeset 3772e15f1b45 (bug 893117) 2013-07-18 20:01:51 -07:00
James Willcox
37c12131d0 Bug 891936 - Fix DrawWindow when used with SkiaGL r=mattwoodrow 2013-07-08 13:56:44 -04:00
Randy Lin
e3f47075f1 Bug 894348 - MediaRecorder use-after-free crash [@mozilla::MediaStream::GraphImpl]. Fix the wrong pointer type of ProcessedMediaStream. r=roc 2013-07-21 22:33:01 +08:00
Ryan VanderMeulen
3ce0de870d Merge m-c to inbound. 2013-07-22 21:48:00 -04:00
Ralph Giles
05565a4994 Bug 894104 - Part 3: remove TextTrackCue's mGlobal. r=bz 
From 095c76c72dd5915b2fa8ec74f4e2b0b45de244f1 Mon Sep 17 00:00:00 2001
Since we keep a document reference we no longer need the
separate global. It was only used in GetParentObject() and
we can return nullptr there (meaning 'use whatever magic global')
or return the document instead, which is what this patch does.
 2013-07-18 15:01:48 -07:00
Ralph Giles
86c975913d Bug 894104 - Part 2: Add testcase to crashtests. r=bz 
From d94dd7dde357ccf7f6de53c1fae20a9bdb916a86 Mon Sep 17 00:00:00 2001
 2013-07-18 14:28:45 -07:00
Ralph Giles
ac4de9f961 Bug 894104 - Part 1: Retain a document reference for GetCueAsHTML. 
From 447985000db919e2f054012ca10f03d626c401b1 Mon Sep 17 00:00:00 2001
 r=bz
Save a copy of the owning document at creation time instead
of looking it up from mGlobal in each call. This ensures it
is available even if we're called after our window is unlinked
at teardown.

Make the constructors throw if a window is not available,
so we can return an INVALID_STATE_ERR if we're called
in an incomplete environment.
 2013-07-16 22:14:40 -07:00
James Willcox
934843accb Bug 888445 - Only use SkiaGL canvas on NVIDIA r=bjacob 2013-06-28 15:59:44 -04:00
James Willcox
da3063ec09 Bug 888446 - Add some fuzz to make Skia canvas pass on Android r=bjacob,gwright 2013-06-28 16:01:54 -04:00
David Zbarsky
b71c687f04 Bug 893117: Fix warnings-as-errors bustage 2013-07-18 19:23:34 -07:00
Jeff Gilbert
d12a00bc55 Bug 883364 - WebGL reftests should fail gracefully, not time out. - r=dzbarsky 2013-07-18 15:48:06 -07:00
Jeff Gilbert
e76e42da23 Bug 883364 - Remove nogl tests from WebGL reftests. - r=dzbarsky 2013-07-18 15:48:05 -07:00
David Zbarsky
9bad771fa6 Bug 893117: Remove nsIDOMHTMLUnknownElement r=peterv 2013-07-18 17:43:38 -07:00
David Zbarsky
a4a1afd962 Bug 893117: Remove nsIDOMHTMLProgressElement r=peterv 2013-07-18 17:43:38 -07:00
David Zbarsky
0993d757d3 Bug 893117: Remove nsIDOMHTMLTableColElement r=peterv 2013-07-18 17:43:37 -07:00
David Zbarsky
fb4b45a703 Bug 893117: Remove nsIDOMHTMLTableRowElement r=peterv 2013-07-18 17:43:36 -07:00
David Zbarsky
4e74ba18fb Bug 893117: Remove nsIDOMHTMLTableSectionElement r=peterv 2013-07-18 17:43:36 -07:00
David Zbarsky
31ffc7d0e5 Bug 893117: Remove xpidl for nsIDOMHTMLTableElement r=peterv 2013-07-18 17:43:35 -07:00
David Zbarsky
3736c5e4e8 Bug 893117: Remove nsIDOMHTMLTableCellElement r=peterv 2013-07-18 17:43:34 -07:00
Ehsan Akhgari
5b25678716 Bug 895168 - Part 1: Stop using LL_I2L in the tree; r=jcranmer 
--HG--
extra : rebase_source : b66b363de4c4e132ef94181d2b7d8f008caa643a
 2013-07-18 16:47:55 -04:00
Ryan VanderMeulen
ba97a4cddb Merge m-c to inbound on a CLOSED TREE. 2013-07-18 14:53:05 -04:00