author | Chris Peterson <cpeterson@mozilla.com> |
Mon, 18 Nov 2013 21:39:08 -0800 | |
changeset 156551 | 3839e0c416d23691c2fbcb4b2e0f1ea1b42831bf |
parent 156550 | c3d41ab0a2dfe2d2e3ec22dfcbdbc178ffce6682 |
child 156552 | 9f64519c330fecfc6d3e64034245f2610b105c76 |
push id | 25684 |
push user | cbook@mozilla.com |
push date | Thu, 21 Nov 2013 13:21:05 +0000 |
treeherder | mozilla-central@7427eede548f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bz |
bugs | 940225 |
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/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -42,17 +42,17 @@ EXPORTS += [ 'SerializedLoadContext.h', ] EXPORTS.mozilla += [ 'IHistory.h', 'LoadContext.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'LoadContext.cpp', 'nsAboutRedirector.cpp', 'nsDefaultURIFixup.cpp', 'nsDocShell.cpp', 'nsDocShellEditorData.cpp', 'nsDocShellEnumerator.cpp', 'nsDocShellLoadInfo.cpp', 'nsDocShellTransferableHooks.cpp',
--- a/docshell/base/nsDocShellEnumerator.h +++ b/docshell/base/nsDocShellEnumerator.h @@ -1,21 +1,23 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef nsDocShellEnumerator_h___ +#define nsDocShellEnumerator_h___ + #include "nsISimpleEnumerator.h" #include "nsTArray.h" #include "nsIWeakReferenceUtils.h" class nsIDocShellTreeItem; - /* // {13cbc281-35ae-11d5-be5b-bde0edece43c} #define NS_DOCSHELL_FORWARDS_ENUMERATOR_CID \ { 0x13cbc281, 0x35ae, 0x11d5, { 0xbe, 0x5b, 0xbd, 0xe0, 0xed, 0xec, 0xe4, 0x3c } } #define NS_DOCSHELL_FORWARDS_ENUMERATOR_CONTRACTID \ "@mozilla.org/docshell/enumerator-forwards;1" @@ -100,10 +102,11 @@ public: nsDocShellBackwardsEnumerator() : nsDocShellEnumerator(enumerateBackwards) { } protected: virtual nsresult BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray); +}; -}; +#endif // nsDocShellEnumerator_h___
--- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -3,17 +3,17 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. EXPORTS += [ 'nsSHEntryShared.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'nsSHEntry.cpp', 'nsSHEntryShared.cpp', 'nsSHistory.cpp', 'nsSHTransaction.cpp', ] FAIL_ON_WARNINGS = True