2006-05-15 Eric Seidel <eseidel@apple.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 May 2006 21:57:01 +0000 (21:57 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 May 2006 21:57:01 +0000 (21:57 +0000)
        Reviewed by beth.

        Split html_blockimpl.* into separate files (one per class).
        http://bugzilla.opendarwin.org/show_bug.cgi?id=8927

        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/kjs_html.cpp:
        * bindings/objc/DOMHTML.mm:
        * html/HTMLBlockquoteElement.cpp: Added.
        (WebCore::HTMLBlockquoteElement::HTMLBlockquoteElement):
        * html/HTMLBlockquoteElement.h: Added.
        * html/HTMLDivElement.cpp: Added.
        * html/HTMLDivElement.h: Added.
        * html/HTMLElementFactory.cpp:
        * html/HTMLHRElement.cpp: Added.
        * html/HTMLHRElement.h: Added.
        * html/HTMLHeadingElement.cpp: Added.
        * html/HTMLHeadingElement.h: Added.
        * html/HTMLMarqueeElement.cpp: Added.
        (WebCore::HTMLMarqueeElement::HTMLMarqueeElement):
        (WebCore::HTMLMarqueeElement::parseMappedAttribute):
        * html/HTMLMarqueeElement.h: Added.
        * html/HTMLParagraphElement.cpp: Added.
        * html/HTMLParagraphElement.h: Added.
        * html/HTMLParser.cpp:
        * html/HTMLPreElement.cpp: Added.
        (WebCore::HTMLPreElement::HTMLPreElement):
        (WebCore::HTMLPreElement::setWrap):
        * html/HTMLPreElement.h: Added.
        * html/HTMLTextFieldInnerElement.h:
        * html/html_blockimpl.cpp: Removed.
        * html/html_blockimpl.h: Removed.
        * rendering/RenderLayer.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14390 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/js/kjs_html.cpp
WebCore/bindings/objc/DOMHTML.mm
WebCore/html/HTMLBlockquoteElement.cpp [new file with mode: 0644]
WebCore/html/HTMLBlockquoteElement.h [new file with mode: 0644]
WebCore/html/HTMLDivElement.cpp [new file with mode: 0644]
WebCore/html/HTMLDivElement.h [new file with mode: 0644]
WebCore/html/HTMLElementFactory.cpp
WebCore/html/HTMLHRElement.cpp [new file with mode: 0644]
WebCore/html/HTMLHRElement.h [new file with mode: 0644]
WebCore/html/HTMLHeadingElement.cpp [new file with mode: 0644]
WebCore/html/HTMLHeadingElement.h [new file with mode: 0644]
WebCore/html/HTMLMarqueeElement.cpp [new file with mode: 0644]
WebCore/html/HTMLMarqueeElement.h [new file with mode: 0644]
WebCore/html/HTMLParagraphElement.cpp [new file with mode: 0644]
WebCore/html/HTMLParagraphElement.h [new file with mode: 0644]
WebCore/html/HTMLParser.cpp
WebCore/html/HTMLPreElement.cpp [new file with mode: 0644]
WebCore/html/HTMLPreElement.h [new file with mode: 0644]
WebCore/html/HTMLTextFieldInnerElement.h
WebCore/html/html_blockimpl.cpp [deleted file]
WebCore/html/html_blockimpl.h [deleted file]
WebCore/rendering/RenderLayer.cpp

index 9352afba694e67bbe76727a5bf929fa5fa56d9fb..e33e50e15f35f5fa5c21a81816d9bd5c03f28d74 100644 (file)
@@ -1,8 +1,45 @@
+2006-05-15  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by beth.
+
+        Split html_blockimpl.* into separate files (one per class).
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8927
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/kjs_html.cpp:
+        * bindings/objc/DOMHTML.mm:
+        * html/HTMLBlockquoteElement.cpp: Added.
+        (WebCore::HTMLBlockquoteElement::HTMLBlockquoteElement):
+        * html/HTMLBlockquoteElement.h: Added.
+        * html/HTMLDivElement.cpp: Added.
+        * html/HTMLDivElement.h: Added.
+        * html/HTMLElementFactory.cpp:
+        * html/HTMLHRElement.cpp: Added.
+        * html/HTMLHRElement.h: Added.
+        * html/HTMLHeadingElement.cpp: Added.
+        * html/HTMLHeadingElement.h: Added.
+        * html/HTMLMarqueeElement.cpp: Added.
+        (WebCore::HTMLMarqueeElement::HTMLMarqueeElement):
+        (WebCore::HTMLMarqueeElement::parseMappedAttribute):
+        * html/HTMLMarqueeElement.h: Added.
+        * html/HTMLParagraphElement.cpp: Added.
+        * html/HTMLParagraphElement.h: Added.
+        * html/HTMLParser.cpp:
+        * html/HTMLPreElement.cpp: Added.
+        (WebCore::HTMLPreElement::HTMLPreElement):
+        (WebCore::HTMLPreElement::setWrap):
+        * html/HTMLPreElement.h: Added.
+        * html/HTMLTextFieldInnerElement.h:
+        * html/html_blockimpl.cpp: Removed.
+        * html/html_blockimpl.h: Removed.
+        * rendering/RenderLayer.cpp:
+
 2006-05-15  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by ggaren.
 
         Split render_list.* and html_listimpl.* into separate files (one per class).
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8925
 
         * WebCore.xcodeproj/project.pbxproj:
         * bindings/js/kjs_html.cpp:
index ed3be138a9468d4e38cfc45a03ac232a41d152eb..712697eb8f179175704027ca0462bb348f099371 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\html\html_blockimpl.cpp"\r
+                               RelativePath="..\..\html\HTMLHRElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\html\html_blockimpl.h"\r
+                               RelativePath="..\..\html\HTMLHRElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLMarqueeElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLMarqueeElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLBlockquoteElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLBlockquoteElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLPreElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLPreElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLParagraphElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLParagraphElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLHeadingElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLHeadingElement.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLDivElement.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\html\HTMLDivElement.h"\r
                                >\r
                        </File>\r
                        <File\r
index a4d1149914848f3aca444949c4db991443102bc9..646fecda96fb4a544abb8b62694f620f90f75a73 100644 (file)
                93EEC20409C2877700C515D1 /* CanvasPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EEC1F209C2877700C515D1 /* CanvasPattern.h */; };
                93EEC26F09C3218000C515D1 /* CanvasPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93EEC26E09C3218000C515D1 /* CanvasPattern.cpp */; };
                93EEC27109C3218800C515D1 /* CanvasStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93EEC27009C3218800C515D1 /* CanvasStyle.cpp */; };
-               93F198E408245E59001E9ABC /* html_blockimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D23A02DE4396018635CA /* html_blockimpl.h */; };
                93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D23C02DE4396018635CA /* HTMLDocument.h */; };
                93F198E608245E59001E9ABC /* HTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D23F02DE4396018635CA /* HTMLElement.h */; };
                93F198E908245E59001E9ABC /* html_imageimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D24502DE4396018635CA /* html_imageimpl.h */; };
                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */; };
                93F19A5D08245E59001E9ABC /* WebCoreImageRendererFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587854F02DE375901EA4122 /* WebCoreImageRendererFactory.m */; };
                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
-               93F19A9008245E59001E9ABC /* html_blockimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23902DE4396018635CA /* html_blockimpl.cpp */; };
                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23B02DE4396018635CA /* HTMLDocument.cpp */; };
                93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D23E02DE4396018635CA /* HTMLElement.cpp */; };
                93F19A9508245E59001E9ABC /* html_imageimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D24402DE4396018635CA /* html_imageimpl.cpp */; };
                A8EA7A510A191A5200A8EF5F /* RenderListMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7A4B0A191A5200A8EF5F /* RenderListMarker.cpp */; };
                A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7A4C0A191A5200A8EF5F /* RenderListItem.h */; };
                A8EA7A530A191A5200A8EF5F /* ListMarkerBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7A4D0A191A5200A8EF5F /* ListMarkerBox.cpp */; };
