diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-10 23:43:57 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-10 23:43:57 +0200 |
| commit | 7565513554476f7262d9d524b9a36bd069dacf9c (patch) | |
| tree | 56023022231f2d082439a2d15b761d17947707fb /parser | |
| parent | 69b88dfccc38b9022e65bf459b199bdf4145ce67 (diff) | |
| parent | 7bf3d2440e8ff65763daedca51aad6d0288ef61d (diff) | |
| download | UXP-7565513554476f7262d9d524b9a36bd069dacf9c.tar UXP-7565513554476f7262d9d524b9a36bd069dacf9c.tar.gz UXP-7565513554476f7262d9d524b9a36bd069dacf9c.tar.lz UXP-7565513554476f7262d9d524b9a36bd069dacf9c.tar.xz UXP-7565513554476f7262d9d524b9a36bd069dacf9c.zip | |
Merge branch 'master' into ported-upstream
Diffstat (limited to 'parser')
| -rw-r--r-- | parser/htmlparser/nsScannerString.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/parser/htmlparser/nsScannerString.h b/parser/htmlparser/nsScannerString.h index 7b722238f..247c04c04 100644 --- a/parser/htmlparser/nsScannerString.h +++ b/parser/htmlparser/nsScannerString.h @@ -21,7 +21,7 @@ * to live in xpcom/string. Now that nsAString is limited to representing * only single fragment strings, nsSlidingString can no longer be used. * - * An advantage to this design is that it does not employ any virtual + * An advantage to this design is that it does not employ any virtual * functions. * * This file uses SCC-style indenting in deference to the nsSlidingString @@ -103,12 +103,12 @@ class nsScannerBufferList public: Position() {} - + Position( Buffer* buffer, char16_t* position ) : mBuffer(buffer) , mPosition(position) {} - + inline explicit Position( const nsScannerIterator& aIter ); @@ -133,7 +133,7 @@ class nsScannerBufferList void AddRef() { ++mRefCnt; } void Release() { if (--mRefCnt == 0) delete this; } - void Append( Buffer* buf ) { mBuffers.insertBack(buf); } + void Append( Buffer* buf ) { mBuffers.insertBack(buf); } void InsertAfter( Buffer* buf, Buffer* prev ) { prev->setNext(buf); } void SplitBuffer( const Position& ); void DiscardUnreferencedPrefix( Buffer* ); @@ -223,7 +223,7 @@ class nsScannerSubstring mBufferList->Release(); } } - + void init_range_from_buffer_list() { mStart.mBuffer = mBufferList->Head(); @@ -340,7 +340,7 @@ class nsScannerIterator friend class nsScannerSharedSubstring; public: - nsScannerIterator() {} + // nsScannerIterator(); // auto-generate default constructor is OK // nsScannerIterator( const nsScannerIterator& ); // auto-generated copy-constructor OK // nsScannerIterator& operator=( const nsScannerIterator& ); // auto-generated copy-assignment operator OK @@ -351,7 +351,7 @@ class nsScannerIterator { return mPosition; } - + char16_t operator*() const { return *get(); @@ -467,7 +467,7 @@ struct nsCharSourceTraits<nsScannerIterator> { return iter.get(); } - + static void advance( nsScannerIterator& s, difference_type n ) @@ -593,7 +593,7 @@ RFindInReadable( const nsAString& aPattern, inline bool -CaseInsensitiveFindInReadable( const nsAString& aPattern, +CaseInsensitiveFindInReadable( const nsAString& aPattern, nsScannerIterator& aStart, nsScannerIterator& aEnd ) { |