diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/html/parser | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/html/parser')
-rw-r--r-- | Source/WebCore/html/parser/CSSPreloadScanner.h | 3 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLConstructionSite.h | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLDocumentParser.h | 1 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLElementStack.h | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLFormattingElementList.h | 3 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLInputStream.h | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLMetaCharsetParser.h | 3 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLParserScheduler.h | 4 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLPreloadScanner.h | 4 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLScriptRunner.h | 4 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLToken.h | 10 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLTokenizer.h | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLTreeBuilder.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/HTMLTreeBuilder.h | 6 | ||||
-rw-r--r-- | Source/WebCore/html/parser/NestingLevelIncrementer.h | 3 |
15 files changed, 45 insertions, 26 deletions
diff --git a/Source/WebCore/html/parser/CSSPreloadScanner.h b/Source/WebCore/html/parser/CSSPreloadScanner.h index 7ac282f..fae95a1 100644 --- a/Source/WebCore/html/parser/CSSPreloadScanner.h +++ b/Source/WebCore/html/parser/CSSPreloadScanner.h @@ -35,7 +35,8 @@ namespace WebCore { class Document; class HTMLToken; -class CSSPreloadScanner : public Noncopyable { +class CSSPreloadScanner { + WTF_MAKE_NONCOPYABLE(CSSPreloadScanner); public: CSSPreloadScanner(Document*); diff --git a/Source/WebCore/html/parser/HTMLConstructionSite.h b/Source/WebCore/html/parser/HTMLConstructionSite.h index 8b09bf5..5a4a65d 100644 --- a/Source/WebCore/html/parser/HTMLConstructionSite.h +++ b/Source/WebCore/html/parser/HTMLConstructionSite.h @@ -40,7 +40,8 @@ class AtomicHTMLToken; class Document; class Element; -class HTMLConstructionSite : public Noncopyable { +class HTMLConstructionSite { + WTF_MAKE_NONCOPYABLE(HTMLConstructionSite); public: HTMLConstructionSite(Document*, FragmentScriptingPermission, bool isParsingFragment); ~HTMLConstructionSite(); @@ -89,7 +90,8 @@ public: HTMLFormElement* form() const { return m_form.get(); } PassRefPtr<HTMLFormElement> takeForm(); - class RedirectToFosterParentGuard : public Noncopyable { + class RedirectToFosterParentGuard { + WTF_MAKE_NONCOPYABLE(RedirectToFosterParentGuard); public: RedirectToFosterParentGuard(HTMLConstructionSite& tree) : m_tree(tree) diff --git a/Source/WebCore/html/parser/HTMLDocumentParser.h b/Source/WebCore/html/parser/HTMLDocumentParser.h index 80ca727..f925269 100644 --- a/Source/WebCore/html/parser/HTMLDocumentParser.h +++ b/Source/WebCore/html/parser/HTMLDocumentParser.h @@ -50,6 +50,7 @@ class ScriptController; class ScriptSourceCode; class HTMLDocumentParser : public ScriptableDocumentParser, HTMLScriptRunnerHost, CachedResourceClient { + WTF_MAKE_FAST_ALLOCATED; public: static PassRefPtr<HTMLDocumentParser> create(HTMLDocument* document, bool reportErrors) { diff --git a/Source/WebCore/html/parser/HTMLElementStack.h b/Source/WebCore/html/parser/HTMLElementStack.h index 8a8e160..ad8b941 100644 --- a/Source/WebCore/html/parser/HTMLElementStack.h +++ b/Source/WebCore/html/parser/HTMLElementStack.h @@ -39,12 +39,14 @@ class QualifiedName; // NOTE: The HTML5 spec uses a backwards (grows downward) stack. We're using // more standard (grows upwards) stack terminology here. -class HTMLElementStack : public Noncopyable { +class HTMLElementStack { + WTF_MAKE_NONCOPYABLE(HTMLElementStack); WTF_MAKE_FAST_ALLOCATED; public: HTMLElementStack(); ~HTMLElementStack(); - class ElementRecord : public Noncopyable { + class ElementRecord { + WTF_MAKE_NONCOPYABLE(ElementRecord); public: ~ElementRecord(); // Public for ~PassOwnPtr() diff --git a/Source/WebCore/html/parser/HTMLFormattingElementList.h b/Source/WebCore/html/parser/HTMLFormattingElementList.h index aca05bb..f75fa50 100644 --- a/Source/WebCore/html/parser/HTMLFormattingElementList.h +++ b/Source/WebCore/html/parser/HTMLFormattingElementList.h @@ -35,7 +35,8 @@ namespace WebCore { class Element; // This may end up merged into HTMLElementStack. -class HTMLFormattingElementList : public Noncopyable { +class HTMLFormattingElementList { + WTF_MAKE_NONCOPYABLE(HTMLFormattingElementList); public: HTMLFormattingElementList(); ~HTMLFormattingElementList(); diff --git a/Source/WebCore/html/parser/HTMLInputStream.h b/Source/WebCore/html/parser/HTMLInputStream.h index 1bfbaf9..d95ec31 100644 --- a/Source/WebCore/html/parser/HTMLInputStream.h +++ b/Source/WebCore/html/parser/HTMLInputStream.h @@ -47,7 +47,8 @@ namespace WebCore { // m_last is a pointer to the last of the afterInsertionPoint strings. // The network adds data at the end of the InputStream, which appends // them to the "last" string. -class HTMLInputStream : public Noncopyable { +class HTMLInputStream { + WTF_MAKE_NONCOPYABLE(HTMLInputStream); public: HTMLInputStream() : m_last(&m_first) @@ -129,7 +130,8 @@ private: SegmentedString* m_last; }; -class InsertionPointRecord : public Noncopyable { +class InsertionPointRecord { + WTF_MAKE_NONCOPYABLE(InsertionPointRecord); public: explicit InsertionPointRecord(HTMLInputStream& inputStream) : m_inputStream(&inputStream) diff --git a/Source/WebCore/html/parser/HTMLMetaCharsetParser.h b/Source/WebCore/html/parser/HTMLMetaCharsetParser.h index c3136f5..45fbaf7 100644 --- a/Source/WebCore/html/parser/HTMLMetaCharsetParser.h +++ b/Source/WebCore/html/parser/HTMLMetaCharsetParser.h @@ -36,7 +36,8 @@ namespace WebCore { class HTMLTokenizer; class TextCodec; -class HTMLMetaCharsetParser : public Noncopyable { +class HTMLMetaCharsetParser { + WTF_MAKE_NONCOPYABLE(HTMLMetaCharsetParser); public: static PassOwnPtr<HTMLMetaCharsetParser> create() { return adoptPtr(new HTMLMetaCharsetParser()); } diff --git a/Source/WebCore/html/parser/HTMLParserScheduler.h b/Source/WebCore/html/parser/HTMLParserScheduler.h index 3a20b2b..c415c62 100644 --- a/Source/WebCore/html/parser/HTMLParserScheduler.h +++ b/Source/WebCore/html/parser/HTMLParserScheduler.h @@ -28,14 +28,14 @@ #include "Timer.h" #include <wtf/CurrentTime.h> -#include <wtf/Noncopyable.h> #include <wtf/PassOwnPtr.h> namespace WebCore { class HTMLDocumentParser; -class HTMLParserScheduler : public Noncopyable { +class HTMLParserScheduler { + WTF_MAKE_NONCOPYABLE(HTMLParserScheduler); WTF_MAKE_FAST_ALLOCATED; public: static PassOwnPtr<HTMLParserScheduler> create(HTMLDocumentParser* parser) { diff --git a/Source/WebCore/html/parser/HTMLPreloadScanner.h b/Source/WebCore/html/parser/HTMLPreloadScanner.h index 94a90e6..bed77fe 100644 --- a/Source/WebCore/html/parser/HTMLPreloadScanner.h +++ b/Source/WebCore/html/parser/HTMLPreloadScanner.h @@ -30,7 +30,6 @@ #include "CSSPreloadScanner.h" #include "HTMLToken.h" #include "SegmentedString.h" -#include <wtf/Noncopyable.h> namespace WebCore { @@ -39,7 +38,8 @@ class HTMLToken; class HTMLTokenizer; class SegmentedString; -class HTMLPreloadScanner : public Noncopyable { +class HTMLPreloadScanner { + WTF_MAKE_NONCOPYABLE(HTMLPreloadScanner); WTF_MAKE_FAST_ALLOCATED; public: HTMLPreloadScanner(Document*); diff --git a/Source/WebCore/html/parser/HTMLScriptRunner.h b/Source/WebCore/html/parser/HTMLScriptRunner.h index 6cf74d8..986f7bd 100644 --- a/Source/WebCore/html/parser/HTMLScriptRunner.h +++ b/Source/WebCore/html/parser/HTMLScriptRunner.h @@ -29,7 +29,6 @@ #include "PendingScript.h" #include <wtf/Deque.h> #include <wtf/text/TextPosition.h> -#include <wtf/Noncopyable.h> #include <wtf/PassRefPtr.h> namespace WebCore { @@ -42,7 +41,8 @@ class Frame; class HTMLScriptRunnerHost; class ScriptSourceCode; -class HTMLScriptRunner : public Noncopyable { +class HTMLScriptRunner { + WTF_MAKE_NONCOPYABLE(HTMLScriptRunner); WTF_MAKE_FAST_ALLOCATED; public: static PassOwnPtr<HTMLScriptRunner> create(Document* document, HTMLScriptRunnerHost* host) { diff --git a/Source/WebCore/html/parser/HTMLToken.h b/Source/WebCore/html/parser/HTMLToken.h index 42cddb8..1cbc151 100644 --- a/Source/WebCore/html/parser/HTMLToken.h +++ b/Source/WebCore/html/parser/HTMLToken.h @@ -27,13 +27,13 @@ #define HTMLToken_h #include "NamedNodeMap.h" -#include <wtf/Noncopyable.h> #include <wtf/PassOwnPtr.h> #include <wtf/Vector.h> namespace WebCore { -class HTMLToken : public Noncopyable { +class HTMLToken { + WTF_MAKE_NONCOPYABLE(HTMLToken); WTF_MAKE_FAST_ALLOCATED; public: enum Type { Uninitialized, @@ -313,7 +313,8 @@ private: // want to end up with a cleaner interface between the two classes. friend class AtomicHTMLToken; - class DoctypeData : public Noncopyable { + class DoctypeData { + WTF_MAKE_NONCOPYABLE(DoctypeData); public: DoctypeData() : m_hasPublicIdentifier(false) @@ -352,7 +353,8 @@ private: // FIXME: This class should eventually be named HTMLToken once we move the // exiting HTMLToken to be internal to the HTMLTokenizer. -class AtomicHTMLToken : public Noncopyable { +class AtomicHTMLToken { + WTF_MAKE_NONCOPYABLE(AtomicHTMLToken); public: AtomicHTMLToken(HTMLToken& token) : m_type(token.type()) diff --git a/Source/WebCore/html/parser/HTMLTokenizer.h b/Source/WebCore/html/parser/HTMLTokenizer.h index f16b049..fa45cb2 100644 --- a/Source/WebCore/html/parser/HTMLTokenizer.h +++ b/Source/WebCore/html/parser/HTMLTokenizer.h @@ -39,7 +39,8 @@ class Element; class Frame; class HTMLToken; -class HTMLTokenizer : public Noncopyable { +class HTMLTokenizer { + WTF_MAKE_NONCOPYABLE(HTMLTokenizer); WTF_MAKE_FAST_ALLOCATED; public: enum State { DataState, @@ -172,7 +173,8 @@ public: private: // http://www.whatwg.org/specs/web-apps/current-work/#preprocessing-the-input-stream - class InputStreamPreprocessor : public Noncopyable { + class InputStreamPreprocessor { + WTF_MAKE_NONCOPYABLE(InputStreamPreprocessor); public: InputStreamPreprocessor(HTMLTokenizer* tokenizer) : m_tokenizer(tokenizer) diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp index 02713e5..97cee13 100644 --- a/Source/WebCore/html/parser/HTMLTreeBuilder.cpp +++ b/Source/WebCore/html/parser/HTMLTreeBuilder.cpp @@ -241,7 +241,8 @@ HTMLFormElement* closestFormAncestor(Element* element) } // namespace -class HTMLTreeBuilder::ExternalCharacterTokenBuffer : public Noncopyable { +class HTMLTreeBuilder::ExternalCharacterTokenBuffer { + WTF_MAKE_NONCOPYABLE(ExternalCharacterTokenBuffer); public: explicit ExternalCharacterTokenBuffer(AtomicHTMLToken& token) : m_current(token.characters().data()) @@ -2342,7 +2343,8 @@ void HTMLTreeBuilder::reprocessEndTag(AtomicHTMLToken& token) processEndTag(token); } -class HTMLTreeBuilder::FakeInsertionMode : public Noncopyable { +class HTMLTreeBuilder::FakeInsertionMode { + WTF_MAKE_NONCOPYABLE(FakeInsertionMode); public: FakeInsertionMode(HTMLTreeBuilder* treeBuilder, InsertionMode mode) : m_treeBuilder(treeBuilder) diff --git a/Source/WebCore/html/parser/HTMLTreeBuilder.h b/Source/WebCore/html/parser/HTMLTreeBuilder.h index 17b77b7..309ac6f 100644 --- a/Source/WebCore/html/parser/HTMLTreeBuilder.h +++ b/Source/WebCore/html/parser/HTMLTreeBuilder.h @@ -51,7 +51,8 @@ class HTMLDocument; class Node; class HTMLDocumentParser; -class HTMLTreeBuilder : public Noncopyable { +class HTMLTreeBuilder { + WTF_MAKE_NONCOPYABLE(HTMLTreeBuilder); WTF_MAKE_FAST_ALLOCATED; public: static PassOwnPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, HTMLDocument* document, bool reportErrors, bool usePreHTML5ParserQuirks) { @@ -204,7 +205,8 @@ private: void processForeignContentUsingInBodyModeAndResetMode(AtomicHTMLToken& token); void resetForeignInsertionMode(); - class FragmentParsingContext : public Noncopyable { + class FragmentParsingContext { + WTF_MAKE_NONCOPYABLE(FragmentParsingContext); public: FragmentParsingContext(); FragmentParsingContext(DocumentFragment*, Element* contextElement, FragmentScriptingPermission); diff --git a/Source/WebCore/html/parser/NestingLevelIncrementer.h b/Source/WebCore/html/parser/NestingLevelIncrementer.h index c597876..8155635 100644 --- a/Source/WebCore/html/parser/NestingLevelIncrementer.h +++ b/Source/WebCore/html/parser/NestingLevelIncrementer.h @@ -28,7 +28,8 @@ namespace WebCore { -class NestingLevelIncrementer : public Noncopyable { +class NestingLevelIncrementer { + WTF_MAKE_NONCOPYABLE(NestingLevelIncrementer); public: explicit NestingLevelIncrementer(unsigned& nestingLevel) : m_nestingLevel(&nestingLevel) |