+               A8EA7CAB0A192B9C00A8EF5F /* HTMLMarqueeElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7C9D0A192B9C00A8EF5F /* HTMLMarqueeElement.h */; };
+               A8EA7CAC0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7C9E0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp */; };
+               A8EA7CAD0A192B9C00A8EF5F /* HTMLPreElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7C9F0A192B9C00A8EF5F /* HTMLPreElement.cpp */; };
+               A8EA7CAE0A192B9C00A8EF5F /* HTMLHeadingElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7CA00A192B9C00A8EF5F /* HTMLHeadingElement.cpp */; };
+               A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CA10A192B9C00A8EF5F /* HTMLHRElement.h */; };
+               A8EA7CB00A192B9C00A8EF5F /* HTMLPreElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CA20A192B9C00A8EF5F /* HTMLPreElement.h */; };
+               A8EA7CB10A192B9C00A8EF5F /* HTMLDivElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7CA30A192B9C00A8EF5F /* HTMLDivElement.cpp */; };
+               A8EA7CB20A192B9C00A8EF5F /* HTMLParagraphElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7CA40A192B9C00A8EF5F /* HTMLParagraphElement.cpp */; };
+               A8EA7CB30A192B9C00A8EF5F /* HTMLHRElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7CA50A192B9C00A8EF5F /* HTMLHRElement.cpp */; };
+               A8EA7CB40A192B9C00A8EF5F /* HTMLBlockquoteElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CA60A192B9C00A8EF5F /* HTMLBlockquoteElement.h */; };
+               A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CA70A192B9C00A8EF5F /* HTMLParagraphElement.h */; };
+               A8EA7CB60A192B9C00A8EF5F /* HTMLBlockquoteElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA7CA80A192B9C00A8EF5F /* HTMLBlockquoteElement.cpp */; };
+               A8EA7CB70A192B9C00A8EF5F /* HTMLDivElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CA90A192B9C00A8EF5F /* HTMLDivElement.h */; };
+               A8EA7CB80A192B9C00A8EF5F /* HTMLHeadingElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA7CAA0A192B9C00A8EF5F /* HTMLHeadingElement.h */; };
                A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A85D7A8C0879EC64006A9172 /* KWQWMatrix.cpp */; };
                A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = A85D7A8D0879EC64006A9172 /* KWQWMatrix.h */; };
                A8FEFB0A0979F472005839FD /* RenderForeignObject.h in Headers */ = {isa = PBXBuildFile; fileRef = A8FEFB080979F472005839FD /* RenderForeignObject.h */; };
                A8EA7A4B0A191A5200A8EF5F /* RenderListMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderListMarker.cpp; sourceTree = "<group>"; };
                A8EA7A4C0A191A5200A8EF5F /* RenderListItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderListItem.h; sourceTree = "<group>"; };
                A8EA7A4D0A191A5200A8EF5F /* ListMarkerBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ListMarkerBox.cpp; sourceTree = "<group>"; };
+               A8EA7C9D0A192B9C00A8EF5F /* HTMLMarqueeElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLMarqueeElement.h; sourceTree = "<group>"; };
+               A8EA7C9E0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLMarqueeElement.cpp; sourceTree = "<group>"; };
+               A8EA7C9F0A192B9C00A8EF5F /* HTMLPreElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPreElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA00A192B9C00A8EF5F /* HTMLHeadingElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLHeadingElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA10A192B9C00A8EF5F /* HTMLHRElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLHRElement.h; sourceTree = "<group>"; };
+               A8EA7CA20A192B9C00A8EF5F /* HTMLPreElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLPreElement.h; sourceTree = "<group>"; };
+               A8EA7CA30A192B9C00A8EF5F /* HTMLDivElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLDivElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA40A192B9C00A8EF5F /* HTMLParagraphElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParagraphElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA50A192B9C00A8EF5F /* HTMLHRElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLHRElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA60A192B9C00A8EF5F /* HTMLBlockquoteElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLBlockquoteElement.h; sourceTree = "<group>"; };
+               A8EA7CA70A192B9C00A8EF5F /* HTMLParagraphElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLParagraphElement.h; sourceTree = "<group>"; };
+               A8EA7CA80A192B9C00A8EF5F /* HTMLBlockquoteElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLBlockquoteElement.cpp; sourceTree = "<group>"; };
+               A8EA7CA90A192B9C00A8EF5F /* HTMLDivElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLDivElement.h; sourceTree = "<group>"; };
+               A8EA7CAA0A192B9C00A8EF5F /* HTMLHeadingElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLHeadingElement.h; sourceTree = "<group>"; };
                A8FEFB080979F472005839FD /* RenderForeignObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderForeignObject.h; sourceTree = "<group>"; };
                A8FEFB090979F472005839FD /* RenderForeignObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderForeignObject.cpp; sourceTree = "<group>"; };
                A8FEFB2F0979F4F6005839FD /* SVGForeignObjectElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGForeignObjectElement.cpp; sourceTree = "<group>"; };
                E1F0424509839389006694EA /* xmlhttprequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlhttprequest.h; sourceTree = "<group>"; };
                ED048ABB0833F132006E1E67 /* textAreaResizeCorner.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = textAreaResizeCorner.tiff; sourceTree = "<group>"; };
                ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarker.h; sourceTree = "<group>"; };
-               F523D23902DE4396018635CA /* html_blockimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = html_blockimpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D23A02DE4396018635CA /* html_blockimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = html_blockimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D23B02DE4396018635CA /* HTMLDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLDocument.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D23C02DE4396018635CA /* HTMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLDocument.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D23E02DE4396018635CA /* HTMLElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElement.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                93EEC1EF09C2877700C515D1 /* CanvasStyle.h */,
                                A8136D370973A8E700D74463 /* FormDataList.cpp */,
                                A8136D360973A8E700D74463 /* FormDataList.h */,
-                               F523D23902DE4396018635CA /* html_blockimpl.cpp */,
-                               F523D23A02DE4396018635CA /* html_blockimpl.h */,
                                F523D24402DE4396018635CA /* html_imageimpl.cpp */,
                                F523D24502DE4396018635CA /* html_imageimpl.h */,
                                A8CFF79A0A156978000A4234 /* HTMLAnchorElement.cpp */,
                                A871DC130A15205700B12A68 /* HTMLBaseElement.h */,
                                A8DF3FCB097FA0FB0052981B /* HTMLBaseFontElement.cpp */,
                                A8DF3FCA097FA0FB0052981B /* HTMLBaseFontElement.h */,
+                               A8EA7CA80A192B9C00A8EF5F /* HTMLBlockquoteElement.cpp */,
+                               A8EA7CA60A192B9C00A8EF5F /* HTMLBlockquoteElement.h */,
                                A871DE1D0A152AC800B12A68 /* HTMLBodyElement.cpp */,
                                A871DE200A152AC800B12A68 /* HTMLBodyElement.h */,
                                A8CFF79E0A156978000A4234 /* HTMLBRElement.cpp */,
                                A8DF3FC8097FA0FB0052981B /* HTMLCollection.h */,
                                A8EA79ED0A1916DF00A8EF5F /* HTMLDirectoryElement.cpp */,
                                A8EA79EE0A1916DF00A8EF5F /* HTMLDirectoryElement.h */,
