Bug 1040986 - Add AndWith/OrWith/XorWith/SubOut to nsRegion as well. r=jrmuizel
Bug 1040986 - Add a Contains(x,y) method to nsRegion. r=jrmuizel
Bug 1035884 - Template-ify nsCharSeparatedTokenizer to remove duplicate code. r=froydnj
Bug 1035884 - Template-ify nsWhitespaceTokenizer to remove duplicate code. r=froydnj
Bug 1041208 - Flatten chrome/{public,src}/ directories. r=mossop

--HG--
rename : chrome/src/Makefile.in => chrome/Makefile.in
rename : chrome/src/RegistryMessageUtils.h => chrome/RegistryMessageUtils.h
rename : chrome/src/nsChromeProtocolHandler.cpp => chrome/nsChromeProtocolHandler.cpp
rename : chrome/src/nsChromeProtocolHandler.h => chrome/nsChromeProtocolHandler.h
rename : chrome/src/nsChromeRegistry.cpp => chrome/nsChromeRegistry.cpp
rename : chrome/src/nsChromeRegistry.h => chrome/nsChromeRegistry.h
rename : chrome/src/nsChromeRegistryChrome.cpp => chrome/nsChromeRegistryChrome.cpp
rename : chrome/src/nsChromeRegistryChrome.h => chrome/nsChromeRegistryChrome.h
rename : chrome/src/nsChromeRegistryContent.cpp => chrome/nsChromeRegistryContent.cpp
rename : chrome/src/nsChromeRegistryContent.h => chrome/nsChromeRegistryContent.h
rename : chrome/public/nsIChromeRegistry.idl => chrome/nsIChromeRegistry.idl
rename : chrome/public/nsIToolkitChromeRegistry.idl => chrome/nsIToolkitChromeRegistry.idl
Bug 1040774 - Flatten rdf/{base,datasource,util}/{idl,public,src}/ directories. r=pike

