author | Ehsan Akhgari <ehsan@mozilla.com> |
Mon, 23 Sep 2013 13:25:00 -0400 | |
changeset 163123 | c53e80370c9a34dbee691a34b251e8b1fcd078dd |
parent 163122 | d1d94c5b0f403a0f3cbdf4c523a16ce3d9074d03 |
child 163124 | a339ee738522b0b9e5bef932428d53529d679914 |
push id | 428 |
push user | bbajaj@mozilla.com |
push date | Tue, 28 Jan 2014 00:16:25 +0000 |
treeherder | mozilla-release@cd72a7ff3a75 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bsmedberg |
bugs | 918923 |
milestone | 27.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/accessible/src/generic/Accessible.h +++ b/accessible/src/generic/Accessible.h @@ -13,17 +13,17 @@ #include "nsIAccessible.h" #include "nsIAccessibleHyperLink.h" #include "nsIAccessibleSelectable.h" #include "nsIAccessibleValue.h" #include "nsIAccessibleStates.h" #include "nsIContent.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsRefPtrHashtable.h" struct nsRoleMapEntry; struct nsRect; class nsIFrame; class nsIAtom;
--- a/chrome/src/RegistryMessageUtils.h +++ b/chrome/src/RegistryMessageUtils.h @@ -2,17 +2,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/. */ #ifndef mozilla_RegistryMessageUtils_h #define mozilla_RegistryMessageUtils_h #include "ipc/IPCMessageUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" struct SerializedURI { nsCString spec; nsCString charset; }; struct ChromePackage
--- a/content/base/src/DOMImplementation.h +++ b/content/base/src/DOMImplementation.h @@ -11,17 +11,17 @@ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsIDocument.h" #include "nsIScriptGlobalObject.h" #include "nsIURI.h" #include "nsIWeakReferenceUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" class nsIDOMDocument; namespace mozilla { namespace dom { class DocumentType; class DOMImplementation MOZ_FINAL : public nsIDOMDOMImplementation
--- a/content/base/src/nsAttrValue.h +++ b/content/base/src/nsAttrValue.h @@ -7,17 +7,17 @@ * A struct that represents the value (type and actual data) of an * attribute. */ #ifndef nsAttrValue_h___ #define nsAttrValue_h___ #include "nscore.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsStringBuffer.h" #include "nsColor.h" #include "nsCaseTreatment.h" #include "nsMargin.h" #include "nsCOMPtr.h" #include "SVGAttrValueWrapper.h" #include "nsTArrayForwardDeclare.h" #include "nsIAtom.h"
--- a/content/base/src/nsContentList.h +++ b/content/base/src/nsContentList.h @@ -11,17 +11,17 @@ #ifndef nsContentList_h___ #define nsContentList_h___ #include "mozilla/Attributes.h" #include "nsContentListDeclarations.h" #include "nsISupports.h" #include "nsTArray.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsIHTMLCollection.h" #include "nsIDOMNodeList.h" #include "nsINodeList.h" #include "nsStubMutationObserver.h" #include "nsIAtom.h" #include "nsINameSpaceManager.h" #include "nsCycleCollectionParticipant.h" #include "nsWrapperCache.h"
--- a/content/base/src/nsDOMAttributeMap.h +++ b/content/base/src/nsDOMAttributeMap.h @@ -11,17 +11,17 @@ #define nsDOMAttributeMap_h #include "mozilla/MemoryReporting.h" #include "mozilla/dom/Attr.h" #include "mozilla/ErrorResult.h" #include "nsCycleCollectionParticipant.h" #include "nsIDOMMozNamedAttrMap.h" #include "nsRefPtrHashtable.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsWrapperCache.h" class nsIAtom; class nsINodeInfo; class nsIDocument; /** * Structure used as a key for caching Attrs in nsDOMAttributeMap's mAttributeCache.
--- a/content/svg/content/src/SVGAttrValueWrapper.h +++ b/content/svg/content/src/SVGAttrValueWrapper.h @@ -7,17 +7,17 @@ #ifndef MOZILLA_SVGATTRVALUEWRAPPER_H__ #define MOZILLA_SVGATTRVALUEWRAPPER_H__ /** * Utility wrapper for handling SVG types used inside nsAttrValue so that these * types don't need to be exported outside the SVG module. */ -#include "nsStringGlue.h" +#include "nsString.h" class nsSVGAngle; class nsSVGIntegerPair; class nsSVGLength2; class nsSVGNumberPair; class nsSVGViewBox; namespace mozilla {
--- a/content/svg/content/src/nsSVGDataParser.h +++ b/content/svg/content/src/nsSVGDataParser.h @@ -2,17 +2,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/. */ #ifndef __NS_SVGDATAPARSER_H__ #define __NS_SVGDATAPARSER_H__ #include "nsError.h" -#include "nsStringGlue.h" +#include "nsString.h" //---------------------------------------------------------------------- // helper macros #define ENSURE_MATCHED(exp) { nsresult rv = exp; if (NS_FAILED(rv)) return rv; } //////////////////////////////////////////////////////////////////////// // nsSVGDataParser: a simple abstract class for parsing values // for path and transform values.
--- a/dom/base/nsIDOMScriptObjectFactory.h +++ b/dom/base/nsIDOMScriptObjectFactory.h @@ -3,17 +3,17 @@ * 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 nsIDOMScriptObjectFactory_h__ #define nsIDOMScriptObjectFactory_h__ #include "nsISupports.h" #include "nsIDOMClassInfo.h" -#include "nsStringGlue.h" +#include "nsString.h" #define NS_IDOM_SCRIPT_OBJECT_FACTORY_IID \ { 0x2a50e17c, 0x46ff, 0x4150, \ { 0xbb, 0x46, 0xd8, 0x07, 0xb3, 0x36, 0xde, 0xab } } class nsIScriptContext; class nsIScriptGlobalObject; class nsIDOMEventListener;
--- a/dom/base/nsIScriptContext.h +++ b/dom/base/nsIScriptContext.h @@ -2,17 +2,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/. */ #ifndef nsIScriptContext_h__ #define nsIScriptContext_h__ #include "nscore.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsISupports.h" #include "nsCOMPtr.h" #include "nsIProgrammingLanguage.h" #include "jspubtd.h" #include "js/GCAPI.h" class nsIScriptGlobalObject; class nsIScriptSecurityManager;
--- a/dom/bindings/DOMJSProxyHandler.h +++ b/dom/bindings/DOMJSProxyHandler.h @@ -6,17 +6,17 @@ #ifndef mozilla_dom_DOMJSProxyHandler_h #define mozilla_dom_DOMJSProxyHandler_h #include "mozilla/Attributes.h" #include "mozilla/Likely.h" #include "jsapi.h" #include "jsproxy.h" -#include "nsStringGlue.h" +#include "nsString.h" #define DOM_PROXY_OBJECT_SLOT js::PROXY_PRIVATE_SLOT namespace mozilla { namespace dom { class DOMClass;
--- a/dom/bluetooth/BluetoothCommon.h +++ b/dom/bluetooth/BluetoothCommon.h @@ -4,17 +4,17 @@ * 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 mozilla_dom_bluetooth_bluetoothcommon_h__ #define mozilla_dom_bluetooth_bluetoothcommon_h__ #include "mozilla/Observer.h" #include "nsPrintfCString.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" extern bool gBluetoothDebugFlag; #define SWITCH_BT_DEBUG(V) (gBluetoothDebugFlag = V) #undef BT_LOG #if defined(MOZ_WIDGET_GONK)
--- a/dom/file/FileCommon.h +++ b/dom/file/FileCommon.h @@ -7,17 +7,17 @@ #ifndef mozilla_dom_file_filecommon_h__ #define mozilla_dom_file_filecommon_h__ #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsDOMEventTargetHelper.h" #include "nsDebug.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #define BEGIN_FILE_NAMESPACE \ namespace mozilla { namespace dom { namespace file { #define END_FILE_NAMESPACE \ } /* namespace file */ } /* namespace dom */ } /* namespace mozilla */ #define USING_FILE_NAMESPACE \ using namespace mozilla::dom::file;
--- a/dom/indexedDB/IDBRequest.cpp +++ b/dom/indexedDB/IDBRequest.cpp @@ -13,17 +13,17 @@ #include "nsComponentManagerUtils.h" #include "nsDOMClassInfoID.h" #include "nsDOMJSUtils.h" #include "nsContentUtils.h" #include "nsCxPusher.h" #include "nsEventDispatcher.h" #include "nsJSUtils.h" #include "nsPIDOMWindow.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsThreadUtils.h" #include "nsWrapperCacheInlines.h" #include "AsyncConnectionHelper.h" #include "IDBCursor.h" #include "IDBEvents.h" #include "IDBFactory.h" #include "IDBIndex.h"
--- a/dom/indexedDB/IndexedDatabase.h +++ b/dom/indexedDB/IndexedDatabase.h @@ -10,17 +10,17 @@ #include "nsIProgrammingLanguage.h" #include "mozilla/Attributes.h" #include "js/StructuredClone.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsDebug.h" #include "nsError.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsIInputStream.h" #define BEGIN_INDEXEDDB_NAMESPACE \ namespace mozilla { namespace dom { namespace indexedDB { #define END_INDEXEDDB_NAMESPACE \ } /* namespace indexedDB */ } /* namepsace dom */ } /* namespace mozilla */
--- a/dom/plugins/base/nsPluginTags.h +++ b/dom/plugins/base/nsPluginTags.h @@ -8,17 +8,17 @@ #include "mozilla/Attributes.h" #include "nscore.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsCOMArray.h" #include "nsIPluginTag.h" #include "nsITimer.h" -#include "nsStringGlue.h" +#include "nsString.h" class nsPluginHost; struct PRLibrary; struct nsPluginInfo; class nsNPAPIPlugin; // A linked-list of plugin information that is used for instantiating plugins // and reflecting plugin information into JavaScript.
--- a/dom/plugins/ipc/PluginIdentifierChild.h +++ b/dom/plugins/ipc/PluginIdentifierChild.h @@ -6,17 +6,17 @@ #ifndef dom_plugins_PluginIdentifierChild_h #define dom_plugins_PluginIdentifierChild_h #include "mozilla/plugins/PPluginIdentifierChild.h" #include "npapi.h" #include "npruntime.h" -#include "nsStringGlue.h" +#include "nsString.h" namespace mozilla { namespace plugins { class PluginModuleChild; /** * Plugin identifiers may be "temporary", see the comment on the
--- a/dom/plugins/ipc/PluginMessageUtils.h +++ b/dom/plugins/ipc/PluginMessageUtils.h @@ -13,17 +13,17 @@ #include "mozilla/ipc/RPCChannel.h" #include "mozilla/ipc/CrossProcessMutex.h" #include "gfxipc/ShadowLayerUtils.h" #include "npapi.h" #include "npruntime.h" #include "npfunctions.h" #include "nsAutoPtr.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "prlog.h" #include "nsHashKeys.h" #ifdef MOZ_CRASHREPORTER # include "nsExceptionHandler.h" #endif #ifdef XP_MACOSX #include "PluginInterposeOSX.h"
--- a/dom/quota/QuotaCommon.h +++ b/dom/quota/QuotaCommon.h @@ -5,17 +5,17 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef mozilla_dom_quota_quotacommon_h__ #define mozilla_dom_quota_quotacommon_h__ #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsDebug.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #define BEGIN_QUOTA_NAMESPACE \ namespace mozilla { namespace dom { namespace quota { #define END_QUOTA_NAMESPACE \ } /* namespace quota */ } /* namespace dom */ } /* namespace mozilla */ #define USING_QUOTA_NAMESPACE \ using namespace mozilla::dom::quota;
--- a/dom/system/gonk/SystemWorkerManager.h +++ b/dom/system/gonk/SystemWorkerManager.h @@ -20,17 +20,17 @@ #include "nsIInterfaceRequestor.h" #include "nsISystemWorkerManager.h" #include "nsIObserver.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsDebug.h" #include "nsDOMEventTargetHelper.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" class nsIWorkerHolder; namespace mozilla { namespace ipc { class RilConsumer;
--- a/dom/telephony/TelephonyCommon.h +++ b/dom/telephony/TelephonyCommon.h @@ -9,17 +9,17 @@ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsDebug.h" #include "nsDOMEventTargetHelper.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #define BEGIN_TELEPHONY_NAMESPACE \ namespace mozilla { namespace dom { namespace telephony { #define END_TELEPHONY_NAMESPACE \ } /* namespace telephony */ } /* namespace dom */ } /* namespace mozilla */ #define USING_TELEPHONY_NAMESPACE \ using namespace mozilla::dom::telephony;
--- a/dom/workers/ChromeWorkerScope.cpp +++ b/dom/workers/ChromeWorkerScope.cpp @@ -4,17 +4,17 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ChromeWorkerScope.h" #include "jsapi.h" #include "nsXPCOM.h" #include "nsNativeCharsetUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "WorkerPrivate.h" using namespace mozilla::dom; USING_WORKERS_NAMESPACE namespace {
--- a/dom/workers/File.cpp +++ b/dom/workers/File.cpp @@ -9,17 +9,17 @@ #include "nsIDOMFile.h" #include "nsDOMBlobBuilder.h" #include "nsError.h" #include "jsapi.h" #include "jsfriendapi.h" #include "nsCOMPtr.h" #include "nsJSUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "mozilla/dom/Exceptions.h" #include "WorkerInlines.h" #include "WorkerPrivate.h" USING_WORKERS_NAMESPACE using mozilla::dom::Throw;
--- a/dom/workers/FileReaderSync.h +++ b/dom/workers/FileReaderSync.h @@ -6,17 +6,17 @@ #ifndef mozilla_dom_workers_filereadersync_h__ #define mozilla_dom_workers_filereadersync_h__ #include "Workers.h" #include "mozilla/dom/workers/bindings/DOMBindingBase.h" #include "nsICharsetDetectionObserver.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "mozilla/Attributes.h" class nsIInputStream; class nsIDOMBlob; namespace mozilla { class ErrorResult;
--- a/dom/workers/Navigator.h +++ b/dom/workers/Navigator.h @@ -3,17 +3,17 @@ * 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 mozilla_dom_workers_navigator_h__ #define mozilla_dom_workers_navigator_h__ #include "Workers.h" #include "mozilla/dom/workers/bindings/DOMBindingBase.h" -#include "nsStringGlue.h" +#include "nsString.h" BEGIN_WORKERS_NAMESPACE class WorkerNavigator MOZ_FINAL : public DOMBindingBase { nsString mAppName; nsString mAppVersion; nsString mPlatform;
--- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h @@ -13,17 +13,17 @@ #include "mozilla/Attributes.h" #include "mozilla/Mutex.h" #include "mozilla/TimeStamp.h" #include "nsAutoPtr.h" #include "nsClassHashtable.h" #include "nsCOMPtr.h" #include "nsHashKeys.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" class nsIThread; class nsITimer; class nsPIDOMWindow; BEGIN_WORKERS_NAMESPACE
--- a/dom/workers/ScriptLoader.cpp +++ b/dom/workers/ScriptLoader.cpp @@ -20,17 +20,17 @@ #include "nsChannelPolicy.h" #include "nsError.h" #include "nsContentPolicyUtils.h" #include "nsContentUtils.h" #include "nsDocShellCID.h" #include "nsISupportsPrimitives.h" #include "nsNetUtil.h" #include "nsScriptLoader.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsThreadUtils.h" #include "nsXPCOM.h" #include "xpcpublic.h" #include "mozilla/dom/Exceptions.h" #include "Principal.h" #include "WorkerFeature.h"
--- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -17,17 +17,17 @@ #include "mozilla/Assertions.h" #include "mozilla/CondVar.h" #include "mozilla/Mutex.h" #include "mozilla/TimeStamp.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsEventQueue.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsTPriorityQueue.h" #include "StructuredCloneTags.h" #include "EventTarget.h" #include "Queue.h" #include "WorkerFeature.h"
--- a/dom/workers/Workers.h +++ b/dom/workers/Workers.h @@ -8,17 +8,17 @@ #include "jsapi.h" #include "mozilla/Attributes.h" #include "mozilla/Mutex.h" #include <stdint.h> #include "nsAutoPtr.h" #include "nsCOMPtr.h" #include "nsDebug.h" -#include "nsStringGlue.h" +#include "nsString.h" #define BEGIN_WORKERS_NAMESPACE \ namespace mozilla { namespace dom { namespace workers { #define END_WORKERS_NAMESPACE \ } /* namespace workers */ } /* namespace dom */ } /* namespace mozilla */ #define USING_WORKERS_NAMESPACE \ using namespace mozilla::dom::workers;
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp +++ b/extensions/widgetutils/src/nsWidgetUtils.cpp @@ -18,17 +18,17 @@ #include "nsIObserver.h" #include "nsIPresShell.h" #include "nsIStyleSheetService.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" #include "nsIWindowWatcher.h" #include "nsNetUtil.h" #include "nsRect.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsWeakReference.h" #include "nsIWebBrowser.h" #include "nsIObserverService.h" #include "nsPIDOMWindow.h" #include "nsIDOMWindow.h" #include "nsIDOMCompositionListener.h" #include "nsIDOMTextListener.h" #include "nsIDOMMouseEvent.h"
--- a/gfx/src/gfxCrashReporterUtils.cpp +++ b/gfx/src/gfxCrashReporterUtils.cpp @@ -20,17 +20,17 @@ #include "nsError.h" // for NS_OK, NS_FAILED, nsresult #include "nsExceptionHandler.h" // for AppendAppNotesToCrashReport #include "nsID.h" #include "nsIEventTarget.h" // for NS_DISPATCH_NORMAL #include "nsIObserver.h" // for nsIObserver, etc #include "nsIObserverService.h" // for nsIObserverService #include "nsIRunnable.h" // for nsIRunnable #include "nsISupports.h" -#include "nsStringGlue.h" // for nsAutoCString, nsCString, etc +#include "nsString.h" // for nsAutoCString, nsCString, etc #include "nsTArray.h" // for nsTArray #include "nsThreadUtils.h" // for NS_DispatchToMainThread, etc #include "nscore.h" // for NS_IMETHOD, NS_IMETHODIMP, etc namespace mozilla { static nsTArray<nsCString> *gFeaturesAlreadyReported = nullptr;
--- a/gfx/src/nsColor.cpp +++ b/gfx/src/nsColor.cpp @@ -7,17 +7,17 @@ #include "nsColor.h" #include <sys/types.h> // for int32_t #include "mozilla/Util.h" // for ArrayLength #include "mozilla/mozalloc.h" // for operator delete, etc #include "nsColorNames.h" // for nsColorNames #include "nsDebug.h" // for NS_ASSERTION, etc #include "nsStaticNameTable.h" -#include "nsStringGlue.h" // for nsAutoCString, nsString, etc +#include "nsString.h" // for nsAutoCString, nsString, etc #include "nscore.h" // for nsAString, etc using namespace mozilla; // define an array of all color names #define GFX_COLOR(_name, _value) #_name, static const char* const kColorNames[] = { #include "nsColorNameList.h"
--- a/gfx/src/nsDeviceContext.cpp +++ b/gfx/src/nsDeviceContext.cpp @@ -25,17 +25,17 @@ #include "nsIObserverService.h" // for nsIObserverService #include "nsIScreen.h" // for nsIScreen #include "nsIScreenManager.h" // for nsIScreenManager #include "nsISupportsUtils.h" // for NS_ADDREF, NS_RELEASE #include "nsIWidget.h" // for nsIWidget, NS_NATIVE_WINDOW #include "nsRect.h" // for nsRect #include "nsRenderingContext.h" // for nsRenderingContext #include "nsServiceManagerUtils.h" // for do_GetService -#include "nsStringGlue.h" // for nsDependentString +#include "nsString.h" // for nsDependentString #include "nsTArray.h" // for nsTArray, nsTArray_Impl #include "nsThreadUtils.h" // for NS_IsMainThread #include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc #if !XP_MACOSX #include "gfxPDFSurface.h" #endif
--- a/gfx/src/nsFont.h +++ b/gfx/src/nsFont.h @@ -8,17 +8,17 @@ #include <stdint.h> // for uint8_t, uint16_t #include <sys/types.h> // for int16_t #include "gfxCore.h" // for NS_GFX #include "gfxFontFeatures.h" #include "nsAutoPtr.h" // for nsRefPtr #include "nsCoord.h" // for nscoord #include "nsStringFwd.h" // for nsSubstring -#include "nsStringGlue.h" // for nsString +#include "nsString.h" // for nsString #include "nsTArray.h" // for nsTArray struct gfxFontStyle; // XXX we need a method to enumerate all of the possible fonts on the // system across family, weight, style, size, etc. But not here! // Enumerator callback function. Return false to stop
--- a/gfx/src/nsFontMetrics.cpp +++ b/gfx/src/nsFontMetrics.cpp @@ -11,17 +11,17 @@ #include "gfxRect.h" // for gfxRect #include "gfxTypes.h" // for gfxFloat #include "nsBoundingMetrics.h" // for nsBoundingMetrics #include "nsDebug.h" // for NS_ERROR, NS_ABORT_IF_FALSE #include "nsDeviceContext.h" // for nsDeviceContext #include "nsIAtom.h" // for nsIAtom #include "nsMathUtils.h" // for NS_round #include "nsRenderingContext.h" // for nsRenderingContext -#include "nsStringGlue.h" // for nsString +#include "nsString.h" // for nsString #include "nsStyleConsts.h" // for NS_STYLE_HYPHENS_NONE class gfxUserFontSet; namespace { class AutoTextRun { public:
--- a/gfx/src/nsRect.cpp +++ b/gfx/src/nsRect.cpp @@ -1,17 +1,17 @@ /* -*- 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/. */ #include "nsRect.h" #include "mozilla/gfx/Types.h" // for NS_SIDE_BOTTOM, etc #include "nsDeviceContext.h" // for nsDeviceContext -#include "nsStringGlue.h" // for nsAutoString, etc +#include "nsString.h" // for nsAutoString, etc #include "prtypes.h" // for PR_STATIC_ASSERT #include "nsMargin.h" // for nsMargin // the mozilla::css::Side sequence must match the nsMargin nscoord sequence PR_STATIC_ASSERT((NS_SIDE_TOP == 0) && (NS_SIDE_RIGHT == 1) && (NS_SIDE_BOTTOM == 2) && (NS_SIDE_LEFT == 3)); #ifdef DEBUG // Diagnostics
--- a/gfx/src/nsRegion.h +++ b/gfx/src/nsRegion.h @@ -9,17 +9,17 @@ #include <stddef.h> // for size_t #include <stdint.h> // for uint32_t, uint64_t #include <sys/types.h> // for int32_t #include "gfxCore.h" // for NS_GFX #include "nsCoord.h" // for nscoord #include "nsError.h" // for nsresult #include "nsPoint.h" // for nsIntPoint, nsPoint #include "nsRect.h" // for nsIntRect, nsRect -#include "nsStringGlue.h" // for nsCString +#include "nsString.h" // for nsCString #include "xpcom-config.h" // for CPP_THROW_NEW class nsIntRegion; /** * Implementation of regions. * A region is represented as circular double-linked list of nsRegion::RgnRect structures. * Rectangles in this list do not overlap and are sorted by (y, x) coordinates.
--- a/gfx/src/nsRenderingContext.h +++ b/gfx/src/nsRenderingContext.h @@ -13,17 +13,17 @@ #include "mozilla/gfx/UserData.h" // for UserData, UserDataKey #include "nsAutoPtr.h" // for nsRefPtr #include "nsBoundingMetrics.h" // for nsBoundingMetrics #include "nsColor.h" // for nscolor #include "nsCoord.h" // for nscoord, NSToIntRound #include "nsDeviceContext.h" // for nsDeviceContext #include "nsFontMetrics.h" // for nsFontMetrics #include "nsISupports.h" // for NS_INLINE_DECL_REFCOUNTING, etc -#include "nsStringGlue.h" // for nsString +#include "nsString.h" // for nsString #include "nscore.h" // for PRUnichar class gfxASurface; class nsIntRegion; struct nsPoint; struct nsRect; typedef enum {
--- a/gfx/src/nsThebesFontEnumerator.cpp +++ b/gfx/src/nsThebesFontEnumerator.cpp @@ -8,17 +8,17 @@ #include "gfxPlatform.h" // for gfxPlatform #include "mozilla/Assertions.h" // for MOZ_ASSERT_HELPER2 #include "nsCOMPtr.h" // for nsCOMPtr #include "nsDebug.h" // for NS_ENSURE_ARG_POINTER #include "nsError.h" // for NS_OK, NS_FAILED, nsresult #include "nsIAtom.h" // for nsIAtom, do_GetAtom #include "nsID.h" #include "nsMemory.h" // for nsMemory -#include "nsStringGlue.h" // for nsAutoCString, nsAutoString, etc +#include "nsString.h" // for nsAutoCString, nsAutoString, etc #include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc #include "nscore.h" // for PRUnichar, NS_IMETHODIMP NS_IMPL_ISUPPORTS1(nsThebesFontEnumerator, nsIFontEnumerator) nsThebesFontEnumerator::nsThebesFontEnumerator() { }
--- a/gfx/thebes/gfxASurface.cpp +++ b/gfx/thebes/gfxASurface.cpp @@ -44,17 +44,17 @@ #include <limits.h> #include "imgIEncoder.h" #include "nsComponentManagerUtils.h" #include "nsISupportsUtils.h" #include "nsCOMPtr.h" #include "nsIConsoleService.h" #include "nsServiceManagerUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsIClipboardHelper.h" using namespace mozilla; static cairo_user_data_key_t gfxasurface_pointer_key; // Surfaces use refcounting that's tied to the cairo surface refcnt, to avoid // refcount mismatch issues.
--- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -3,17 +3,17 @@ * 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 GFX_PLATFORM_H #define GFX_PLATFORM_H #include "prlog.h" #include "nsTArray.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsIObserver.h" #include "gfxTypes.h" #include "gfxASurface.h" #include "gfxColor.h" #include "qcms.h"
--- a/image/decoders/icon/nsIconURI.h +++ b/image/decoders/icon/nsIconURI.h @@ -4,17 +4,17 @@ * 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 nsMozIconURI_h__ #define nsMozIconURI_h__ #include "nsIIconURI.h" #include "nsCOMPtr.h" -#include "nsStringGlue.h" +#include "nsString.h" #define NS_MOZICONURI_CID \ { \ 0x43a88e0e, \ 0x2d37, \ 0x11d5, \ { 0x99, 0x7, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } \ }
--- a/image/src/imgRequest.h +++ b/image/src/imgRequest.h @@ -9,17 +9,17 @@ #include "nsIChannelEventSink.h" #include "nsIInterfaceRequestor.h" #include "nsIStreamListener.h" #include "nsIPrincipal.h" #include "nsAutoPtr.h" #include "nsCOMPtr.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsError.h" #include "nsIAsyncVerifyRedirectCallback.h" class imgCacheValidator; class imgStatusTracker; class imgLoader; class imgRequestProxy; class imgCacheEntry;
--- a/intl/locale/public/nsCharsetAlias.h +++ b/intl/locale/public/nsCharsetAlias.h @@ -2,17 +2,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/. */ #ifndef nsCharsetAlias_h___ #define nsCharsetAlias_h___ #include "nscore.h" -#include "nsStringGlue.h" +#include "nsString.h" class nsCharsetConverterManager; class nsScriptableUnicodeConverter; class nsCharsetAlias { friend class nsCharsetConverterManager; friend class nsScriptableUnicodeConverter;
--- a/intl/locale/public/nsIDateTimeFormat.h +++ b/intl/locale/public/nsIDateTimeFormat.h @@ -5,17 +5,17 @@ * 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 nsIDateTimeFormat_h__ #define nsIDateTimeFormat_h__ #include "nsISupports.h" #include "nscore.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsILocale.h" #include "nsIScriptableDateFormat.h" #include "prtime.h" #include <time.h> // {2BBAA0B0-A591-11d2-9119-006008A6EDF6} #define NS_IDATETIMEFORMAT_IID \
--- a/intl/locale/public/nsIPlatformCharset.h +++ b/intl/locale/public/nsIPlatformCharset.h @@ -1,17 +1,17 @@ /* -*- 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 nsIPlatformCharset_h__ #define nsIPlatformCharset_h__ -#include "nsStringGlue.h" +#include "nsString.h" #include "nsISupports.h" // Interface ID for our nsIPlatformCharset interface /* 778859d5-fc01-4f4b-bfaa-3c0d1b6c81d6 */ #define NS_IPLATFORMCHARSET_IID \ { 0x778859d5, \ 0xfc01, \
--- a/intl/uconv/idl/nsICharsetConverterManager.idl +++ b/intl/uconv/idl/nsICharsetConverterManager.idl @@ -4,17 +4,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" #include "nsIAtom.idl" %{ C++ #include "nsIUnicodeDecoder.h" #include "nsIUnicodeEncoder.h" -#include "nsStringGlue.h" +#include "nsString.h" // XXX change to NS_CHARSETCONVERTERMANAGER_CID #define NS_ICHARSETCONVERTERMANAGER_CID \ {0x3c1c0163, 0x9bd0, 0x11d3, { 0x9d, 0x9, 0x0, 0x50, 0x4, 0x0, 0x7, 0xb2}} // XXX change to NS_CHARSETCONVERTERMANAGER_PID #define NS_CHARSETCONVERTERMANAGER_CONTRACTID "@mozilla.org/charset-converter-manager;1"
--- a/ipc/glue/IPCMessageUtils.h +++ b/ipc/glue/IPCMessageUtils.h @@ -15,17 +15,17 @@ #include "mozilla/TimeStamp_windows.h" #endif #include "mozilla/Util.h" #include <stdint.h> #include "nsID.h" #include "nsMemory.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "js/StructuredClone.h" #include "nsCSSProperty.h" #ifdef _MSC_VER #pragma warning( disable : 4800 ) #endif
--- a/ipc/glue/MessagePump.cpp +++ b/ipc/glue/MessagePump.cpp @@ -1,17 +1,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/. */ #include "MessagePump.h" #include "nsComponentManagerUtils.h" #include "nsServiceManagerUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsThreadUtils.h" #include "nsXULAppAPI.h" #include "prthread.h" #include "base/logging.h" #include "base/scoped_nsautorelease_pool.h" #ifdef MOZ_WIDGET_ANDROID
--- a/ipc/glue/ScopedXREEmbed.cpp +++ b/ipc/glue/ScopedXREEmbed.cpp @@ -6,17 +6,17 @@ #include "base/command_line.h" #include "base/string_util.h" #include "nsIFile.h" #include "nsCOMPtr.h" #include "nsServiceManagerUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsXULAppAPI.h" using mozilla::ipc::ScopedXREEmbed; ScopedXREEmbed::ScopedXREEmbed() : mShouldKillEmbedding(false) { NS_LogInit();
--- a/ipc/glue/WindowsMessageLoop.cpp +++ b/ipc/glue/WindowsMessageLoop.cpp @@ -7,17 +7,17 @@ #include "mozilla/DebugOnly.h" #include "WindowsMessageLoop.h" #include "RPCChannel.h" #include "nsAutoPtr.h" #include "nsServiceManagerUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsIXULAppInfo.h" #include "mozilla/PaintTracker.h" using namespace mozilla; using namespace mozilla::ipc; using namespace mozilla::ipc::windows;
--- a/ipc/testshell/TestShellParent.h +++ b/ipc/testshell/TestShellParent.h @@ -8,17 +8,17 @@ #ifndef ipc_testshell_TestShellParent_h #define ipc_testshell_TestShellParent_h 1 #include "mozilla/ipc/PTestShellParent.h" #include "mozilla/ipc/PTestShellCommandParent.h" #include "js/TypeDecls.h" #include "nsAutoJSValHolder.h" -#include "nsStringGlue.h" +#include "nsString.h" namespace mozilla { namespace ipc { class TestShellCommandParent; class TestShellParent : public PTestShellParent
--- a/ipc/testshell/XPCShellEnvironment.h +++ b/ipc/testshell/XPCShellEnvironment.h @@ -8,17 +8,17 @@ #include "base/basictypes.h" #include <string> #include <stdio.h> #include "nsAutoJSValHolder.h" #include "nsCOMPtr.h" #include "nsDebug.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsJSPrincipals.h" #include "nsContentUtils.h" #include "js/TypeDecls.h" struct JSPrincipals; namespace mozilla { namespace ipc {
--- a/js/xpconnect/src/XPCString.cpp +++ b/js/xpconnect/src/XPCString.cpp @@ -14,17 +14,17 @@ * * Exporting a JSString as an nsAReadable: * Wrap the JSString with a root-holding XPCJSReadableStringWrapper, which roots * the string and exposes its buffer via the nsAString interface, as * well as providing refcounting support. */ #include "nscore.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsStringBuffer.h" #include "jsapi.h" #include "xpcpublic.h" // One-slot cache, because it turns out it's common for web pages to // get the same string a few times in a row. We get about a 40% cache // hit rate on this cache last it was measured. We'd get about 70% // hit rate with a hashtable with removal on finalization, but that
--- a/parser/htmlparser/public/nsHTMLTags.h +++ b/parser/htmlparser/public/nsHTMLTags.h @@ -1,17 +1,17 @@ /* -*- 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 nsHTMLTags_h___ #define nsHTMLTags_h___ -#include "nsStringGlue.h" +#include "nsString.h" #include "plhash.h" class nsIAtom; /* Declare the enum list using the magic of preprocessing enum values are "eHTMLTag_foo" (where foo is the tag)
--- a/parser/htmlparser/public/nsIContentSink.h +++ b/parser/htmlparser/public/nsIContentSink.h @@ -12,17 +12,17 @@ * This pure virtual interface is used as the "glue" that connects the parsing * process to the content model construction process. * * The icontentsink interface is a very lightweight wrapper that represents the * content-sink model building process. There is another one that you may care * about more, which is the IHTMLContentSink interface. (See that file for details). */ #include "nsISupports.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "mozFlushType.h" #include "nsIDTD.h" class nsParserBase; #define NS_ICONTENT_SINK_IID \ { 0xcf9a7cbb, 0xfcbc, 0x4e13, \ { 0x8e, 0xf5, 0x18, 0xef, 0x2d, 0x3d, 0x58, 0x29 } }
--- a/parser/htmlparser/public/nsIDTD.h +++ b/parser/htmlparser/public/nsIDTD.h @@ -17,17 +17,17 @@ * parser * 2) To serve as proxy to represent the containment rules of the * underlying document * 3) To offer autodetection services to the parser (mainly for doc * conversion) * */ #include "nsISupports.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsITokenizer.h" #define NS_IDTD_IID \ { 0x3de05873, 0xefa7, 0x410d, \ { 0xa4, 0x61, 0x80, 0x33, 0xaf, 0xd9, 0xe3, 0x26 } } enum eAutoDetectResult { eUnknownDetect,
--- a/parser/htmlparser/public/nsIParser.h +++ b/parser/htmlparser/public/nsIParser.h @@ -16,17 +16,17 @@ * * Please DO NOT #include this into new files even inside Gecko. It is more * likely than not that #including this header is the wrong thing to do. */ #include "nsISupports.h" #include "nsIStreamListener.h" #include "nsIDTD.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsIAtom.h" #include "nsParserBase.h" #define NS_IPARSER_IID \ { 0x2c4ad90a, 0x740e, 0x4212, \ { 0xba, 0x3f, 0xfe, 0xac, 0xda, 0x4b, 0x92, 0x9e } }
--- a/parser/htmlparser/public/nsIParserService.h +++ b/parser/htmlparser/public/nsIParserService.h @@ -2,17 +2,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/. */ #ifndef nsIParserService_h__ #define nsIParserService_h__ #include "nsISupports.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsHTMLTags.h" class nsIParser; #define NS_PARSERSERVICE_CONTRACTID "@mozilla.org/parser/parser-service;1" // {90a92e37-abd6-441b-9b39-4064d98e1ede} #define NS_IPARSERSERVICE_IID \
--- a/security/manager/boot/src/nsSiteSecurityService.cpp +++ b/security/manager/boot/src/nsSiteSecurityService.cpp @@ -9,17 +9,17 @@ #include "nsCRTGlue.h" #include "nsIPermissionManager.h" #include "nsISSLStatus.h" #include "nsISSLStatusProvider.h" #include "nsSiteSecurityService.h" #include "nsIURI.h" #include "nsNetUtil.h" #include "nsThreadUtils.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsIScriptSecurityManager.h" #include "nsISocketProvider.h" #include "mozilla/Preferences.h" #include "mozilla/LinkedList.h" #include "nsSecurityHeaderParser.h" // A note about the preload list: // When a site specifically disables sts by sending a header with
--- a/toolkit/components/startup/nsAppStartup.cpp +++ b/toolkit/components/startup/nsAppStartup.cpp @@ -18,17 +18,17 @@ #include "nsIWebBrowserChrome.h" #include "nsIWindowMediator.h" #include "nsIWindowWatcher.h" #include "nsIXULRuntime.h" #include "nsIXULWindow.h" #include "nsNativeCharsetUtils.h" #include "nsThreadUtils.h" #include "nsAutoPtr.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "mozilla/Preferences.h" #include "GeckoProfiler.h" #include "prprf.h" #include "nsIInterfaceRequestorUtils.h" #include "nsWidgetsCID.h" #include "nsAppShellCID.h" #include "nsXPCOMCIDInternal.h"
--- a/toolkit/components/telemetry/Telemetry.cpp +++ b/toolkit/components/telemetry/Telemetry.cpp @@ -24,17 +24,17 @@ #include "nsXPCOMPrivate.h" #include "mozilla/MemoryReporting.h" #include "mozilla/ModuleUtils.h" #include "nsIXPConnect.h" #include "mozilla/Services.h" #include "jsapi.h" #include "jsfriendapi.h" #include "js/GCAPI.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsITelemetry.h" #include "nsIFile.h" #include "nsIFileStreams.h" #include "nsIMemoryReporter.h" #include "nsISeekableStream.h" #include "Telemetry.h" #include "nsTHashtable.h" #include "nsHashKeys.h"
--- a/toolkit/crashreporter/mac_utils.h +++ b/toolkit/crashreporter/mac_utils.h @@ -1,14 +1,14 @@ /* -*- 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 toolkit_breakpad_mac_utils_h__ #define toolkit_breakpad_mac_utils_h__ -#include "nsStringGlue.h" +#include "nsString.h" // Given an Objective-C NSException object, put exception info into a string. void GetObjCExceptionInfo(void* inException, nsACString& outString); #endif /* toolkit_breakpad_mac_utils_h__ */
--- a/toolkit/identity/IdentityCryptoService.cpp +++ b/toolkit/identity/IdentityCryptoService.cpp @@ -7,17 +7,17 @@ #include "nsIIdentityCryptoService.h" #include "mozilla/ModuleUtils.h" #include "nsServiceManagerUtils.h" #include "nsNSSShutDown.h" #include "nsIThread.h" #include "nsThreadUtils.h" #include "nsCOMPtr.h" #include "nsProxyRelease.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "mozilla/Base64.h" #include "mozilla/Util.h" // ArrayLength #include "ScopedNSSTypes.h" #include "nss.h" #include "pk11pub.h" #include "secmod.h" #include "secerr.h"
--- a/tools/profiler/JSCustomObjectBuilder.cpp +++ b/tools/profiler/JSCustomObjectBuilder.cpp @@ -2,17 +2,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/. */ #include "JSCustomObjectBuilder.h" #include "mozilla/Util.h" // for ArrayLength #include "nsDataHashtable.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsTArray.h" #include "nsUTF8Utils.h" #if _MSC_VER #define snprintf _snprintf #endif // These are owned and deleted by JSCustomObject
--- a/tools/profiler/JSObjectBuilder.cpp +++ b/tools/profiler/JSObjectBuilder.cpp @@ -1,15 +1,15 @@ /* -*- 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/. */ #include "jsapi.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "JSObjectBuilder.h" JSObjectBuilder::JSObjectBuilder(JSContext *aCx) : mCx(aCx), mOk(true) {} void JSObjectBuilder::DefineProperty(JS::HandleObject aObject, const char *name, JS::HandleObject aValue) {
--- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -46,17 +46,17 @@ using mozilla::unused; #include "nsTArray.h" #include "AndroidBridge.h" #include "android_npapi.h" #include "imgIEncoder.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "GeckoProfiler.h" // For PROFILER_LABEL using namespace mozilla; using namespace mozilla::dom; using namespace mozilla::widget; using namespace mozilla::layers; NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
--- a/widget/nsGUIEvent.h +++ b/widget/nsGUIEvent.h @@ -6,17 +6,17 @@ #ifndef nsGUIEvent_h__ #define nsGUIEvent_h__ #include "mozilla/MathAlgorithms.h" #include "nsPoint.h" #include "nsRect.h" #include "nsEvent.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsCOMPtr.h" #include "nsIAtom.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMWheelEvent.h" #include "nsIDOMDataTransfer.h" #include "nsWeakPtr.h" #include "nsIWidget.h"
--- a/widget/nsIWidget.h +++ b/widget/nsIWidget.h @@ -4,17 +4,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef nsIWidget_h__ #define nsIWidget_h__ #include "nsISupports.h" #include "nsColor.h" #include "nsRect.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsEvent.h" #include "nsCOMPtr.h" #include "nsWidgetInitData.h" #include "nsTArray.h" #include "nsXULAppAPI.h" #include "mozilla/layers/LayersTypes.h" #include "mozilla/RefPtr.h"
--- a/widget/qt/faststartupqt/mozqwidgetfast.cpp +++ b/widget/qt/faststartupqt/mozqwidgetfast.cpp @@ -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/. */ #include <QtCore/QUrl> #include "mozqwidgetfast.h" #include "nsFastStartupQt.h" #include "nsIFile.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "BinaryPath.h" #define TOOLBAR_SPLASH "toolbar_splash.png" #define FAVICON_SPLASH "favicon32.png" #define DRAWABLE_PATH "res/drawable/" MozQWidgetFast::MozQWidgetFast(nsWindow* aReceiver, QGraphicsItem* aParent) {
--- a/widget/xpwidgets/GfxInfoCollector.cpp +++ b/widget/xpwidgets/GfxInfoCollector.cpp @@ -2,17 +2,17 @@ /* -*- 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/. */ #include "GfxInfoCollector.h" #include "jsapi.h" -#include "nsStringGlue.h" +#include "nsString.h" using namespace mozilla; using namespace widget; void InfoObject::DefineProperty(const char *name, int value) { if (!mOk)
--- a/xpcom/base/nsDebugImpl.cpp +++ b/xpcom/base/nsDebugImpl.cpp @@ -8,17 +8,17 @@ #include "mozilla/Atomics.h" #include "nsDebugImpl.h" #include "nsDebug.h" #ifdef MOZ_CRASHREPORTER # include "nsExceptionHandler.h" #endif -#include "nsStringGlue.h" +#include "nsString.h" #include "prprf.h" #include "prlog.h" #include "nsError.h" #include "prerror.h" #include "prerr.h" #include "prenv.h" #ifdef ANDROID
--- a/xpcom/build/perfprobe.h +++ b/xpcom/build/perfprobe.h @@ -11,17 +11,17 @@ #ifndef mozilla_perfprobe_h #define mozilla_perfprobe_h #if !defined(XP_WIN) #error "For the moment, perfprobe.h is defined only for Windows platforms" #endif #include "nsError.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "prlog.h" #include "nsTArray.h" #include "nsAutoPtr.h" #include <windows.h> #undef GetStartupInfo //Prevent Windows from polluting global namespace #include <wmistr.h> #include <evntrace.h>
--- a/xpcom/ds/nsAtomTable.cpp +++ b/xpcom/ds/nsAtomTable.cpp @@ -6,17 +6,17 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" #include "mozilla/HashFunctions.h" #include "mozilla/MemoryReporting.h" #include "nsAtomTable.h" #include "nsStaticAtom.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsCRT.h" #include "pldhash.h" #include "prenv.h" #include "nsThreadUtils.h" #include "nsDataHashtable.h" #include "nsHashKeys.h" #include "nsAutoPtr.h" #include "nsUnicharUtils.h"
--- a/xpcom/ds/nsPersistentProperties.h +++ b/xpcom/ds/nsPersistentProperties.h @@ -4,17 +4,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef nsPersistentProperties_h___ #define nsPersistentProperties_h___ #include "nsIPersistentProperties2.h" #include "pldhash.h" #include "plarena.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsCOMPtr.h" #include "mozilla/Attributes.h" class nsIUnicharInputStream; class nsPersistentProperties MOZ_FINAL : public nsIPersistentProperties { public:
--- a/xpcom/ds/nsStaticNameTable.h +++ b/xpcom/ds/nsStaticNameTable.h @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* Classes to manage lookup of static names in a table. */ #ifndef nsStaticNameTable_h___ #define nsStaticNameTable_h___ #include "pldhash.h" -#include "nsStringGlue.h" +#include "nsString.h" /* This class supports case insensitive lookup. * * It differs from atom tables: * - It supports case insensitive lookup. * - It has minimal footprint by not copying the string table. * - It does no locking. * - It returns zero based indexes and const nsCString& as required by its
--- a/xpcom/ds/nsSupportsPrimitives.h +++ b/xpcom/ds/nsSupportsPrimitives.h @@ -5,17 +5,17 @@ #ifndef nsSupportsPrimitives_h__ #define nsSupportsPrimitives_h__ #include "mozilla/Attributes.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" -#include "nsStringGlue.h" +#include "nsString.h" class nsSupportsIDImpl MOZ_FINAL : public nsISupportsID { public: NS_DECL_ISUPPORTS NS_DECL_NSISUPPORTSPRIMITIVE NS_DECL_NSISUPPORTSID
--- a/xpcom/ds/nsVariant.cpp +++ b/xpcom/ds/nsVariant.cpp @@ -9,17 +9,17 @@ #include "nsVariant.h" #include "prprf.h" #include "prdtoa.h" #include <math.h> #include "nsCycleCollectionParticipant.h" #include "xpt_struct.h" #include "nsReadableUtils.h" #include "nsMemory.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "nsCRTGlue.h" /***************************************************************************/ // Helpers for static convert functions... static nsresult String2Double(const char* aString, double* retval) { char* next;
--- a/xpcom/io/Base64.cpp +++ b/xpcom/io/Base64.cpp @@ -1,17 +1,17 @@ /* -*- 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/. */ #include "Base64.h" #include "nsIInputStream.h" -#include "nsStringGlue.h" +#include "nsString.h" #include "plbase64.h" namespace { // BEGIN base64 encode code copied and modified from NSPR const unsigned char *base = (unsigned char *)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";