+                               A8EA7CA30A192B9C00A8EF5F /* HTMLDivElement.cpp */,
+                               A8EA7CA90A192B9C00A8EF5F /* HTMLDivElement.h */,
                                A8EA79E90A1916DF00A8EF5F /* HTMLDListElement.cpp */,
                                A8EA79EB0A1916DF00A8EF5F /* HTMLDListElement.h */,
                                F523D23B02DE4396018635CA /* HTMLDocument.cpp */,
                                A81369B2097374F500D74463 /* HTMLGenericFormElement.h */,
                                A871DE190A152AC800B12A68 /* HTMLHeadElement.cpp */,
                                A871DE210A152AC800B12A68 /* HTMLHeadElement.h */,
+                               A8EA7CA00A192B9C00A8EF5F /* HTMLHeadingElement.cpp */,
+                               A8EA7CAA0A192B9C00A8EF5F /* HTMLHeadingElement.h */,
+                               A8EA7CA50A192B9C00A8EF5F /* HTMLHRElement.cpp */,
+                               A8EA7CA10A192B9C00A8EF5F /* HTMLHRElement.h */,
                                A871DE1A0A152AC800B12A68 /* HTMLHtmlElement.cpp */,
                                A871DE1B0A152AC800B12A68 /* HTMLHtmlElement.h */,
                                A871DE180A152AC800B12A68 /* HTMLIFrameElement.cpp */,
                                A8EA79EA0A1916DF00A8EF5F /* HTMLLIElement.h */,
                                A871DC150A15205700B12A68 /* HTMLLinkElement.cpp */,
                                A871DC140A15205700B12A68 /* HTMLLinkElement.h */,
+                               A8EA7C9E0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp */,
+                               A8EA7C9D0A192B9C00A8EF5F /* HTMLMarqueeElement.h */,
                                A8EA79EC0A1916DF00A8EF5F /* HTMLMenuElement.cpp */,
                                A8EA79E80A1916DF00A8EF5F /* HTMLMenuElement.h */,
                                A871DC1B0A15205700B12A68 /* HTMLMetaElement.cpp */,
                                A81369C0097374F500D74463 /* HTMLOptionElement.h */,
                                9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */,
                                A81369BE097374F500D74463 /* HTMLOptionsCollection.h */,
+                               A8EA7CA40A192B9C00A8EF5F /* HTMLParagraphElement.cpp */,
+                               A8EA7CA70A192B9C00A8EF5F /* HTMLParagraphElement.h */,
                                A871D44F0A127CBC00B12A68 /* HTMLParamElement.cpp */,
                                A871D44E0A127CBC00B12A68 /* HTMLParamElement.h */,
                                F523D25002DE4396018635CA /* HTMLParser.cpp */,
                                F523D25102DE4396018635CA /* HTMLParser.h */,
                                A871D44D0A127CBC00B12A68 /* HTMLPlugInElement.cpp */,
                                A871D44C0A127CBC00B12A68 /* HTMLPlugInElement.h */,
+                               A8EA7C9F0A192B9C00A8EF5F /* HTMLPreElement.cpp */,
+                               A8EA7CA20A192B9C00A8EF5F /* HTMLPreElement.h */,
                                A8CFF79B0A156978000A4234 /* HTMLQuoteElement.cpp */,
                                A8CFF7990A156978000A4234 /* HTMLQuoteElement.h */,
                                A871DC160A15205700B12A68 /* HTMLScriptElement.cpp */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               93F198E408245E59001E9ABC /* html_blockimpl.h in Headers */,
                                93F198E508245E59001E9ABC /* HTMLDocument.h in Headers */,
                                93F198E608245E59001E9ABC /* HTMLElement.h in Headers */,
                                93F198E908245E59001E9ABC /* html_imageimpl.h in Headers */,
                                A8EA7A4F0A191A5200A8EF5F /* ListMarkerBox.h in Headers */,
                                A8EA7A500A191A5200A8EF5F /* RenderListMarker.h in Headers */,
                                A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */,
+                               A8EA7CAB0A192B9C00A8EF5F /* HTMLMarqueeElement.h in Headers */,
+                               A8EA7CAF0A192B9C00A8EF5F /* HTMLHRElement.h in Headers */,
+                               A8EA7CB00A192B9C00A8EF5F /* HTMLPreElement.h in Headers */,
+                               A8EA7CB40A192B9C00A8EF5F /* HTMLBlockquoteElement.h in Headers */,
+                               A8EA7CB50A192B9C00A8EF5F /* HTMLParagraphElement.h in Headers */,
+                               A8EA7CB70A192B9C00A8EF5F /* HTMLDivElement.h in Headers */,
+                               A8EA7CB80A192B9C00A8EF5F /* HTMLHeadingElement.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */,
                                93F19A5D08245E59001E9ABC /* WebCoreImageRendererFactory.m in Sources */,
                                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */,
-                               93F19A9008245E59001E9ABC /* html_blockimpl.cpp in Sources */,
                                93F19A9108245E59001E9ABC /* HTMLDocument.cpp in Sources */,
                                93F19A9208245E59001E9ABC /* HTMLElement.cpp in Sources */,
                                93F19A9508245E59001E9ABC /* html_imageimpl.cpp in Sources */,
                                A8EA7A4E0A191A5200A8EF5F /* RenderListItem.cpp in Sources */,
                                A8EA7A510A191A5200A8EF5F /* RenderListMarker.cpp in Sources */,
                                A8EA7A530A191A5200A8EF5F /* ListMarkerBox.cpp in Sources */,