--HG--
rename : rdf/base/src/nsCompositeDataSource.cpp => rdf/base/nsCompositeDataSource.cpp
rename : rdf/base/src/nsContainerEnumerator.cpp => rdf/base/nsContainerEnumerator.cpp
rename : rdf/base/src/nsDefaultResourceFactory.cpp => rdf/base/nsDefaultResourceFactory.cpp
rename : rdf/base/idl/nsIRDFCompositeDataSource.idl => rdf/base/nsIRDFCompositeDataSource.idl
rename : rdf/base/idl/nsIRDFContainer.idl => rdf/base/nsIRDFContainer.idl
rename : rdf/base/idl/nsIRDFContainerUtils.idl => rdf/base/nsIRDFContainerUtils.idl
rename : rdf/base/public/nsIRDFContentSink.h => rdf/base/nsIRDFContentSink.h
rename : rdf/base/idl/nsIRDFDataSource.idl => rdf/base/nsIRDFDataSource.idl
rename : rdf/base/idl/nsIRDFDelegateFactory.idl => rdf/base/nsIRDFDelegateFactory.idl
rename : rdf/base/idl/nsIRDFInMemoryDataSource.idl => rdf/base/nsIRDFInMemoryDataSource.idl
rename : rdf/base/idl/nsIRDFInferDataSource.idl => rdf/base/nsIRDFInferDataSource.idl
rename : rdf/base/idl/nsIRDFLiteral.idl => rdf/base/nsIRDFLiteral.idl
rename : rdf/base/idl/nsIRDFNode.idl => rdf/base/nsIRDFNode.idl
rename : rdf/base/idl/nsIRDFObserver.idl => rdf/base/nsIRDFObserver.idl
rename : rdf/base/idl/nsIRDFPropagatableDataSource.idl => rdf/base/nsIRDFPropagatableDataSource.idl
rename : rdf/base/idl/nsIRDFPurgeableDataSource.idl => rdf/base/nsIRDFPurgeableDataSource.idl
rename : rdf/base/idl/nsIRDFRemoteDataSource.idl => rdf/base/nsIRDFRemoteDataSource.idl
rename : rdf/base/idl/nsIRDFResource.idl => rdf/base/nsIRDFResource.idl
rename : rdf/base/idl/nsIRDFService.idl => rdf/base/nsIRDFService.idl
rename : rdf/base/idl/nsIRDFXMLParser.idl => rdf/base/nsIRDFXMLParser.idl
rename : rdf/base/idl/nsIRDFXMLSerializer.idl => rdf/base/nsIRDFXMLSerializer.idl
rename : rdf/base/idl/nsIRDFXMLSink.idl => rdf/base/nsIRDFXMLSink.idl
rename : rdf/base/idl/nsIRDFXMLSource.idl => rdf/base/nsIRDFXMLSource.idl
rename : rdf/base/src/nsInMemoryDataSource.cpp => rdf/base/nsInMemoryDataSource.cpp
rename : rdf/base/src/nsNameSpaceMap.cpp => rdf/base/nsNameSpaceMap.cpp
rename : rdf/base/src/nsNameSpaceMap.h => rdf/base/nsNameSpaceMap.h
rename : rdf/base/src/nsRDFBaseDataSources.h => rdf/base/nsRDFBaseDataSources.h
rename : rdf/base/src/nsRDFContainer.cpp => rdf/base/nsRDFContainer.cpp
rename : rdf/base/src/nsRDFContainerUtils.cpp => rdf/base/nsRDFContainerUtils.cpp
rename : rdf/base/src/nsRDFContentSink.cpp => rdf/base/nsRDFContentSink.cpp
rename : rdf/base/src/nsRDFContentSinkAtomList.h => rdf/base/nsRDFContentSinkAtomList.h
rename : rdf/base/src/nsRDFService.cpp => rdf/base/nsRDFService.cpp
rename : rdf/base/src/nsRDFService.h => rdf/base/nsRDFService.h
rename : rdf/base/src/nsRDFXMLDataSource.cpp => rdf/base/nsRDFXMLDataSource.cpp
rename : rdf/base/src/nsRDFXMLParser.cpp => rdf/base/nsRDFXMLParser.cpp
rename : rdf/base/src/nsRDFXMLParser.h => rdf/base/nsRDFXMLParser.h
rename : rdf/base/src/nsRDFXMLSerializer.cpp => rdf/base/nsRDFXMLSerializer.cpp
rename : rdf/base/src/nsRDFXMLSerializer.h => rdf/base/nsRDFXMLSerializer.h
rename : rdf/base/public/rdf.h => rdf/base/rdf.h
rename : rdf/base/idl/rdfIDataSource.idl => rdf/base/rdfIDataSource.idl
rename : rdf/base/idl/rdfISerializer.idl => rdf/base/rdfISerializer.idl
rename : rdf/base/idl/rdfITripleVisitor.idl => rdf/base/rdfITripleVisitor.idl
rename : rdf/base/src/rdfTriplesSerializer.cpp => rdf/base/rdfTriplesSerializer.cpp
rename : rdf/base/src/rdfutil.cpp => rdf/base/rdfutil.cpp
rename : rdf/base/src/rdfutil.h => rdf/base/rdfutil.h
rename : rdf/datasource/src/nsFileSystemDataSource.cpp => rdf/datasource/nsFileSystemDataSource.cpp
rename : rdf/datasource/src/nsFileSystemDataSource.h => rdf/datasource/nsFileSystemDataSource.h
rename : rdf/datasource/public/nsILocalStore.h => rdf/datasource/nsILocalStore.h
rename : rdf/datasource/public/nsIRDFFTP.h => rdf/datasource/nsIRDFFTP.h
rename : rdf/datasource/src/nsLocalStore.cpp => rdf/datasource/nsLocalStore.cpp
rename : rdf/datasource/src/nsRDFBuiltInDataSources.h => rdf/datasource/nsRDFBuiltInDataSources.h
rename : rdf/util/src/Makefile.in => rdf/util/Makefile.in
rename : rdf/util/src/internal/moz.build => rdf/util/internal/moz.build
rename : rdf/util/src/nsRDFResource.cpp => rdf/util/nsRDFResource.cpp
rename : rdf/util/public/nsRDFResource.h => rdf/util/nsRDFResource.h
rename : rdf/util/src/objs.mozbuild => rdf/util/objs.mozbuild
Bug 1041546 - Ensure that structured log message fields are always strings, r=chmanchester
bug 1036694 - merge nsIMarkupDocumentViewer into nsIContentViewer r=smaug
Bug 1037521 - Add information about unexpected results to mach output.
Bug 1040789 - Bump mozrunner and marionette-client for bug 1036926, r=davehunt
bug 1036694 - remove another reference to nsIMarkupDocumentViewer r=bustage landed on a CLOSED TREE
Bug 1041510. We should try to flatten display items that don't have children too. r=roc

Scroll info layers in particular never have children and we want to flatten them.
Bug 1041510. Now that we merge and flatten display items bottom to top (instead of the reverse) move the scroll info layer to be on top of the other scrolled content so that it is still processed last. r=roc
Bug 1041751 - Do not create an empty APZ test data bucket for each paint when APZ test logging is not pref'd on. r=kats

--HG--
extra : rebase_source : fd4f5af2b018061d26dcb99b45526f8bdf48ef15
Bug 1041471 - Call CancelAnimation() on a touch-cancel. r=kats
Bug 1040226 - Avoid getting stuck after overscroll is handed off to an APZC later in the handoff chain. r=kats
Bug 1041690. ShmTextureHost: Remove unnecessary manual deletion

--HG--
extra : rebase_source : b236e7ca49271518e5f9dfe5313475419a7b6250
Bug 978240 - Recomment remaining ES6 proxy traps. (r=jorendorff)
Bug 978279 - Implement revocation semantics. (r=jorendorff)
Bug 978279 - Refactor proxy jit-tests and add tests to account for revocation. (r=jorendorff)

--HG--
rename : js/src/tests/ecma_6/Proxy/proxy-isExtensible.js => js/src/jit-test/tests/proxy/testDirectProxyIsExtensible1.js