author | Ehsan Akhgari <ehsan@mozilla.com> |
Tue, 19 Nov 2013 14:49:52 -0500 | |
changeset 156436 | 1d1aa6ddabad3ba2401be8c37461adbbdf82b577 |
parent 156435 | 2304a0293543948c1c103f0f4b2dd31e3e3653d2 |
child 156437 | 64f36ac2784cf153ee57810cc61888ab64c13519 |
push id | 25678 |
push user | ryanvm@gmail.com |
push date | Wed, 20 Nov 2013 03:26:13 +0000 |
treeherder | mozilla-central@4f993fa378eb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jst, bzbarsky |
bugs | 939303 |
milestone | 28.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/base/src/DirectionalityUtils.cpp +++ b/content/base/src/DirectionalityUtils.cpp @@ -215,17 +215,17 @@ #include "nsUnicodeProperties.h" #include "nsTextFragment.h" #include "nsAttrValue.h" #include "nsTextNode.h" #include "nsCheapSets.h" namespace mozilla { -typedef mozilla::dom::Element Element; +using mozilla::dom::Element; /** * Returns true if aElement is one of the elements whose text content should not * affect its own direction, nor the direction of ancestors with dir=auto. * * Note that this does not include <bdi>, whose content does affect its own * direction when it has dir=auto (which it has by default), so one needs to * test for it separately, e.g. with DoesNotAffectDirectionOfAncestors.
--- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -62,17 +62,17 @@ EXPORTS.mozilla.dom += [ 'DOMRect.h', 'EventSource.h', 'Link.h', 'NodeIterator.h', 'Text.h', 'TreeWalker.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'Attr.cpp', 'ChildIterator.cpp', 'Comment.cpp', 'DirectionalityUtils.cpp', 'DocumentFragment.cpp', 'DocumentType.cpp', 'DOMImplementation.cpp', 'DOMParser.cpp', @@ -89,22 +89,20 @@ SOURCES += [ 'nsAttrValueOrString.cpp', 'nsCCUncollectableMarker.cpp', 'nsChannelPolicy.cpp', 'nsContentAreaDragDrop.cpp', 'nsContentIterator.cpp', 'nsContentList.cpp', 'nsContentPolicy.cpp', 'nsContentSink.cpp', - 'nsContentUtils.cpp', 'nsCopySupport.cpp', 'nsCrossSiteListenerProxy.cpp', 'nsCSPService.cpp', 'nsDataDocumentContentPolicy.cpp', - 'nsDocument.cpp', 'nsDocumentEncoder.cpp', 'nsDOMAttributeMap.cpp', 'nsDOMBlobBuilder.cpp', 'nsDOMCaretPosition.cpp', 'nsDOMFile.cpp', 'nsDOMFileReader.cpp', 'nsDOMLists.cpp', 'nsDOMMutationObserver.cpp', @@ -125,19 +123,17 @@ SOURCES += [ 'nsInProcessTabChildGlobal.cpp', 'nsLineBreaker.cpp', 'nsMappedAttributeElement.cpp', 'nsMappedAttributes.cpp', 'nsMixedContentBlocker.cpp', 'nsNameSpaceManager.cpp', 'nsNoDataProtocolContentPolicy.cpp', 'nsNodeInfo.cpp', - 'nsNodeInfoManager.cpp', 'nsNodeUtils.cpp', - 'nsObjectLoadingContent.cpp', 'nsPlainTextSerializer.cpp', 'nsPropertyTable.cpp', 'nsRange.cpp', 'nsReferencedElement.cpp', 'nsScriptElement.cpp', 'nsScriptLoader.cpp', 'nsStubDocumentObserver.cpp', 'nsStubMutationObserver.cpp', @@ -154,16 +150,28 @@ SOURCES += [ 'nsXMLHttpRequest.cpp', 'nsXMLNameSpaceMap.cpp', 'Text.cpp', 'ThirdPartyUtil.cpp', 'TreeWalker.cpp', 'WebSocket.cpp', ] +# These files cannot be built in unified mode because they use FORCE_PR_LOG +SOURCES += [ + 'nsDocument.cpp', + 'nsNodeInfoManager.cpp', +] + +# These files cannot be built in unified mode because of OS X headers. +SOURCES += [ + 'nsContentUtils.cpp', + 'nsObjectLoadingContent.cpp', +] + EXTRA_COMPONENTS += [ 'contentAreaDropListener.js', 'contentAreaDropListener.manifest', 'contentSecurityPolicy.manifest', 'messageWakeupService.js', 'messageWakeupService.manifest', ]
--- a/content/base/src/nsStyledElement.cpp +++ b/content/base/src/nsStyledElement.cpp @@ -17,17 +17,17 @@ #include "mozilla/css/StyleRule.h" #include "nsCSSParser.h" #include "mozilla/css/Loader.h" #include "nsIDOMMutationEvent.h" #include "nsXULElement.h" #include "nsContentUtils.h" #include "nsStyleUtil.h" -namespace css = mozilla::css; +using namespace mozilla; using namespace mozilla::dom; //---------------------------------------------------------------------- // nsIContent methods nsIAtom* nsStyledElementNotElementCSSInlineStyle::GetClassAttributeName() const {