+                               A8EA7CAC0A192B9C00A8EF5F /* HTMLMarqueeElement.cpp in Sources */,
+                               A8EA7CAD0A192B9C00A8EF5F /* HTMLPreElement.cpp in Sources */,
+                               A8EA7CAE0A192B9C00A8EF5F /* HTMLHeadingElement.cpp in Sources */,
+                               A8EA7CB10A192B9C00A8EF5F /* HTMLDivElement.cpp in Sources */,
+                               A8EA7CB20A192B9C00A8EF5F /* HTMLParagraphElement.cpp in Sources */,
+                               A8EA7CB30A192B9C00A8EF5F /* HTMLHRElement.cpp in Sources */,
+                               A8EA7CB60A192B9C00A8EF5F /* HTMLBlockquoteElement.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index e8f7e257487c1841e73fc22c76feff80cf88d0b0..00526ecdf10a6e3c0421de8236873b042e9b01ab 100644 (file)
 #include "HTMLAppletElement.h"
 #include "HTMLBaseElement.h"
 #include "HTMLBaseFontElement.h"
+#include "HTMLBlockquoteElement.h"
 #include "HTMLBodyElement.h"
 #include "HTMLBRElement.h"
 #include "HTMLButtonElement.h"
-#include "HTMLDListElement.h"
 #include "HTMLDirectoryElement.h"
+#include "HTMLDivElement.h"
+#include "HTMLDListElement.h"
 #include "HTMLDocument.h"
 #include "HTMLEmbedElement.h"
 #include "HTMLFieldSetElement.h"
@@ -40,6 +42,8 @@
 #include "HTMLFormElement.h"
 #include "HTMLFrameSetElement.h"
 #include "HTMLHeadElement.h"
+#include "HTMLHeadingElement.h"
+#include "HTMLHRElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLIFrameElement.h"
 #include "HTMLIsIndexElement.h"
@@ -56,7 +60,9 @@
 #include "HTMLOptGroupElement.h"
 #include "HTMLOptionElement.h"
 #include "HTMLOptionsCollection.h"
+#include "HTMLParagraphElement.h"
 #include "HTMLParamElement.h"
+#include "HTMLPreElement.h"
 #include "HTMLScriptElement.h"
 #include "HTMLSelectElement.h"
 #include "HTMLStyleElement.h"
@@ -75,7 +81,6 @@
 #include "Text.h"
 #include "css_ruleimpl.h"
 #include "dom2_eventsimpl.h"
-#include "html_blockimpl.h"
 #include "html_imageimpl.h"
 #include "kjs_css.h"
 #include "kjs_events.h"
index f221147179ed33edc4a702711eb2b7a52d4a788a..bb457c2d5c89ca4e3106a6e3ecaf2b2cd3454bc5 100644 (file)
@@ -38,6 +38,7 @@
 #import "HTMLBRElement.h"
 #import "HTMLButtonElement.h"
 #import "HTMLDirectoryElement.h"
+#import "HTMLDivElement.h"
 #import "HTMLDListElement.h"
 #import "HTMLDocument.h"
 #import "HTMLEmbedElement.h"
@@ -47,6 +48,8 @@
 #import "HTMLFormElement.h"
 #import "HTMLFrameSetElement.h"
 #import "HTMLHeadElement.h"
+#import "HTMLHeadingElement.h"
+#import "HTMLHRElement.h"
 #import "HTMLHtmlElement.h"
 #import "HTMLIFrameElement.h"
 #import "HTMLIsIndexElement.h"
@@ -63,6 +66,8 @@
 #import "HTMLOptionElement.h"
 #import "HTMLOptionsCollection.h"
 #import "HTMLParamElement.h"
+#import "HTMLParagraphElement.h"
+#import "HTMLPreElement.h"
 #import "HTMLScriptElement.h"
 #import "HTMLSelectElement.h"
 #import "HTMLStyleElement.h"
@@ -76,7 +81,6 @@
 #import "HTMLTitleElement.h"
 #import "HTMLUListElement.h"
 #import "NameNodeList.h"
-#import "html_blockimpl.h"
 #import "html_imageimpl.h"
 #import "markup.h"
 #import "RenderTextField.h"
diff --git a/WebCore/html/HTMLBlockquoteElement.cpp b/WebCore/html/HTMLBlockquoteElement.cpp
new file mode 100644 (file)
index 0000000..38e64b8
--- /dev/null
@@ -0,0 +1,52 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLBlockquoteElement.h"
+
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLBlockquoteElement::HTMLBlockquoteElement(Document* doc)
+    : HTMLElement(blockquoteTag, doc)
+{
+}
+
+HTMLBlockquoteElement::~HTMLBlockquoteElement()
+{
+}
+
+String HTMLBlockquoteElement::cite() const
+{
+    return getAttribute(citeAttr);
+}
+
+void HTMLBlockquoteElement::setCite(const String &value)
+{
+    setAttribute(citeAttr, value);
+}
+
+}
diff --git a/WebCore/html/HTMLBlockquoteElement.h b/WebCore/html/HTMLBlockquoteElement.h
new file mode 100644 (file)
index 0000000..045bc4a
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLBlockquoteElement_H
+#define HTMLBlockquoteElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLBlockquoteElement : public HTMLElement
+{
+public:
+    HTMLBlockquoteElement(Document*);
+    ~HTMLBlockquoteElement();
+
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
+    virtual int tagPriority() const { return 5; }
+    
+    String cite() const;
+    void setCite(const String&);
+};
+
+}; //namespace
+#endif
diff --git a/WebCore/html/HTMLDivElement.cpp b/WebCore/html/HTMLDivElement.cpp
new file mode 100644 (file)
index 0000000..b04ce3a
--- /dev/null
@@ -0,0 +1,79 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLDivElement.h"
+
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLDivElement::HTMLDivElement(Document *doc)
+    : HTMLElement(divTag, doc)
+{
+}
+
+HTMLDivElement::~HTMLDivElement()
+{
+}
+
+bool HTMLDivElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
+{
+    if (attrName == alignAttr) {
+        result = eBlock;
+        return false;
+    }
+    return HTMLElement::mapToEntry(attrName, result);
+}
+
+void HTMLDivElement::parseMappedAttribute(MappedAttribute *attr)
+{
+    if (attr->name() == alignAttr) {
+        String v = attr->value();
+        if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
+           addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
+        else if (equalIgnoringCase(attr->value(), "left"))
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
+        else if (equalIgnoringCase(attr->value(), "right"))
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
+        else
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
+    } else
+        HTMLElement::parseMappedAttribute(attr);
+}
+
+String HTMLDivElement::align() const
+{
+    return getAttribute(alignAttr);
+}
+
+void HTMLDivElement::setAlign(const String &value)
+{
+    setAttribute(alignAttr, value);
+}
+
+}
diff --git a/WebCore/html/HTMLDivElement.h b/WebCore/html/HTMLDivElement.h
new file mode 100644 (file)
index 0000000..5f13673
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLDivElement_H
+#define HTMLDivElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLDivElement : public HTMLElement
+{
+public:
+    HTMLDivElement(Document*);
+    ~HTMLDivElement();
+    
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
+    virtual int tagPriority() const { return 5; }
+    
+    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    virtual void parseMappedAttribute(MappedAttribute*);
+
+    String align() const;
+    void setAlign(const String&);
+};
+
+}; //namespace
+#endif
index a8dd47116be32b00d83cad357e092389c012fd2c..6d233fe4b84f647856ab67e301083de678a1251f 100644 (file)
 #include "HTMLAppletElement.h"
 #include "HTMLBaseFontElement.h"
 #include "HTMLBaseElement.h"
+#include "HTMLBlockquoteElement.h"
 #include "HTMLBodyElement.h"
 #include "HTMLBRElement.h"
 #include "HTMLButtonElement.h"
 #include "HTMLCanvasElement.h"
+#include "HTMLDivElement.h"
 #include "HTMLDListElement.h"
 #include "HTMLDocument.h"
 #include "HTMLDirectoryElement.h"
@@ -39,6 +41,8 @@
 #include "HTMLFieldSetElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLHeadElement.h"
+#include "HTMLHeadingElement.h"
+#include "HTMLHRElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLIFrameElement.h"
 #include "HTMLIsIndexElement.h"
@@ -46,6 +50,7 @@
 #include "HTMLLegendElement.h"
 #include "HTMLLIElement.h"
 #include "HTMLLinkElement.h"
+#include "HTMLMarqueeElement.h"
 #include "HTMLMenuElement.h"
 #include "HTMLMetaElement.h"
 #include "HTMLModElement.h"
@@ -54,7 +59,9 @@
 #include "HTMLOListElement.h"
 #include "HTMLOptGroupElement.h"
 #include "HTMLOptionElement.h"
+#include "HTMLParagraphElement.h"
 #include "HTMLParamElement.h"
+#include "HTMLPreElement.h"
 #include "HTMLScriptElement.h"
 #include "HTMLSelectElement.h"
 #include "HTMLStyleElement.h"
@@ -68,7 +75,6 @@
 #include "HTMLTitleElement.h"
 #include "HTMLUListElement.h"
 #include "HTMLQuoteElement.h"
-#include "html_blockimpl.h"
 
 namespace WebCore {
 
diff --git a/WebCore/html/HTMLHRElement.cpp b/WebCore/html/HTMLHRElement.cpp
new file mode 100644 (file)
index 0000000..3571454
--- /dev/null
@@ -0,0 +1,142 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLHRElement.h"
+
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLHRElement::HTMLHRElement(Document *doc)
+    : HTMLElement(hrTag, doc)
+{
+}
+
+HTMLHRElement::~HTMLHRElement()
+{
+}
+
+bool HTMLHRElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
+{
+    if (attrName == alignAttr ||
+        attrName == widthAttr ||
+        attrName == colorAttr ||
+        attrName == sizeAttr ||
+        attrName == noshadeAttr) {
+        result = eHR;
+        return false;
+    }
+    return HTMLElement::mapToEntry(attrName, result);
+}
+
+void HTMLHRElement::parseMappedAttribute(MappedAttribute *attr)
+{
+    if (attr->name() == alignAttr) {
+        if (equalIgnoringCase(attr->value(), "left")) {
+            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, "0");
+            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
+        } else if (equalIgnoringCase(attr->value(), "right")) {
+            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, CSS_VAL_AUTO);
+            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, "0");
+        } else {
+            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, CSS_VAL_AUTO);
+            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
+        }
+    } else if (attr->name() == widthAttr) {
+        bool ok;
+        int v = attr->value().impl()->toInt(&ok);
+        if(ok && !v)
+            addCSSLength(attr, CSS_PROP_WIDTH, "1");
+        else
+            addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
+    } else if (attr->name() == colorAttr) {
+        addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
+        addCSSColor(attr, CSS_PROP_BORDER_COLOR, attr->value());
+        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
+    } else if (attr->name() == noshadeAttr) {
+        addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
+        addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
+        addCSSColor(attr, CSS_PROP_BORDER_COLOR, String("grey"));
+        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, String("grey"));
+    } else if (attr->name() == sizeAttr) {
+        StringImpl* si = attr->value().impl();
+        int size = si->toInt();
+        if (size <= 1)
+            addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_WIDTH, String("0"));
+        else
+            addCSSLength(attr, CSS_PROP_HEIGHT, String::number(size-2));
+    } else
+        HTMLElement::parseMappedAttribute(attr);
+}
+
+String HTMLHRElement::align() const
+{
+    return getAttribute(alignAttr);
+}
+
+void HTMLHRElement::setAlign(const String &value)
+{
+    setAttribute(alignAttr, value);
+}
+
+bool HTMLHRElement::noShade() const
+{
+    return !getAttribute(noshadeAttr).isNull();
+}
+
+void HTMLHRElement::setNoShade(bool noShade)
+{
+    setAttribute(noshadeAttr, noShade ? "" : 0);
+}
+
+String HTMLHRElement::size() const
+{
+    return getAttribute(sizeAttr);
+}
+
+void HTMLHRElement::setSize(const String &value)
+{
+    setAttribute(sizeAttr, value);
+}
+
+String HTMLHRElement::width() const
+{
+    return getAttribute(widthAttr);
+}
+
+void HTMLHRElement::setWidth(const String &value)
+{
+    setAttribute(widthAttr, value);
+}
+
+}
diff --git a/WebCore/html/HTMLHRElement.h b/WebCore/html/HTMLHRElement.h
new file mode 100644 (file)
index 0000000..d00d75c
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLHRElement_H
+#define HTMLHRElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLHRElement : public HTMLElement
+{
+public:
+    HTMLHRElement(Document*);
+    ~HTMLHRElement();
+    
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; }
+    virtual int tagPriority() const { return 0; }
+    
+    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    virtual void parseMappedAttribute(MappedAttribute*);
+
+    String align() const;
+    void setAlign(const String&);
+
+    bool noShade() const;
+    void setNoShade(bool);
+
+    String size() const;
+    void setSize(const String&);
+
+    String width() const;
+    void setWidth(const String&);
+};
+
+}; //namespace
+#endif
diff --git a/WebCore/html/HTMLHeadingElement.cpp b/WebCore/html/HTMLHeadingElement.cpp
new file mode 100644 (file)
index 0000000..06f0eb0
--- /dev/null
@@ -0,0 +1,58 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLHeadingElement.h"
+
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLHeadingElement::HTMLHeadingElement(const QualifiedName& tagName, Document *doc)
+    : HTMLElement(tagName, doc)
+{
+}
+
+bool HTMLHeadingElement::checkDTD(const Node* newChild)
+{
+    if (newChild->hasTagName(h1Tag) || newChild->hasTagName(h2Tag) ||
+        newChild->hasTagName(h3Tag) || newChild->hasTagName(h4Tag) ||
+        newChild->hasTagName(h5Tag) || newChild->hasTagName(h6Tag))
+        return false;
+
+    return inEitherTagList(newChild);
+}
+
+String HTMLHeadingElement::align() const
+{
+    return getAttribute(alignAttr);
+}
+
+void HTMLHeadingElement::setAlign(const String &value)
+{
+    setAttribute(alignAttr, value);
+}
+
+}
diff --git a/WebCore/html/HTMLHeadingElement.h b/WebCore/html/HTMLHeadingElement.h
new file mode 100644 (file)
index 0000000..c540762
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+// -------------------------------------------------------------------------
+#ifndef HTMLHeadingElement_H
+#define HTMLHeadingElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLHeadingElement : public HTMLElement
+{
+public:
+    HTMLHeadingElement(const QualifiedName&, Document*);
+
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
+    virtual int tagPriority() const { return 5; }
+    virtual bool checkDTD(const Node* newChild);
+
+    String align() const;
+    void setAlign(const String&);
+};
+
+}; //namespace
+#endif
diff --git a/WebCore/html/HTMLMarqueeElement.cpp b/WebCore/html/HTMLMarqueeElement.cpp
new file mode 100644 (file)
index 0000000..5970ac3
--- /dev/null
@@ -0,0 +1,109 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLMarqueeElement.h"
+
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+ // WinIE uses 60ms as the minimum delay by default.
+const int defaultMinimumDelay = 60;
+
+HTMLMarqueeElement::HTMLMarqueeElement(Document* doc)
+    : HTMLElement(marqueeTag, doc)
+    , m_minimumDelay(defaultMinimumDelay)
+{
+}
+
+bool HTMLMarqueeElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
+{
+    if (attrName == widthAttr ||
+        attrName == heightAttr ||
+        attrName == bgcolorAttr ||
+        attrName == vspaceAttr ||
+        attrName == hspaceAttr ||
+        attrName == scrollamountAttr ||
+        attrName == scrolldelayAttr ||
+        attrName == loopAttr ||
+        attrName == behaviorAttr ||
+        attrName == directionAttr) {
+        result = eUniversal;
+        return false;
+    }
+
+    return HTMLElement::mapToEntry(attrName, result);
+}
+
+void HTMLMarqueeElement::parseMappedAttribute(MappedAttribute *attr)
+{
+    if (attr->name() == widthAttr) {
+        if (!attr->value().isEmpty())
+            addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
+    } else if (attr->name() == heightAttr) {
+        if (!attr->value().isEmpty())
+            addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
+    } else if (attr->name() == bgcolorAttr) {
+        if (!attr->value().isEmpty())
+            addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
+    } else if (attr->name() == vspaceAttr) {
+        if (!attr->value().isEmpty()) {
+            addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
+            addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
+        }
+    } else if (attr->name() == hspaceAttr) {
+        if (!attr->value().isEmpty()) {
+            addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
+            addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
+        }
+    } else if (attr->name() == scrollamountAttr) {
+        if (!attr->value().isEmpty())
+            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_INCREMENT, attr->value());
+    } else if (attr->name() == scrolldelayAttr) {
+        if (!attr->value().isEmpty())
+            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_SPEED, attr->value());
+    } else if (attr->name() == loopAttr) {
+        if (!attr->value().isEmpty()) {
+            if (attr->value() == "-1" || equalIgnoringCase(attr->value(), "infinite"))
+                addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, CSS_VAL_INFINITE);
+            else
+                addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, attr->value());
+        }
+    } else if (attr->name() == behaviorAttr) {
+        if (!attr->value().isEmpty())
+            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_STYLE, attr->value());
+    } else if (attr->name() == directionAttr) {
+        if (!attr->value().isEmpty())
+            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_DIRECTION, attr->value());
+    } else if (attr->name() == truespeedAttr)
+        m_minimumDelay = !attr->isNull() ? 0 : defaultMinimumDelay;
+    else
+        HTMLElement::parseMappedAttribute(attr);
+}
+
+}
diff --git a/WebCore/html/HTMLMarqueeElement.h b/WebCore/html/HTMLMarqueeElement.h
new file mode 100644 (file)
index 0000000..ac7cad3
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLMarqueeElement_H
+#define HTMLMarqueeElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLMarqueeElement : public HTMLElement
+{
+public:
+    HTMLMarqueeElement(Document*);
+    
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
+    virtual int tagPriority() const { return 3; }
+
+    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    virtual void parseMappedAttribute(MappedAttribute*);
+
+    int minimumDelay() const { return m_minimumDelay; }
+    
+private:
+    int m_minimumDelay;
+};
+
+}; //namespace
+#endif
diff --git a/WebCore/html/HTMLParagraphElement.cpp b/WebCore/html/HTMLParagraphElement.cpp
new file mode 100644 (file)
index 0000000..66093a1
--- /dev/null
@@ -0,0 +1,81 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLParagraphElement.h"
+
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include "Document.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLParagraphElement::HTMLParagraphElement(Document *doc)
+    : HTMLElement(pTag, doc)
+{
+}
+
+bool HTMLParagraphElement::checkDTD(const Node* newChild)
+{
+    return inInlineTagList(newChild) || (document()->inCompatMode() && newChild->hasTagName(tableTag));
+}
+
+bool HTMLParagraphElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
+{
+    if (attrName == alignAttr) {
+        result = eBlock; // We can share with DIV here.
+        return false;
+    }
+    return HTMLElement::mapToEntry(attrName, result);
+}
+
+void HTMLParagraphElement::parseMappedAttribute(MappedAttribute *attr)
+{
+    if (attr->name() == alignAttr) {
+        String v = attr->value();
+        if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
+        else if (equalIgnoringCase(attr->value(), "left"))
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
+        else if (equalIgnoringCase(attr->value(), "right"))
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
+        else
+            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
+    } else
+        HTMLElement::parseMappedAttribute(attr);
+}
+
+String HTMLParagraphElement::align() const
+{
+    return getAttribute(alignAttr);
+}
+
+void HTMLParagraphElement::setAlign(const String &value)
+{
+    setAttribute(alignAttr, value);
+}
+
+}
diff --git a/WebCore/html/HTMLParagraphElement.h b/WebCore/html/HTMLParagraphElement.h
new file mode 100644 (file)
index 0000000..c1455b5
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLParagraphElement_H
+#define HTMLParagraphElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLParagraphElement : public HTMLElement
+{
+public:
+    HTMLParagraphElement(Document*);
+
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusOptional; }
+    virtual int tagPriority() const { return 3; }
+    virtual bool checkDTD(const Node* newChild);
+
+    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    virtual void parseMappedAttribute(MappedAttribute*);
+
+    String align() const;
+    void setAlign(const String&);
+};
+
+}; //namespace
+#endif
index a88ce066bca4c9cb8f0f3cdb75d752d563f09579..fe9d04def00313b6ae1ceb31cf53e5bab9c1222e 100644 (file)
 #include "Frame.h"
 #include "HTMLBodyElement.h"
 #include "HTMLCanvasElement.h"
+#include "HTMLDivElement.h"
 #include "HTMLDListElement.h"
 #include "HTMLElementFactory.h"
 #include "HTMLFormElement.h"
 #include "HTMLHeadElement.h"
+#include "HTMLHRElement.h"
 #include "HTMLHtmlElement.h"
 #include "HTMLIsIndexElement.h"
 #include "HTMLNames.h"
@@ -46,7 +48,6 @@
 #include "HTMLTokenizer.h"
 #include "LocalizedStrings.h"
 #include "Text.h"
-#include "html_blockimpl.h"
 
 namespace WebCore {
 
diff --git a/WebCore/html/HTMLPreElement.cpp b/WebCore/html/HTMLPreElement.cpp
new file mode 100644 (file)
index 0000000..f19235b
--- /dev/null
@@ -0,0 +1,83 @@
+/**
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ * Copyright (C) 2003 Apple Computer, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+#include "config.h"
+#include "HTMLPreElement.h"
+
+#include "CSSPropertyNames.h"
+#include "CSSValueKeywords.h"
+#include "HTMLNames.h"
+
+namespace WebCore {
+
+using namespace HTMLNames;
+
+HTMLPreElement::HTMLPreElement(const QualifiedName& tagName, Document* doc)
+    : HTMLElement(tagName, doc)
+{
+}
+
+bool HTMLPreElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
+{
+    if (attrName == widthAttr || attrName == wrapAttr) {
+        result = ePre;
+        return false;
+    }
+    return HTMLElement::mapToEntry(attrName, result);
+}
+
+void HTMLPreElement::parseMappedAttribute(MappedAttribute *attr)
+{
+    if (attr->name() == widthAttr) {
+        // FIXME: Implement this some day.  Width on a <pre> is the # of characters that
+        // we should size the pre to.  We basically need to take the width of a space,
+        // multiply by the value of the attribute and then set that as the width CSS
+        // property.
+    } else if (attr->name() == wrapAttr) {
+        if (!attr->value().isNull())
+            addCSSProperty(attr, CSS_PROP_WHITE_SPACE, CSS_VAL_PRE_WRAP);
+    } else
+        return HTMLElement::parseMappedAttribute(attr);
+}
+
+int HTMLPreElement::width() const
+{
+    return getAttribute(widthAttr).toInt();
+}
+
+void HTMLPreElement::setWidth(int width)
+{
+    setAttribute(widthAttr, String::number(width));
+}
+
+bool HTMLPreElement::wrap() const
+{
+    return !getAttribute(wrapAttr).isNull();
+}
+
+void HTMLPreElement::setWrap(bool wrap)
+{
+    setAttribute(wrapAttr, wrap ? "" : 0);
+}
+
+}
diff --git a/WebCore/html/HTMLPreElement.h b/WebCore/html/HTMLPreElement.h
new file mode 100644 (file)
index 0000000..e275f41
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the DOM implementation for KDE.
+ *
+ * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
+ *           (C) 1999 Antti Koivisto (koivisto@kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef HTMLPreElement_H
+#define HTMLPreElement_H
+
+#include "HTMLElement.h"
+
+namespace WebCore {
+
+class HTMLPreElement : public HTMLElement
+{
+public:
+    HTMLPreElement(const QualifiedName&, Document*);
+
+    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
+    virtual int tagPriority() const { return 5; }
+
+    bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
+    void parseMappedAttribute(MappedAttribute*);
+
+    int width() const;
+    void setWidth(int w);
+    
+    bool wrap() const;
+    void setWrap(bool b);
+};
+
+}; //namespace
+#endif
index fafffa6229362a0eed8df3b025668a0abdc28a1f..322fc0a3cca1b19bfc7bf05e3ae35d574403141d 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
  
-#ifndef HTML_TEXTFIELDINNERELEMENTIMPL_H
-#define HTML_TEXTFIELDINNERELEMENTIMPL_H
+#ifndef HTMLTextFieldInnerElement_H
+#define HTMLTextFieldInnerElement_H
 
-#include "html_blockimpl.h"
+#include "HTMLDivElement.h"
 
 namespace WebCore {
 
diff --git a/WebCore/html/html_blockimpl.cpp b/WebCore/html/html_blockimpl.cpp
deleted file mode 100644 (file)
index 85d7177..0000000
+++ /dev/null
@@ -1,412 +0,0 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-#include "html_blockimpl.h"
-#include "HTMLDocument.h"
-#include "css/cssstyleselector.h"
-
-#include "CSSPropertyNames.h"
-#include "CSSValueKeywords.h"
-#include "HTMLNames.h"
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-HTMLBlockquoteElement::HTMLBlockquoteElement(Document *doc)
-    : HTMLElement(blockquoteTag, doc)
-{
-}
-
-HTMLBlockquoteElement::~HTMLBlockquoteElement()
-{
-}
-
-String HTMLBlockquoteElement::cite() const
-{
-    return getAttribute(citeAttr);
-}
-
-void HTMLBlockquoteElement::setCite(const String &value)
-{
-    setAttribute(citeAttr, value);
-}
-
-// -------------------------------------------------------------------------
-
-HTMLDivElement::HTMLDivElement(Document *doc)
-    : HTMLElement(divTag, doc)
-{
-}
-
-HTMLDivElement::~HTMLDivElement()
-{
-}
-
-bool HTMLDivElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == alignAttr) {
-        result = eBlock;
-        return false;
-    }
-    return HTMLElement::mapToEntry(attrName, result);
-}
-        
-void HTMLDivElement::parseMappedAttribute(MappedAttribute *attr)
-{
-    if (attr->name() == alignAttr) {
-        String v = attr->value();
-        if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
-           addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
-        else if (equalIgnoringCase(attr->value(), "left"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
-        else if (equalIgnoringCase(attr->value(), "right"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
-        else
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
-    } else
-        HTMLElement::parseMappedAttribute(attr);
-}
-
-String HTMLDivElement::align() const
-{
-    return getAttribute(alignAttr);
-}
-
-void HTMLDivElement::setAlign(const String &value)
-{
-    setAttribute(alignAttr, value);
-}
-
-// -------------------------------------------------------------------------
-
-HTMLHRElement::HTMLHRElement(Document *doc)
-    : HTMLElement(hrTag, doc)
-{
-}
-
-HTMLHRElement::~HTMLHRElement()
-{
-}
-
-bool HTMLHRElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == alignAttr ||
-        attrName == widthAttr ||
-        attrName == colorAttr ||
-        attrName == sizeAttr ||
-        attrName == noshadeAttr) {
-        result = eHR;
-        return false;
-    }
-    return HTMLElement::mapToEntry(attrName, result);
-}
-
-void HTMLHRElement::parseMappedAttribute(MappedAttribute *attr)
-{
-    if (attr->name() == alignAttr) {
-        if (equalIgnoringCase(attr->value(), "left")) {
-            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, "0");
-            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
-        } else if (equalIgnoringCase(attr->value(), "right")) {
-            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, CSS_VAL_AUTO);
-            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, "0");
-        } else {
-            addCSSProperty(attr, CSS_PROP_MARGIN_LEFT, CSS_VAL_AUTO);
-            addCSSProperty(attr, CSS_PROP_MARGIN_RIGHT, CSS_VAL_AUTO);
-        }
-    } else if (attr->name() == widthAttr) {
-        bool ok;
-        int v = attr->value().impl()->toInt(&ok);
-        if(ok && !v)
-            addCSSLength(attr, CSS_PROP_WIDTH, "1");
-        else
-            addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
-    } else if (attr->name() == colorAttr) {
-        addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
-        addCSSColor(attr, CSS_PROP_BORDER_COLOR, attr->value());
-        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
-    } else if (attr->name() == noshadeAttr) {
-        addCSSProperty(attr, CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_RIGHT_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID);
-        addCSSProperty(attr, CSS_PROP_BORDER_LEFT_STYLE, CSS_VAL_SOLID);
-        addCSSColor(attr, CSS_PROP_BORDER_COLOR, String("grey"));
-        addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, String("grey"));
-    } else if (attr->name() == sizeAttr) {
-        StringImpl* si = attr->value().impl();
-        int size = si->toInt();
-        if (size <= 1)
-            addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_WIDTH, String("0"));
-        else
-            addCSSLength(attr, CSS_PROP_HEIGHT, String::number(size-2));
-    } else
-        HTMLElement::parseMappedAttribute(attr);
-}
-
-String HTMLHRElement::align() const
-{
-    return getAttribute(alignAttr);
-}
-
-void HTMLHRElement::setAlign(const String &value)
-{
-    setAttribute(alignAttr, value);
-}
-
-bool HTMLHRElement::noShade() const
-{
-    return !getAttribute(noshadeAttr).isNull();
-}
-
-void HTMLHRElement::setNoShade(bool noShade)
-{
-    setAttribute(noshadeAttr, noShade ? "" : 0);
-}
-
-String HTMLHRElement::size() const
-{
-    return getAttribute(sizeAttr);
-}
-
-void HTMLHRElement::setSize(const String &value)
-{
-    setAttribute(sizeAttr, value);
-}
-
-String HTMLHRElement::width() const
-{
-    return getAttribute(widthAttr);
-}
-
-void HTMLHRElement::setWidth(const String &value)
-{
-    setAttribute(widthAttr, value);
-}
-
-// -------------------------------------------------------------------------
-
-HTMLHeadingElement::HTMLHeadingElement(const QualifiedName& tagName, Document *doc)
-    : HTMLElement(tagName, doc)
-{
-}
-
-bool HTMLHeadingElement::checkDTD(const Node* newChild)
-{
-    if (newChild->hasTagName(h1Tag) || newChild->hasTagName(h2Tag) ||
-        newChild->hasTagName(h3Tag) || newChild->hasTagName(h4Tag) ||
-        newChild->hasTagName(h5Tag) || newChild->hasTagName(h6Tag))
-        return false;
-
-    return inEitherTagList(newChild);
-}
-
-String HTMLHeadingElement::align() const
-{
-    return getAttribute(alignAttr);
-}
-
-void HTMLHeadingElement::setAlign(const String &value)
-{
-    setAttribute(alignAttr, value);
-}
-
-// -------------------------------------------------------------------------
-
-HTMLParagraphElement::HTMLParagraphElement(Document *doc)
-    : HTMLElement(pTag, doc)
-{
-}
-
-bool HTMLParagraphElement::checkDTD(const Node* newChild)
-{
-    return inInlineTagList(newChild) || (document()->inCompatMode() && newChild->hasTagName(tableTag));
-}
-
-bool HTMLParagraphElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == alignAttr) {
-        result = eBlock; // We can share with DIV here.
-        return false;
-    }
-    return HTMLElement::mapToEntry(attrName, result);
-}
-
-void HTMLParagraphElement::parseMappedAttribute(MappedAttribute *attr)
-{
-    if (attr->name() == alignAttr) {
-        String v = attr->value();
-        if (equalIgnoringCase(attr->value(), "middle") || equalIgnoringCase(attr->value(), "center"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_CENTER);
-        else if (equalIgnoringCase(attr->value(), "left"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_LEFT);
-        else if (equalIgnoringCase(attr->value(), "right"))
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, CSS_VAL__WEBKIT_RIGHT);
-        else
-            addCSSProperty(attr, CSS_PROP_TEXT_ALIGN, v);
-    } else
-        HTMLElement::parseMappedAttribute(attr);
-}
-
-String HTMLParagraphElement::align() const
-{
-    return getAttribute(alignAttr);
-}
-
-void HTMLParagraphElement::setAlign(const String &value)
-{
-    setAttribute(alignAttr, value);
-}
-
-// -------------------------------------------------------------------------
-
-HTMLPreElement::HTMLPreElement(const QualifiedName& tagName, Document *doc)
-    : HTMLElement(tagName, doc)
-{
-}
-
-bool HTMLPreElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == widthAttr || attrName == wrapAttr) {
-        result = ePre;
-        return false;
-    }
-    return HTMLElement::mapToEntry(attrName, result);
-}
-
-void HTMLPreElement::parseMappedAttribute(MappedAttribute *attr)
-{
-    if (attr->name() == widthAttr) {
-        // FIXME: Implement this some day.  Width on a <pre> is the # of characters that
-        // we should size the pre to.  We basically need to take the width of a space,
-        // multiply by the value of the attribute and then set that as the width CSS
-        // property.
-    } else if (attr->name() == wrapAttr) {
-        if (!attr->value().isNull())
-            addCSSProperty(attr, CSS_PROP_WHITE_SPACE, CSS_VAL_PRE_WRAP);
-    } else
-        return HTMLElement::parseMappedAttribute(attr);
-}
-
-int HTMLPreElement::width() const
-{
-    return getAttribute(widthAttr).toInt();
-}
-
-void HTMLPreElement::setWidth(int width)
-{
-    setAttribute(widthAttr, String::number(width));
-}
-
-bool HTMLPreElement::wrap() const
-{
-    return !getAttribute(wrapAttr).isNull();
-}
-
-void HTMLPreElement::setWrap(bool wrap)
-{
-    setAttribute(wrapAttr, wrap ? "" : 0);
-}
-    
-// -------------------------------------------------------------------------
-
- // WinIE uses 60ms as the minimum delay by default.
-const int defaultMinimumDelay = 60;
-
-HTMLMarqueeElement::HTMLMarqueeElement(Document *doc)
-: HTMLElement(marqueeTag, doc),
-  m_minimumDelay(defaultMinimumDelay)
-{
-}
-
-bool HTMLMarqueeElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
-{
-    if (attrName == widthAttr ||
-        attrName == heightAttr ||
-        attrName == bgcolorAttr ||
-        attrName == vspaceAttr ||
-        attrName == hspaceAttr ||
-        attrName == scrollamountAttr ||
-        attrName == scrolldelayAttr ||
-        attrName == loopAttr ||
-        attrName == behaviorAttr ||
-        attrName == directionAttr) {
-        result = eUniversal;
-        return false;
-    }
-
-    return HTMLElement::mapToEntry(attrName, result);
-}
-
-void HTMLMarqueeElement::parseMappedAttribute(MappedAttribute *attr)
-{
-    if (attr->name() == widthAttr) {
-        if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP_WIDTH, attr->value());
-    } else if (attr->name() == heightAttr) {
-        if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP_HEIGHT, attr->value());
-    } else if (attr->name() == bgcolorAttr) {
-        if (!attr->value().isEmpty())
-            addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
-    } else if (attr->name() == vspaceAttr) {
-        if (!attr->value().isEmpty()) {
-            addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
-            addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
-        }
-    } else if (attr->name() == hspaceAttr) {
-        if (!attr->value().isEmpty()) {
-            addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
-            addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
-        }
-    } else if (attr->name() == scrollamountAttr) {
-        if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_INCREMENT, attr->value());
-    } else if (attr->name() == scrolldelayAttr) {
-        if (!attr->value().isEmpty())
-            addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_SPEED, attr->value());
-    } else if (attr->name() == loopAttr) {
-        if (!attr->value().isEmpty()) {
-            if (attr->value() == "-1" || equalIgnoringCase(attr->value(), "infinite"))
-                addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, CSS_VAL_INFINITE);
-            else
-                addCSSLength(attr, CSS_PROP__WEBKIT_MARQUEE_REPETITION, attr->value());
-        }
-    } else if (attr->name() == behaviorAttr) {
-        if (!attr->value().isEmpty())
-            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_STYLE, attr->value());
-    } else if (attr->name() == directionAttr) {
-        if (!attr->value().isEmpty())
-            addCSSProperty(attr, CSS_PROP__WEBKIT_MARQUEE_DIRECTION, attr->value());
-    } else if (attr->name() == truespeedAttr) {
-        m_minimumDelay = !attr->isNull() ? 0 : defaultMinimumDelay;
-    } else
-        HTMLElement::parseMappedAttribute(attr);
-}
-
-}
diff --git a/WebCore/html/html_blockimpl.h b/WebCore/html/html_blockimpl.h
deleted file mode 100644 (file)
index 967e15b..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * This file is part of the DOM implementation for KDE.
- *
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-// -------------------------------------------------------------------------
-#ifndef HTML_BLOCKIMPL_H
-#define HTML_BLOCKIMPL_H
-
-#include "HTMLElement.h"
-
-namespace WebCore {
-
-class String;
-
-// -------------------------------------------------------------------------
-
-class HTMLBlockquoteElement : public HTMLElement
-{
-public:
-    HTMLBlockquoteElement(Document*);
-    ~HTMLBlockquoteElement();
-
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
-    virtual int tagPriority() const { return 5; }
-    
-    String cite() const;
-    void setCite(const String&);
-};
-
-// -------------------------------------------------------------------------
-
-class String;
-
-class HTMLDivElement : public HTMLElement
-{
-public:
-    HTMLDivElement(Document*);
-    ~HTMLDivElement();
-    
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
-    virtual int tagPriority() const { return 5; }
-    
-    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
-
-    String align() const;
-    void setAlign(const String&);
-};
-
-// -------------------------------------------------------------------------
-
-class HTMLHRElement : public HTMLElement
-{
-public:
-    HTMLHRElement(Document*);
-    ~HTMLHRElement();
-    
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusForbidden; }
-    virtual int tagPriority() const { return 0; }
-    
-    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
-
-    String align() const;
-    void setAlign(const String&);
-
-    bool noShade() const;
-    void setNoShade(bool);
-
-    String size() const;
-    void setSize(const String&);
-
-    String width() const;
-    void setWidth(const String&);
-};
-
-// -------------------------------------------------------------------------
-
-class HTMLHeadingElement : public HTMLElement
-{
-public:
-    HTMLHeadingElement(const QualifiedName&, Document*);
-
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
-    virtual int tagPriority() const { return 5; }
-    virtual bool checkDTD(const Node* newChild);
-
-    String align() const;
-    void setAlign(const String&);
-};
-
-// -------------------------------------------------------------------------
-
-class HTMLParagraphElement : public HTMLElement
-{
-public:
-    HTMLParagraphElement(Document*);
-
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusOptional; }
-    virtual int tagPriority() const { return 3; }
-    virtual bool checkDTD(const Node* newChild);
-
-    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
-
-    String align() const;
-    void setAlign(const String&);
-};
-
-// -------------------------------------------------------------------------
-
-class HTMLPreElement : public HTMLElement
-{
-public:
-    HTMLPreElement(const QualifiedName&, Document*);
-
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
-    virtual int tagPriority() const { return 5; }
-
-    bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    void parseMappedAttribute(MappedAttribute*);
-
-    int width() const;
-    void setWidth(int w);
-    
-    bool wrap() const;
-    void setWrap(bool b);
-};
-
-// -------------------------------------------------------------------------
-
-class HTMLMarqueeElement : public HTMLElement
-{
-public:
-    HTMLMarqueeElement(Document*);
-    
-    virtual HTMLTagStatus endTagRequirement() const { return TagStatusRequired; }
-    virtual int tagPriority() const { return 3; }
-
-    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
-    virtual void parseMappedAttribute(MappedAttribute*);
-
-    int minimumDelay() const { return m_minimumDelay; }
-    
-private:
-    int m_minimumDelay;
-};
-
-}; //namespace
-#endif
index 8871113aeec392a1e70e55bb664a6c3c2a1e7f4b..7576c4595f54ba310d53f8e796a20a749c6f184f 100644 (file)
@@ -51,7 +51,7 @@
 #include "FrameTree.h"
 #include "GraphicsContext.h"
 #include "dom2_eventsimpl.h"
-#include "html_blockimpl.h"
+#include "HTMLMarqueeElement.h"
 #include "HTMLNames.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"