Changeset 139533 in webkit


Ignore:
Timestamp:
Jan 11, 2013 6:05:52 PM (11 years ago)
Author:
tonyg@chromium.org
Message:

Move HTMLTokenTypes to its own file
​https://bugs.webkit.org/show_bug.cgi?id=106722

Reviewed by Levi Weintraub.

Also mark AtomicHTMLToken ctor as explicit.

No new tests because no new functionality.

  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • html/parser/HTMLToken.h:

(WebCore::AtomicHTMLToken::AtomicHTMLToken):

  • html/parser/HTMLTokenTypes.h: Added.

(WebCore):
(HTMLTokenTypes):
(DoctypeData):
(WebCore::HTMLTokenTypes::DoctypeData::DoctypeData):

Location:
trunk/Source/WebCore
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r139529 r139533  
     12013-01-11  Tony Gentilcore  <tonyg@chromium.org>
     2
     3        Move HTMLTokenTypes to its own file
     4        https://bugs.webkit.org/show_bug.cgi?id=106722
     5
     6        Reviewed by Levi Weintraub.
     7
     8        Also mark AtomicHTMLToken ctor as explicit.
     9
     10        No new tests because no new functionality.
     11
     12        * GNUmakefile.list.am:
     13        * Target.pri:
     14        * WebCore.gypi:
     15        * WebCore.vcproj/WebCore.vcproj:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * html/parser/HTMLToken.h:
     18        (WebCore::AtomicHTMLToken::AtomicHTMLToken):
     19        * html/parser/HTMLTokenTypes.h: Added.
     20        (WebCore):
     21        (HTMLTokenTypes):
     22        (DoctypeData):
     23        (WebCore::HTMLTokenTypes::DoctypeData::DoctypeData):
     24
    1252013-01-11  Elliott Sprehn  <esprehn@chromium.org>
    226

  • trunk/Source/WebCore/GNUmakefile.list.am

    r139465 r139533  
    35633563        Source/WebCore/html/parser/HTMLStackItem.h \
    35643564        Source/WebCore/html/parser/HTMLToken.h \
     3565        Source/WebCore/html/parser/HTMLTokenTypes.h \
    35653566        Source/WebCore/html/parser/HTMLTokenizer.cpp \
    35663567        Source/WebCore/html/parser/HTMLTokenizer.h \

  • trunk/Source/WebCore/Target.pri

    r139409 r139533  
    18921892    html/parser/HTMLScriptRunnerHost.h \
    18931893    html/parser/HTMLToken.h \
     1894    html/parser/HTMLTokenTypes.h \
    18941895    html/parser/HTMLTokenizer.h \
    18951896    html/parser/HTMLTreeBuilder.h \

  • trunk/Source/WebCore/WebCore.gypi

    r139414 r139533  
    33683368            'html/parser/HTMLStackItem.h',
    33693369            'html/parser/HTMLToken.h',
     3370            'html/parser/HTMLTokenTypes.h',
    33703371            'html/parser/HTMLTokenizer.cpp',
    33713372            'html/parser/HTMLTokenizer.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r139414 r139533  
    6455864558                                </File>
    6455964559                                <File
     64560                                        RelativePath="..\html\parser\HTMLTokenTypes.h"
     64561                                        >
     64562                                </File>
     64563                                <File
    6456064564                                        RelativePath="..\html\parser\HTMLTokenizer.cpp"
    6456164565                                        >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r139409 r139533  
    1111611116                97C1F552122855CB00EDE615 /* HTMLStackItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLStackItem.h; path = parser/HTMLStackItem.h; sourceTree = "<group>"; };
    1111711117                97C1F552122855CB00EDE616 /* HTMLToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLToken.h; path = parser/HTMLToken.h; sourceTree = "<group>"; };
     11118                97C1F552122855CB00EDE617 /* HTMLTokenTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLTokenTypes.h; path = parser/HTMLTokenTypes.h; sourceTree = "<group>"; };
    1111811119                97C471D912F925BC0086354B /* ContentSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentSecurityPolicy.cpp; sourceTree = "<group>"; };
    1111911120                97C471DA12F925BD0086354B /* ContentSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentSecurityPolicy.h; sourceTree = "<group>"; };
    … …  
    1849718498                                97C1F552122855CB00EDE615 /* HTMLStackItem.h */,
    1849818499                                97C1F552122855CB00EDE616 /* HTMLToken.h */,
     18500                                97C1F552122855CB00EDE617 /* HTMLTokenTypes.h */,
    1849918501                                977B385E122883E900B81FF8 /* HTMLTokenizer.cpp */,
    1850018502                                977B385F122883E900B81FF8 /* HTMLTokenizer.h */,

  • trunk/Source/WebCore/html/parser/HTMLToken.h

    r132165 r139533  
    2727#define HTMLToken_h
    2828
     29#include "HTMLTokenTypes.h"
    2930#include "MarkupTokenBase.h"
    3031#include <wtf/RefCounted.h>
    … …  
    3233
    3334namespace WebCore {
    34 
    35 class HTMLTokenTypes {
    36 public:
    37     enum Type {
    38         Uninitialized,
    39         DOCTYPE,
    40         StartTag,
    41         EndTag,
    42         Comment,
    43         Character,
    44         EndOfFile,
    45     };
    46 
    47     class DoctypeData : public DoctypeDataBase {
    48         WTF_MAKE_NONCOPYABLE(DoctypeData);
    49     public:
    50         DoctypeData()
    51             : m_forceQuirks(false)
    52         {
    53         }
    54 
    55         bool m_forceQuirks;
    56     };
    57 };
    5835
    5936class HTMLToken : public MarkupTokenBase<HTMLTokenTypes, HTMLTokenTypes::DoctypeData> {
    … …  
    10380    }
    10481private:
    105     AtomicHTMLToken(HTMLToken& token)
     82    explicit AtomicHTMLToken(HTMLToken& token)
    10683        : AtomicMarkupTokenBase<HTMLToken>(&token)
    10784    {
Note: See TracChangeset for help on using the changeset viewer.