mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 803106 part 1. Convert DOMStringList to WebIDL bindings - move files and rename class. r=bzbarsky
--HG-- rename : content/base/src/nsDOMLists.cpp => content/base/src/DOMStringList.cpp rename : content/base/src/nsDOMLists.h => content/base/src/DOMStringList.h
This commit is contained in:
parent
2e31af90fc
commit
f02ef0ba1d
@ -3,35 +3,34 @@
|
||||
* 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/. */
|
||||
|
||||
/*
|
||||
* Implementation of nsIDOMDOMStringList, used by various DOM stuff.
|
||||
*/
|
||||
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsError.h"
|
||||
#include "nsDOMClassInfoID.h"
|
||||
#include "nsINode.h"
|
||||
|
||||
nsDOMStringList::nsDOMStringList()
|
||||
DOMCI_DATA(DOMStringList, mozilla::dom::DOMStringList)
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
DOMStringList::DOMStringList()
|
||||
{
|
||||
}
|
||||
|
||||
nsDOMStringList::~nsDOMStringList()
|
||||
DOMStringList::~DOMStringList()
|
||||
{
|
||||
}
|
||||
|
||||
DOMCI_DATA(DOMStringList, nsDOMStringList)
|
||||
|
||||
NS_IMPL_ADDREF(nsDOMStringList)
|
||||
NS_IMPL_RELEASE(nsDOMStringList)
|
||||
NS_INTERFACE_TABLE_HEAD(nsDOMStringList)
|
||||
NS_INTERFACE_TABLE1(nsDOMStringList, nsIDOMDOMStringList)
|
||||
NS_IMPL_ADDREF(DOMStringList)
|
||||
NS_IMPL_RELEASE(DOMStringList)
|
||||
NS_INTERFACE_TABLE_HEAD(DOMStringList)
|
||||
NS_INTERFACE_TABLE1(DOMStringList, nsIDOMDOMStringList)
|
||||
NS_INTERFACE_TABLE_TO_MAP_SEGUE
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMStringList)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMStringList::Item(uint32_t aIndex, nsAString& aResult)
|
||||
DOMStringList::Item(uint32_t aIndex, nsAString& aResult)
|
||||
{
|
||||
if (aIndex >= mNames.Length()) {
|
||||
SetDOMStringToNull(aResult);
|
||||
@ -43,7 +42,7 @@ nsDOMStringList::Item(uint32_t aIndex, nsAString& aResult)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMStringList::GetLength(uint32_t *aLength)
|
||||
DOMStringList::GetLength(uint32_t *aLength)
|
||||
{
|
||||
*aLength = mNames.Length();
|
||||
|
||||
@ -51,9 +50,12 @@ nsDOMStringList::GetLength(uint32_t *aLength)
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsDOMStringList::Contains(const nsAString& aString, bool *aResult)
|
||||
DOMStringList::Contains(const nsAString& aString, bool *aResult)
|
||||
{
|
||||
*aResult = mNames.Contains(aString);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
@ -7,18 +7,21 @@
|
||||
* Implementation of nsIDOMDOMStringList, used by various DOM stuff.
|
||||
*/
|
||||
|
||||
#ifndef nsDOMLists_h___
|
||||
#define nsDOMLists_h___
|
||||
#ifndef mozilla_dom_DOMStringList_h
|
||||
#define mozilla_dom_DOMStringList_h
|
||||
|
||||
#include "nsIDOMDOMStringList.h"
|
||||
#include "nsTArray.h"
|
||||
#include "nsString.h"
|
||||
|
||||
class nsDOMStringList : public nsIDOMDOMStringList
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class DOMStringList : public nsIDOMDOMStringList
|
||||
{
|
||||
public:
|
||||
nsDOMStringList();
|
||||
virtual ~nsDOMStringList();
|
||||
DOMStringList();
|
||||
virtual ~DOMStringList();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIDOMDOMSTRINGLIST
|
||||
@ -42,4 +45,7 @@ private:
|
||||
nsTArray<nsString> mNames;
|
||||
};
|
||||
|
||||
#endif /* nsDOMLists_h___ */
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
||||
|
||||
#endif /* mozilla_dom_DOMStringList_h */
|
@ -36,7 +36,7 @@
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsILoadGroup.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "xpcpublic.h"
|
||||
#include "nsContentPolicyUtils.h"
|
||||
#include "nsDOMFile.h"
|
||||
|
@ -62,6 +62,7 @@ EXPORTS.mozilla.dom += [
|
||||
'DOMImplementation.h',
|
||||
'DOMParser.h',
|
||||
'DOMRect.h',
|
||||
'DOMStringList.h',
|
||||
'EventSource.h',
|
||||
'Link.h',
|
||||
'NodeIterator.h',
|
||||
@ -80,6 +81,7 @@ UNIFIED_SOURCES += [
|
||||
'DOMImplementation.cpp',
|
||||
'DOMParser.cpp',
|
||||
'DOMRect.cpp',
|
||||
'DOMStringList.cpp',
|
||||
'Element.cpp',
|
||||
'EventSource.cpp',
|
||||
'FileIOObject.cpp',
|
||||
@ -107,7 +109,6 @@ UNIFIED_SOURCES += [
|
||||
'nsDOMCaretPosition.cpp',
|
||||
'nsDOMFile.cpp',
|
||||
'nsDOMFileReader.cpp',
|
||||
'nsDOMLists.cpp',
|
||||
'nsDOMMutationObserver.cpp',
|
||||
'nsDOMSerializer.cpp',
|
||||
'nsDOMSettableTokenList.cpp',
|
||||
|
@ -1307,7 +1307,7 @@ nsExternalResourceMap::ExternalResource::~ExternalResource()
|
||||
// ==================================================================
|
||||
|
||||
// If we ever have an nsIDocumentObserver notification for stylesheet title
|
||||
// changes, we could make this inherit from nsDOMStringList instead of
|
||||
// changes, we could make this inherit from DOMStringList instead of
|
||||
// reimplementing nsIDOMDOMStringList.
|
||||
class nsDOMStyleSheetSetList MOZ_FINAL : public nsIDOMDOMStringList
|
||||
{
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include "mozilla/dom/StructuredCloneUtils.h"
|
||||
#include "JavaScriptChild.h"
|
||||
#include "JavaScriptParent.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsPrintfCString.h"
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -492,7 +492,7 @@ PropertyNodeList::EnsureFresh()
|
||||
}
|
||||
|
||||
PropertyStringList::PropertyStringList(HTMLPropertiesCollection* aCollection)
|
||||
: nsDOMStringList()
|
||||
: DOMStringList()
|
||||
, mCollection(aCollection)
|
||||
{ }
|
||||
|
||||
@ -511,21 +511,21 @@ NS_IMETHODIMP
|
||||
PropertyStringList::Item(uint32_t aIndex, nsAString& aResult)
|
||||
{
|
||||
mCollection->EnsureFresh();
|
||||
return nsDOMStringList::Item(aIndex, aResult);
|
||||
return DOMStringList::Item(aIndex, aResult);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PropertyStringList::GetLength(uint32_t* aLength)
|
||||
{
|
||||
mCollection->EnsureFresh();
|
||||
return nsDOMStringList::GetLength(aLength);
|
||||
return DOMStringList::GetLength(aLength);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
PropertyStringList::Contains(const nsAString& aString, bool* aResult)
|
||||
{
|
||||
mCollection->EnsureFresh();
|
||||
return nsDOMStringList::Contains(aString, aResult);
|
||||
return DOMStringList::Contains(aString, aResult);
|
||||
}
|
||||
|
||||
bool
|
||||
@ -533,7 +533,7 @@ PropertyStringList::ContainsInternal(const nsAString& aString)
|
||||
{
|
||||
// This method should not call EnsureFresh, otherwise we may become stuck in an infinite loop.
|
||||
bool result;
|
||||
nsDOMStringList::Contains(aString, &result);
|
||||
DOMStringList::Contains(aString, &result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
#define HTMLPropertiesCollection_h_
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsCycleCollectionParticipant.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsCOMArray.h"
|
||||
@ -31,7 +31,7 @@ class HTMLPropertiesCollection;
|
||||
class PropertyNodeList;
|
||||
class Element;
|
||||
|
||||
class PropertyStringList : public nsDOMStringList
|
||||
class PropertyStringList : public DOMStringList
|
||||
{
|
||||
public:
|
||||
PropertyStringList(HTMLPropertiesCollection* aCollection);
|
||||
@ -86,7 +86,7 @@ public:
|
||||
aFound = IsSupportedNamedProperty(aName);
|
||||
return aFound ? NamedItem(aName) : nullptr;
|
||||
}
|
||||
nsDOMStringList* Names()
|
||||
DOMStringList* Names()
|
||||
{
|
||||
EnsureFresh();
|
||||
return mNames;
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include "nsIVariant.h"
|
||||
#include "nsISupportsPrimitives.h"
|
||||
#include "nsIScriptSecurityManager.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsError.h"
|
||||
#include "nsIDragService.h"
|
||||
#include "nsIClipboard.h"
|
||||
@ -327,7 +327,7 @@ DataTransfer::GetFiles(nsIDOMFileList** aFileList)
|
||||
already_AddRefed<nsIDOMDOMStringList>
|
||||
DataTransfer::Types()
|
||||
{
|
||||
nsRefPtr<nsDOMStringList> types = new nsDOMStringList();
|
||||
nsRefPtr<DOMStringList> types = new DOMStringList();
|
||||
if (mItems.Length()) {
|
||||
const nsTArray<TransferItem>& item = mItems[0];
|
||||
for (uint32_t i = 0; i < item.Length(); i++)
|
||||
@ -531,7 +531,7 @@ DataTransfer::MozTypesAt(uint32_t aIndex, ErrorResult& aRv)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<nsDOMStringList> types = new nsDOMStringList();
|
||||
nsRefPtr<DOMStringList> types = new DOMStringList();
|
||||
if (aIndex < mItems.Length()) {
|
||||
// note that you can retrieve the types regardless of their principal
|
||||
nsTArray<TransferItem>& item = mItems[aIndex];
|
||||
|
@ -12,9 +12,9 @@
|
||||
#include "mozilla/Mutex.h"
|
||||
#include "mozilla/storage.h"
|
||||
#include "mozilla/dom/ContentParent.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "mozilla/dom/quota/Client.h"
|
||||
#include "mozilla/dom/quota/QuotaManager.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "nsJSUtils.h"
|
||||
#include "nsProxyRelease.h"
|
||||
#include "nsThreadUtils.h"
|
||||
@ -508,7 +508,7 @@ IDBDatabase::GetObjectStoreNames(ErrorResult& aRv) const
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<nsDOMStringList> list(new nsDOMStringList());
|
||||
nsRefPtr<DOMStringList> list(new DOMStringList());
|
||||
uint32_t count = objectStoreNames.Length();
|
||||
for (uint32_t index = 0; index < count; index++) {
|
||||
if (!list->Add(objectStoreNames[index])) {
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsDOMClassInfo.h"
|
||||
#include "nsDOMFile.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsEventDispatcher.h"
|
||||
#include "nsJSUtils.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
@ -2642,7 +2642,7 @@ IDBObjectStore::GetIndexNames(ErrorResult& aRv)
|
||||
{
|
||||
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
|
||||
|
||||
nsRefPtr<nsDOMStringList> list(new nsDOMStringList());
|
||||
nsRefPtr<DOMStringList> list(new DOMStringList());
|
||||
|
||||
nsAutoTArray<nsString, 10> names;
|
||||
uint32_t count = mInfo->indexes.Length();
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "mozilla/dom/quota/QuotaManager.h"
|
||||
#include "mozilla/storage.h"
|
||||
#include "nsDOMClassInfoID.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsEventDispatcher.h"
|
||||
#include "nsPIDOMWindow.h"
|
||||
#include "nsProxyRelease.h"
|
||||
@ -676,7 +676,7 @@ IDBTransaction::GetObjectStoreNames(ErrorResult& aRv)
|
||||
{
|
||||
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
|
||||
|
||||
nsRefPtr<nsDOMStringList> list(new nsDOMStringList());
|
||||
nsRefPtr<DOMStringList> list(new DOMStringList());
|
||||
|
||||
nsAutoTArray<nsString, 10> stackArray;
|
||||
nsTArray<nsString>* arrayOfNames;
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "nsDOMOfflineResourceList.h"
|
||||
#include "nsIScriptSecurityManager.h"
|
||||
#include "nsError.h"
|
||||
#include "nsDOMLists.h"
|
||||
#include "mozilla/dom/DOMStringList.h"
|
||||
#include "nsIPrefetchService.h"
|
||||
#include "nsCPrefetchService.h"
|
||||
#include "nsNetUtil.h"
|
||||
@ -189,7 +189,7 @@ nsDOMOfflineResourceList::GetMozItems(nsIDOMDOMStringList **aItems)
|
||||
|
||||
*aItems = nullptr;
|
||||
|
||||
nsRefPtr<nsDOMStringList> items = new nsDOMStringList();
|
||||
nsRefPtr<DOMStringList> items = new DOMStringList();
|
||||
|
||||
// If we are not associated with an application cache, return an
|
||||
// empty list.
|
||||
|
Loading…
Reference in New Issue
Block a user