Rubber stamped by Eric.

        - moved khtml/html files all into html directory

        * WebCore.vcproj/WebCore/WebCore.vcproj: Updated for new paths.
        * WebCore.vcproj/WebCore/build-generated-files.sh: Ditto.
        * WebCore.xcodeproj/project.pbxproj: Ditto.

        * khtml/html: Removed.

        * html/DocTypeStrings.gperf: Moved.
        * html/FormDataList.cpp: Ditto.
        * html/FormDataList.h: Ditto.
        * html/HTMLBaseFontElement.cpp: Ditto.
        * html/HTMLBaseFontElement.h: Ditto.
        * html/HTMLButtonElement.cpp: Ditto.
        * html/HTMLButtonElement.h: Ditto.
        * html/HTMLCanvasElement.cpp: Ditto.
        * html/HTMLCanvasElement.h: Ditto.
        * html/HTMLCollection.cpp: Ditto.
        * html/HTMLCollection.h: Ditto.
        * html/HTMLDocument.cpp: Ditto.
        * html/HTMLDocument.h: Ditto.
        * html/HTMLElement.cpp: Ditto.
        * html/HTMLElement.h: Ditto.
        * html/HTMLElementFactory.cpp: Ditto.
        * html/HTMLElementFactory.h: Ditto.
        * html/HTMLEntityNames.gperf: Ditto.
        * html/HTMLFieldSetElement.cpp: Ditto.
        * html/HTMLFieldSetElement.h: Ditto.
        * html/HTMLFormCollection.cpp: Ditto.
        * html/HTMLFormCollection.h: Ditto.
        * html/HTMLFormElement.cpp: Ditto.
        * html/HTMLFormElement.h: Ditto.
        * html/HTMLGenericFormElement.cpp: Ditto.
        * html/HTMLGenericFormElement.h: Ditto.
        * html/HTMLInputElement.cpp: Ditto.
        * html/HTMLInputElement.h: Ditto.
        * html/HTMLIsIndexElement.cpp: Ditto.
        * html/HTMLIsIndexElement.h: Ditto.
        * html/HTMLKeygenElement.cpp: Ditto.
        * html/HTMLKeygenElement.h: Ditto.
        * html/HTMLLabelElement.cpp: Ditto.
        * html/HTMLLabelElement.h: Ditto.
        * html/HTMLLegendElement.cpp: Ditto.
        * html/HTMLLegendElement.h: Ditto.
        * html/HTMLNameCollection.cpp: Ditto.
        * html/HTMLNameCollection.h: Ditto.
        * html/HTMLNames.cpp: Ditto.
        * html/HTMLNames.h: Ditto.
        * html/HTMLOptGroupElement.cpp: Ditto.
        * html/HTMLOptGroupElement.h: Ditto.
        * html/HTMLOptionElement.cpp: Ditto.
        * html/HTMLOptionElement.h: Ditto.
        * html/HTMLOptionsCollection.cpp: Ditto.
        * html/HTMLOptionsCollection.h: Ditto.
        * html/HTMLParser.cpp: Ditto.
        * html/HTMLParser.h: Ditto.
        * html/HTMLSelectElement.cpp: Ditto.
        * html/HTMLSelectElement.h: Ditto.
        * html/HTMLTextAreaElement.cpp: Ditto.
        * html/HTMLTextAreaElement.h: Ditto.
        * html/HTMLTextFieldInnerElement.cpp: Ditto.
        * html/HTMLTextFieldInnerElement.h: Ditto.
        * html/HTMLTokenizer.cpp: Ditto.
        * html/HTMLTokenizer.h: Ditto.
        * html/html_baseimpl.cpp: Ditto.
        * html/html_baseimpl.h: Ditto.
        * html/html_blockimpl.cpp: Ditto.
        * html/html_blockimpl.h: Ditto.
        * html/html_headimpl.cpp: Ditto.
        * html/html_headimpl.h: Ditto.
        * html/html_imageimpl.cpp: Ditto.
        * html/html_imageimpl.h: Ditto.
        * html/html_inlineimpl.cpp: Ditto.
        * html/html_inlineimpl.h: Ditto.
        * html/html_listimpl.cpp: Ditto.
        * html/html_listimpl.h: Ditto.
        * html/html_objectimpl.cpp: Ditto.
        * html/html_objectimpl.h: Ditto.
        * html/html_tableimpl.cpp: Ditto.
        * html/html_tableimpl.h: Ditto.

        * bindings/objc/DOM.mm:
        * bridge/mac/WebCoreEncodings.mm:
        * bridge/mac/WebCoreFrameBridge.mm:
        * css/CSSGrammar.y:
        * css/cssstyleselector.cpp:
        * dom/Document.cpp:
        * dom/EventTargetNode.cpp:
        * dom/NameNodeList.cpp:
        * dom/Node.cpp:
        * dom/Position.cpp:
        * dom/dom_elementimpl.cpp:
        * dom/xml_tokenizer.cpp:
        * editing/ApplyStyleCommand.cpp:
        * editing/BreakBlockquoteCommand.cpp:
        * editing/CompositeEditCommand.cpp:
        * editing/DeleteSelectionCommand.cpp:
        * editing/InsertLineBreakCommand.cpp:
        * editing/InsertParagraphSeparatorCommand.cpp:
        * editing/JSEditor.cpp:
        * editing/ReplaceSelectionCommand.cpp:
        * editing/TextIterator.cpp:
        * editing/VisiblePosition.cpp:
        * editing/htmlediting.cpp:
        * editing/markup.cpp:
        * editing/visible_units.cpp:
        * html/CanvasRenderingContext2D.cpp:
        * kcanvas/KCanvasTreeDebug.cpp:
        * khtml/ecma/JSDOMParser.cpp:
        * khtml/ecma/kjs_css.cpp:
        * khtml/ecma/kjs_dom.cpp:
        * khtml/ecma/kjs_events.cpp:
        * khtml/misc/decoder.cpp:
        * khtml/xsl/XSLStyleSheet.cpp:
        * khtml/xsl/XSLTProcessor.cpp:
        * ksvg2/misc/SVGImageLoader.h:
        * ksvg2/svg/SVGElement.cpp:
        * ksvg2/svg/SVGSVGElement.cpp:
        * kwq/WebCoreAXObject.mm:
        * page/Frame.cpp:
        * page/FrameView.cpp:
        * rendering/RenderBlock.cpp:
        * rendering/RenderBox.cpp:
        * rendering/RenderFlow.cpp:
        * rendering/RenderHTMLCanvas.cpp:
        * rendering/RenderImage.cpp:
        * rendering/RenderLayer.cpp:
        * rendering/RenderObject.cpp:
        * rendering/RenderTable.cpp:
        * rendering/RenderTableCell.cpp:
        * rendering/RenderTableCol.cpp:
        * rendering/RenderTableRow.cpp:
        * rendering/RenderTableSection.cpp:
        * rendering/RenderTextField.cpp:
        * rendering/RenderTheme.cpp:
        * rendering/render_applet.cpp:
        * rendering/render_button.cpp:
        * rendering/render_frames.cpp:
        * rendering/render_list.cpp:
        Updated includes.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7097f0393cb1af24928fb8d1655e698a38b92e25..e5848815ca30dcea015f60d8baa99feba877d572 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,148 @@
+2006-03-19  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Eric.
+
+        - moved khtml/html files all into html directory
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj: Updated for new paths.
+        * WebCore.vcproj/WebCore/build-generated-files.sh: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+        * khtml/html: Removed.
+
+        * html/DocTypeStrings.gperf: Moved.
+        * html/FormDataList.cpp: Ditto.
+        * html/FormDataList.h: Ditto.
+        * html/HTMLBaseFontElement.cpp: Ditto.
+        * html/HTMLBaseFontElement.h: Ditto.
+        * html/HTMLButtonElement.cpp: Ditto.
+        * html/HTMLButtonElement.h: Ditto.
+        * html/HTMLCanvasElement.cpp: Ditto.
+        * html/HTMLCanvasElement.h: Ditto.
+        * html/HTMLCollection.cpp: Ditto.
+        * html/HTMLCollection.h: Ditto.
+        * html/HTMLDocument.cpp: Ditto.
+        * html/HTMLDocument.h: Ditto.
+        * html/HTMLElement.cpp: Ditto.
+        * html/HTMLElement.h: Ditto.
+        * html/HTMLElementFactory.cpp: Ditto.
+        * html/HTMLElementFactory.h: Ditto.
+        * html/HTMLEntityNames.gperf: Ditto.
+        * html/HTMLFieldSetElement.cpp: Ditto.
+        * html/HTMLFieldSetElement.h: Ditto.
+        * html/HTMLFormCollection.cpp: Ditto.
+        * html/HTMLFormCollection.h: Ditto.
+        * html/HTMLFormElement.cpp: Ditto.
+        * html/HTMLFormElement.h: Ditto.
+        * html/HTMLGenericFormElement.cpp: Ditto.
+        * html/HTMLGenericFormElement.h: Ditto.
+        * html/HTMLInputElement.cpp: Ditto.
+        * html/HTMLInputElement.h: Ditto.
+        * html/HTMLIsIndexElement.cpp: Ditto.
+        * html/HTMLIsIndexElement.h: Ditto.
+        * html/HTMLKeygenElement.cpp: Ditto.
+        * html/HTMLKeygenElement.h: Ditto.
+        * html/HTMLLabelElement.cpp: Ditto.
+        * html/HTMLLabelElement.h: Ditto.
+        * html/HTMLLegendElement.cpp: Ditto.
+        * html/HTMLLegendElement.h: Ditto.
+        * html/HTMLNameCollection.cpp: Ditto.
+        * html/HTMLNameCollection.h: Ditto.
+        * html/HTMLNames.cpp: Ditto.
+        * html/HTMLNames.h: Ditto.
+        * html/HTMLOptGroupElement.cpp: Ditto.
+        * html/HTMLOptGroupElement.h: Ditto.
+        * html/HTMLOptionElement.cpp: Ditto.
+        * html/HTMLOptionElement.h: Ditto.
+        * html/HTMLOptionsCollection.cpp: Ditto.
+        * html/HTMLOptionsCollection.h: Ditto.
+        * html/HTMLParser.cpp: Ditto.
+        * html/HTMLParser.h: Ditto.
+        * html/HTMLSelectElement.cpp: Ditto.
+        * html/HTMLSelectElement.h: Ditto.
+        * html/HTMLTextAreaElement.cpp: Ditto.
+        * html/HTMLTextAreaElement.h: Ditto.
+        * html/HTMLTextFieldInnerElement.cpp: Ditto.
+        * html/HTMLTextFieldInnerElement.h: Ditto.
+        * html/HTMLTokenizer.cpp: Ditto.
+        * html/HTMLTokenizer.h: Ditto.
+        * html/html_baseimpl.cpp: Ditto.
+        * html/html_baseimpl.h: Ditto.
+        * html/html_blockimpl.cpp: Ditto.
+        * html/html_blockimpl.h: Ditto.
+        * html/html_headimpl.cpp: Ditto.
+        * html/html_headimpl.h: Ditto.
+        * html/html_imageimpl.cpp: Ditto.
+        * html/html_imageimpl.h: Ditto.
+        * html/html_inlineimpl.cpp: Ditto.
+        * html/html_inlineimpl.h: Ditto.
+        * html/html_listimpl.cpp: Ditto.
+        * html/html_listimpl.h: Ditto.
+        * html/html_objectimpl.cpp: Ditto.
+        * html/html_objectimpl.h: Ditto.
+        * html/html_tableimpl.cpp: Ditto.
+        * html/html_tableimpl.h: Ditto.
+
+        * bindings/objc/DOM.mm:
+        * bridge/mac/WebCoreEncodings.mm:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        * css/CSSGrammar.y:
+        * css/cssstyleselector.cpp:
+        * dom/Document.cpp:
+        * dom/EventTargetNode.cpp:
+        * dom/NameNodeList.cpp:
+        * dom/Node.cpp:
+        * dom/Position.cpp:
+        * dom/dom_elementimpl.cpp:
+        * dom/xml_tokenizer.cpp:
+        * editing/ApplyStyleCommand.cpp:
+        * editing/BreakBlockquoteCommand.cpp:
+        * editing/CompositeEditCommand.cpp:
+        * editing/DeleteSelectionCommand.cpp:
+        * editing/InsertLineBreakCommand.cpp:
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        * editing/JSEditor.cpp:
+        * editing/ReplaceSelectionCommand.cpp:
+        * editing/TextIterator.cpp:
+        * editing/VisiblePosition.cpp:
+        * editing/htmlediting.cpp:
+        * editing/markup.cpp:
+        * editing/visible_units.cpp:
+        * html/CanvasRenderingContext2D.cpp:
+        * kcanvas/KCanvasTreeDebug.cpp:
+        * khtml/ecma/JSDOMParser.cpp:
+        * khtml/ecma/kjs_css.cpp:
+        * khtml/ecma/kjs_dom.cpp:
+        * khtml/ecma/kjs_events.cpp:
+        * khtml/misc/decoder.cpp:
+        * khtml/xsl/XSLStyleSheet.cpp:
+        * khtml/xsl/XSLTProcessor.cpp:
+        * ksvg2/misc/SVGImageLoader.h:
+        * ksvg2/svg/SVGElement.cpp:
+        * ksvg2/svg/SVGSVGElement.cpp:
+        * kwq/WebCoreAXObject.mm:
+        * page/Frame.cpp:
+        * page/FrameView.cpp:
+        * rendering/RenderBlock.cpp:
+        * rendering/RenderBox.cpp:
+        * rendering/RenderFlow.cpp:
+        * rendering/RenderHTMLCanvas.cpp:
+        * rendering/RenderImage.cpp:
+        * rendering/RenderLayer.cpp:
+        * rendering/RenderObject.cpp:
+        * rendering/RenderTable.cpp:
+        * rendering/RenderTableCell.cpp:
+        * rendering/RenderTableCol.cpp:
+        * rendering/RenderTableRow.cpp:
+        * rendering/RenderTableSection.cpp:
+        * rendering/RenderTextField.cpp:
+        * rendering/RenderTheme.cpp:
+        * rendering/render_applet.cpp:
+        * rendering/render_button.cpp:
+        * rendering/render_frames.cpp:
+        * rendering/render_list.cpp:
+        Updated includes.
+
 2006-03-17  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by darin.

diff --git a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
index 2a3716f4da58c938b3860194b4f90e141ca9f0ae..99632d8fed382004d44420c027454df3c0725040 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\iconv\include&quot;;&quot;$(SolutionDir)\..\..\icu\include&quot;;&quot;$(SolutionDir)\..\..\libxml\include&quot;;&quot;$(SolutionDir)\..\..\libxslt\include&quot;;&quot;$(SolutionDir)\..\&quot;;&quot;$(SolutionDir)\..\css&quot;;&quot;$(SolutionDir)\..\khtml\dom&quot;;&quot;$(SolutionDir)\..\khtml\ecma&quot;;&quot;$(SolutionDir)\..\editing&quot;;&quot;$(SolutionDir)\..\khtml\html&quot;;&quot;$(SolutionDir)\..\khtml\misc&quot;;&quot;$(SolutionDir)\..\rendering&quot;;&quot;$(SolutionDir)\..\bindings\js&quot;;&quot;$(SolutionDir)\..\dom&quot;;&quot;$(SolutionDir)\..\khtml\xsl&quot;;&quot;$(SolutionDir)\..\html&quot;;&quot;$(SolutionDir)\..\khtml&quot;;&quot;$(SolutionDir)\..\kwq&quot;;&quot;$(SolutionDir)\..\bridge&quot;;&quot;$(SolutionDir)\..\bridge\win&quot;;&quot;$(SolutionDir)\..\loader&quot;;&quot;$(SolutionDir)\..\page&quot;;&quot;$(SolutionDir)\..\platform&quot;;&quot;$(SolutionDir)\..\platform\cairo&quot;;&quot;$(SolutionDir)\..\platform\image-decoders&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\gif&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\png&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\zlib&quot;;&quot;$(SolutionDir)\..\xml&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(SolutionDir)\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\kjs&quot;;&quot;$(SolutionDir)..\platform\cairo\pixman\src&quot;;&quot;$(SolutionDir)\..\platform\cairo\cairo\src&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\iconv\include&quot;;&quot;$(SolutionDir)\..\..\icu\include&quot;;&quot;$(SolutionDir)\..\..\libxml\include&quot;;&quot;$(SolutionDir)\..\..\libxslt\include&quot;;&quot;$(SolutionDir)\..\&quot;;&quot;$(SolutionDir)\..\css&quot;;&quot;$(SolutionDir)\..\khtml\dom&quot;;&quot;$(SolutionDir)\..\khtml\ecma&quot;;&quot;$(SolutionDir)\..\editing&quot;;&quot;$(SolutionDir)\..\khtml\misc&quot;;&quot;$(SolutionDir)\..\rendering&quot;;&quot;$(SolutionDir)\..\bindings\js&quot;;&quot;$(SolutionDir)\..\dom&quot;;&quot;$(SolutionDir)\..\khtml\xsl&quot;;&quot;$(SolutionDir)\..\html&quot;;&quot;$(SolutionDir)\..\khtml&quot;;&quot;$(SolutionDir)\..\kwq&quot;;&quot;$(SolutionDir)\..\bridge&quot;;&quot;$(SolutionDir)\..\bridge\win&quot;;&quot;$(SolutionDir)\..\loader&quot;;&quot;$(SolutionDir)\..\page&quot;;&quot;$(SolutionDir)\..\platform&quot;;&quot;$(SolutionDir)\..\platform\cairo&quot;;&quot;$(SolutionDir)\..\platform\image-decoders&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\gif&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\png&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\zlib&quot;;&quot;$(SolutionDir)\..\xml&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(SolutionDir)\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\kjs&quot;;&quot;$(SolutionDir)..\platform\cairo\pixman\src&quot;;&quot;$(SolutionDir)\..\platform\cairo\cairo\src&quot;"\r
                                PreprocessorDefinitions="WIN32; KHTML_NO_XBL; KHTML_XSLT"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -106,7 +106,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\iconv\include&quot;;&quot;$(SolutionDir)\..\..\icu\include&quot;;&quot;$(SolutionDir)\..\..\libxml\include&quot;;&quot;$(SolutionDir)\..\..\libxslt\include&quot;;&quot;$(SolutionDir)\..\&quot;;&quot;$(SolutionDir)\..\css&quot;;&quot;$(SolutionDir)\..\khtml\dom&quot;;&quot;$(SolutionDir)\..\khtml\ecma&quot;;&quot;$(SolutionDir)\..\editing&quot;;&quot;$(SolutionDir)\..\khtml\html&quot;;&quot;$(SolutionDir)\..\khtml\misc&quot;;&quot;$(SolutionDir)\..\rendering&quot;;&quot;$(SolutionDir)\..\bindings\js&quot;;&quot;$(SolutionDir)\..\dom&quot;;&quot;$(SolutionDir)\..\khtml\xsl&quot;;&quot;$(SolutionDir)\..\html&quot;;&quot;$(SolutionDir)\..\khtml&quot;;&quot;$(SolutionDir)\..\kwq&quot;;&quot;$(SolutionDir)\..\bridge&quot;;&quot;$(SolutionDir)\..\bridge\win&quot;;&quot;$(SolutionDir)\..\loader&quot;;&quot;$(SolutionDir)\..\page&quot;;&quot;$(SolutionDir)\..\platform&quot;;&quot;$(SolutionDir)\..\platform\cairo&quot;;&quot;$(SolutionDir)\..\platform\image-decoders&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\gif&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\png&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\zlib&quot;;&quot;$(SolutionDir)\..\xml&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(SolutionDir)\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\kjs&quot;;&quot;$(SolutionDir)..\platform\cairo\pixman\src&quot;;&quot;$(SolutionDir)\..\platform\cairo\cairo\src&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\iconv\include&quot;;&quot;$(SolutionDir)\..\..\icu\include&quot;;&quot;$(SolutionDir)\..\..\libxml\include&quot;;&quot;$(SolutionDir)\..\..\libxslt\include&quot;;&quot;$(SolutionDir)\..\&quot;;&quot;$(SolutionDir)\..\css&quot;;&quot;$(SolutionDir)\..\khtml\dom&quot;;&quot;$(SolutionDir)\..\khtml\ecma&quot;;&quot;$(SolutionDir)\..\editing&quot;;&quot;$(SolutionDir)\..\khtml\misc&quot;;&quot;$(SolutionDir)\..\rendering&quot;;&quot;$(SolutionDir)\..\bindings\js&quot;;&quot;$(SolutionDir)\..\dom&quot;;&quot;$(SolutionDir)\..\khtml\xsl&quot;;&quot;$(SolutionDir)\..\html&quot;;&quot;$(SolutionDir)\..\khtml&quot;;&quot;$(SolutionDir)\..\kwq&quot;;&quot;$(SolutionDir)\..\bridge&quot;;&quot;$(SolutionDir)\..\bridge\win&quot;;&quot;$(SolutionDir)\..\loader&quot;;&quot;$(SolutionDir)\..\page&quot;;&quot;$(SolutionDir)\..\platform&quot;;&quot;$(SolutionDir)\..\platform\cairo&quot;;&quot;$(SolutionDir)\..\platform\image-decoders&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\gif&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\png&quot;;&quot;$(SolutionDir)\..\platform\image-decoders\zlib&quot;;&quot;$(SolutionDir)\..\xml&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\os-win32&quot;;&quot;$(SolutionDir)\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(SolutionDir)\..\..\JavaScriptCore\kjs&quot;;&quot;$(SolutionDir)..\platform\cairo\pixman\src&quot;;&quot;$(SolutionDir)\..\platform\cairo\cairo\src&quot;"\r
                                PreprocessorDefinitions="WIN32; KHTML_NO_XBL; KHTML_XSLT"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -2831,283 +2831,283 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\FormDataList.cpp"\r
+                               RelativePath="..\..\html\FormDataList.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\FormDataList.h"\r
+                               RelativePath="..\..\html\FormDataList.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_baseimpl.cpp"\r
+                               RelativePath="..\..\html\html_baseimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_baseimpl.h"\r
+                               RelativePath="..\..\html\html_baseimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_blockimpl.cpp"\r
+                               RelativePath="..\..\html\html_blockimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_blockimpl.h"\r
+                               RelativePath="..\..\html\html_blockimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLCanvasElement.cpp"\r
+                               RelativePath="..\..\html\HTMLCanvasElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLCanvasElement.h"\r
+                               RelativePath="..\..\html\HTMLCanvasElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLDocument.cpp"\r
+                               RelativePath="..\..\html\HTMLDocument.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLDocument.h"\r
+                               RelativePath="..\..\html\HTMLDocument.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_headimpl.cpp"\r
+                               RelativePath="..\..\html\html_headimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_headimpl.h"\r
+                               RelativePath="..\..\html\html_headimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_imageimpl.cpp"\r
+                               RelativePath="..\..\html\html_imageimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_imageimpl.h"\r
+                               RelativePath="..\..\html\html_imageimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_inlineimpl.cpp"\r
+                               RelativePath="..\..\html\html_inlineimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_inlineimpl.h"\r
+                               RelativePath="..\..\html\html_inlineimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_listimpl.cpp"\r
+                               RelativePath="..\..\html\html_listimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_listimpl.h"\r
+                               RelativePath="..\..\html\html_listimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_objectimpl.cpp"\r
+                               RelativePath="..\..\html\html_objectimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_objectimpl.h"\r
+                               RelativePath="..\..\html\html_objectimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_tableimpl.cpp"\r
+                               RelativePath="..\..\html\html_tableimpl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\html_tableimpl.h"\r
+                               RelativePath="..\..\html\html_tableimpl.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLBaseFontElement.cpp"\r
+                               RelativePath="..\..\html\HTMLBaseFontElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLBaseFontElement.h"\r
+                               RelativePath="..\..\html\HTMLBaseFontElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLButtonElement.cpp"\r
+                               RelativePath="..\..\html\HTMLButtonElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLButtonElement.h"\r
+                               RelativePath="..\..\html\HTMLButtonElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLCollection.cpp"\r
+                               RelativePath="..\..\html\HTMLCollection.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLCollection.h"\r
+                               RelativePath="..\..\html\HTMLCollection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLElement.cpp"\r
+                               RelativePath="..\..\html\HTMLElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLElement.h"\r
+                               RelativePath="..\..\html\HTMLElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLElementFactory.cpp"\r
+                               RelativePath="..\..\html\HTMLElementFactory.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLElementFactory.h"\r
+                               RelativePath="..\..\html\HTMLElementFactory.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFieldSetElement.cpp"\r
+                               RelativePath="..\..\html\HTMLFieldSetElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFieldSetElement.h"\r
+                               RelativePath="..\..\html\HTMLFieldSetElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFormCollection.cpp"\r
+                               RelativePath="..\..\html\HTMLFormCollection.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFormCollection.h"\r
+                               RelativePath="..\..\html\HTMLFormCollection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFormElement.cpp"\r
+                               RelativePath="..\..\html\HTMLFormElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLFormElement.h"\r
+                               RelativePath="..\..\html\HTMLFormElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLGenericFormElement.cpp"\r
+                               RelativePath="..\..\html\HTMLGenericFormElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLGenericFormElement.h"\r
+                               RelativePath="..\..\html\HTMLGenericFormElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLInputElement.cpp"\r
+                               RelativePath="..\..\html\HTMLInputElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLInputElement.h"\r
+                               RelativePath="..\..\html\HTMLInputElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLIsIndexElement.cpp"\r
+                               RelativePath="..\..\html\HTMLIsIndexElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLIsIndexElement.h"\r
+                               RelativePath="..\..\html\HTMLIsIndexElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLKeygenElement.cpp"\r
+                               RelativePath="..\..\html\HTMLKeygenElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLKeygenElement.h"\r
+                               RelativePath="..\..\html\HTMLKeygenElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLLabelElement.cpp"\r
+                               RelativePath="..\..\html\HTMLLabelElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLLabelElement.h"\r
+                               RelativePath="..\..\html\HTMLLabelElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLLegendElement.cpp"\r
+                               RelativePath="..\..\html\HTMLLegendElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLLegendElement.h"\r
+                               RelativePath="..\..\html\HTMLLegendElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLNameCollection.cpp"\r
+                               RelativePath="..\..\html\HTMLNameCollection.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLNameCollection.h"\r
+                               RelativePath="..\..\html\HTMLNameCollection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmlnames.cpp"\r
+                               RelativePath="..\..\html\HTMLNames.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmlnames.h"\r
+                               RelativePath="..\..\html\HTMLNames.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptGroupElement.cpp"\r
+                               RelativePath="..\..\html\HTMLOptGroupElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptGroupElement.h"\r
+                               RelativePath="..\..\html\HTMLOptGroupElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptionElement.cpp"\r
+                               RelativePath="..\..\html\HTMLOptionElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptionElement.h"\r
+                               RelativePath="..\..\html\HTMLOptionElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptionsCollection.cpp"\r
+                               RelativePath="..\..\html\HTMLOptionsCollection.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLOptionsCollection.h"\r
+                               RelativePath="..\..\html\HTMLOptionsCollection.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmlparser.cpp"\r
+                               RelativePath="..\..\html\HTMLParser.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmlparser.h"\r
+                               RelativePath="..\..\html\HTMLParser.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLSelectElement.cpp"\r
+                               RelativePath="..\..\html\HTMLSelectElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLSelectElement.h"\r
+                               RelativePath="..\..\html\HTMLSelectElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLTextAreaElement.cpp"\r
+                               RelativePath="..\..\html\HTMLTextAreaElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLTextAreaElement.h"\r
+                               RelativePath="..\..\html\HTMLTextAreaElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLTextFieldInnerElement.cpp"\r
+                               RelativePath="..\..\html\HTMLTextFieldInnerElement.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\HTMLTextFieldInnerElement.h"\r
+                               RelativePath="..\..\html\HTMLTextFieldInnerElement.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmltokenizer.cpp"\r
+                               RelativePath="..\..\html\HTMLTokenizer.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\khtml\html\htmltokenizer.h"\r
+                               RelativePath="..\..\html\HTMLTokenizer.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
index cfc9087f213ba0cae0f28f7b227dbd807e5f152c..9d6fe6c6e58758372115ac8e755a40a2183afbc4 100755 (executable)
--- a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
+++ b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
@@ -27,14 +27,14 @@ fi
 
 cd "$WebCoreSourceRoot"
 
-if [ khtml/html/HTMLEntityNames.gperf -nt "$DerivedSourcesDir/HTMLEntityNames.c" ]; then
+if [ html/HTMLEntityNames.gperf -nt "$DerivedSourcesDir/HTMLEntityNames.c" ]; then
   echo "Generating entities table..."
-  gperf -a -L ANSI-C -C -G -c -o -t -k '*' -NfindEntity -D -s 2 khtml/html/HTMLEntityNames.gperf > "$DerivedSourcesDir/HTMLEntityNames.c"
+  gperf -a -L ANSI-C -C -G -c -o -t -k '*' -NfindEntity -D -s 2 html/HTMLEntityNames.gperf > "$DerivedSourcesDir/HTMLEntityNames.c"
 fi
 
-if [ khtml/html/DocTypeStrings.gperf -nt "$DerivedSourcesDir/DocTypeStrings.cpp" ]; then
+if [ html/DocTypeStrings.gperf -nt "$DerivedSourcesDir/DocTypeStrings.cpp" ]; then
   echo "Generating doctype modes table..."
-  gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards khtml/html/DocTypeStrings.gperf > "$DerivedSourcesDir/DocTypeStrings.cpp"
+  gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards html/DocTypeStrings.gperf > "$DerivedSourcesDir/DocTypeStrings.cpp"
 fi
 
 # Generate the CSS tokenizer using flex

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 36b5f466a241ab8be4b96376390d43b13bdd275b..b3d8a50b9efadd2f5cbd6d6e230af170a35e234e 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -15,8 +15,8 @@
                1A69D382085627410009880D /* JSDOMParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A69D380085627410009880D /* JSDOMParser.cpp */; };
                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; };
-               550A0BCD085F604D007353D6 /* htmlnames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BCB085F604D007353D6 /* htmlnames.cpp */; };
-               550A0BCE085F604D007353D6 /* htmlnames.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BCC085F604D007353D6 /* htmlnames.h */; };
+               550A0BCD085F604D007353D6 /* HTMLNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BCB085F604D007353D6 /* HTMLNames.cpp */; };
+               550A0BCE085F604D007353D6 /* HTMLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BCC085F604D007353D6 /* HTMLNames.h */; };
                651B4D8509AC83370029F1EF /* DeprecatedStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */; };
                651B4D8609AC83370029F1EF /* DeprecatedStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 651B4D8409AC83370029F1EF /* DeprecatedStringList.h */; };
                651B4D8F09AC859F0029F1EF /* QStringListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 651B4D8E09AC859F0029F1EF /* QStringListMac.mm */; };
@@ -270,8 +270,8 @@
                93F198EB08245E59001E9ABC /* html_listimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D24902DE4396018635CA /* html_listimpl.h */; };
                93F198ED08245E59001E9ABC /* html_objectimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D24D02DE4396018635CA /* html_objectimpl.h */; };
                93F198EE08245E59001E9ABC /* html_tableimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D24F02DE4396018635CA /* html_tableimpl.h */; };
-               93F198EF08245E59001E9ABC /* htmlparser.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25102DE4396018635CA /* htmlparser.h */; };
-               93F198F008245E59001E9ABC /* htmltokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25302DE4396018635CA /* htmltokenizer.h */; };
+               93F198EF08245E59001E9ABC /* HTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25102DE4396018635CA /* HTMLParser.h */; };
+               93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D25302DE4396018635CA /* HTMLTokenizer.h */; };
                93F198F608245E59001E9ABC /* decoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D27902DE43D7018635CA /* decoder.h */; };
                93F1991708245E59001E9ABC /* dom2_eventsimpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30202DE4476018635CA /* dom2_eventsimpl.h */; };
                93F1991808245E59001E9ABC /* Range.h in Headers */ = {isa = PBXBuildFile; fileRef = F523D30402DE4476018635CA /* Range.h */; };
@@ -397,8 +397,8 @@
                93F19A9708245E59001E9ABC /* html_listimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D24802DE4396018635CA /* html_listimpl.cpp */; };
                93F19A9908245E59001E9ABC /* html_objectimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D24C02DE4396018635CA /* html_objectimpl.cpp */; };
                93F19A9A08245E59001E9ABC /* html_tableimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D24E02DE4396018635CA /* html_tableimpl.cpp */; };
-               93F19A9B08245E59001E9ABC /* htmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25002DE4396018635CA /* htmlparser.cpp */; };
-               93F19A9C08245E59001E9ABC /* htmltokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25202DE4396018635CA /* htmltokenizer.cpp */; };
+               93F19A9B08245E59001E9ABC /* HTMLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25002DE4396018635CA /* HTMLParser.cpp */; };
+               93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D25202DE4396018635CA /* HTMLTokenizer.cpp */; };
                93F19A9D08245E59001E9ABC /* decoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D27802DE43D7018635CA /* decoder.cpp */; };
                93F19AB308245E59001E9ABC /* dom_elementimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D2F702DE4476018635CA /* dom_elementimpl.cpp */; };
                93F19AB708245E59001E9ABC /* dom_xmlimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F523D2FF02DE4476018635CA /* dom_xmlimpl.cpp */; };
@@ -1143,8 +1143,8 @@
                51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLCanvasElement.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               550A0BCB085F604D007353D6 /* htmlnames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = htmlnames.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               550A0BCC085F604D007353D6 /* htmlnames.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = htmlnames.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               550A0BCB085F604D007353D6 /* HTMLNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLNames.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               550A0BCC085F604D007353D6 /* HTMLNames.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLNames.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreAXObject.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreAXObject.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2236,10 +2236,10 @@
                F523D24D02DE4396018635CA /* html_objectimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = html_objectimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D24E02DE4396018635CA /* html_tableimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = html_tableimpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D24F02DE4396018635CA /* html_tableimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = html_tableimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D25002DE4396018635CA /* htmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = htmlparser.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D25102DE4396018635CA /* htmlparser.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = htmlparser.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D25202DE4396018635CA /* htmltokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = htmltokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F523D25302DE4396018635CA /* htmltokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = htmltokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D25002DE4396018635CA /* HTMLParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParser.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D25102DE4396018635CA /* HTMLParser.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLParser.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D25202DE4396018635CA /* HTMLTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLTokenizer.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F523D25302DE4396018635CA /* HTMLTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTokenizer.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D27802DE43D7018635CA /* decoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = decoder.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D27902DE43D7018635CA /* decoder.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = decoder.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F523D2F702DE4476018635CA /* dom_elementimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_elementimpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -2676,6 +2676,76 @@
                                930CAAD609C495B600229C04 /* CanvasRenderingContext2D.idl */,
                                93EEC27009C3218800C515D1 /* CanvasStyle.cpp */,
                                93EEC1EF09C2877700C515D1 /* CanvasStyle.h */,
+                               A8136D370973A8E700D74463 /* FormDataList.cpp */,
+                               A8136D360973A8E700D74463 /* FormDataList.h */,
+                               F523D23702DE4396018635CA /* html_baseimpl.cpp */,
+                               F523D23802DE4396018635CA /* html_baseimpl.h */,
+                               F523D23902DE4396018635CA /* html_blockimpl.cpp */,
+                               F523D23A02DE4396018635CA /* html_blockimpl.h */,
+                               F523D24202DE4396018635CA /* html_headimpl.cpp */,
+                               F523D24302DE4396018635CA /* html_headimpl.h */,
+                               F523D24402DE4396018635CA /* html_imageimpl.cpp */,
+                               F523D24502DE4396018635CA /* html_imageimpl.h */,
+                               F523D24602DE4396018635CA /* html_inlineimpl.cpp */,
+                               F523D24702DE4396018635CA /* html_inlineimpl.h */,
+                               F523D24802DE4396018635CA /* html_listimpl.cpp */,
+                               F523D24902DE4396018635CA /* html_listimpl.h */,
+                               F523D24C02DE4396018635CA /* html_objectimpl.cpp */,
+                               F523D24D02DE4396018635CA /* html_objectimpl.h */,
+                               F523D24E02DE4396018635CA /* html_tableimpl.cpp */,
+                               F523D24F02DE4396018635CA /* html_tableimpl.h */,
+                               A8DF3FCB097FA0FB0052981B /* HTMLBaseFontElement.cpp */,
+                               A8DF3FCA097FA0FB0052981B /* HTMLBaseFontElement.h */,
+                               A81369B7097374F500D74463 /* HTMLButtonElement.cpp */,
+                               A81369B6097374F500D74463 /* HTMLButtonElement.h */,
+                               51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */,
+                               51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */,
+                               A8DF3FC9097FA0FB0052981B /* HTMLCollection.cpp */,
+                               A8DF3FC8097FA0FB0052981B /* HTMLCollection.h */,
+                               F523D23B02DE4396018635CA /* HTMLDocument.cpp */,
+                               F523D23C02DE4396018635CA /* HTMLDocument.h */,
+                               F523D23E02DE4396018635CA /* HTMLElement.cpp */,
+                               F523D23F02DE4396018635CA /* HTMLElement.h */,
+                               BCEF3432087B563E00BBF833 /* HTMLElementFactory.cpp */,
+                               BCEF3433087B563E00BBF833 /* HTMLElementFactory.h */,
+                               A81369B9097374F500D74463 /* HTMLFieldSetElement.cpp */,
+                               A81369B8097374F500D74463 /* HTMLFieldSetElement.h */,
+                               A8DF3FC7097FA0FB0052981B /* HTMLFormCollection.cpp */,
+                               A8DF3FC6097FA0FB0052981B /* HTMLFormCollection.h */,
+                               A81369B5097374F500D74463 /* HTMLFormElement.cpp */,
+                               A81369B4097374F500D74463 /* HTMLFormElement.h */,
+                               A81369B3097374F500D74463 /* HTMLGenericFormElement.cpp */,
+                               A81369B2097374F500D74463 /* HTMLGenericFormElement.h */,
+                               A81369B1097374F500D74463 /* HTMLInputElement.cpp */,
+                               A81369B0097374F500D74463 /* HTMLInputElement.h */,
+                               A81369AF097374F500D74463 /* HTMLIsIndexElement.cpp */,
+                               A81369AE097374F500D74463 /* HTMLIsIndexElement.h */,
+                               A81369C9097374F600D74463 /* HTMLKeygenElement.cpp */,
+                               A81369C8097374F500D74463 /* HTMLKeygenElement.h */,
+                               A81369C7097374F500D74463 /* HTMLLabelElement.cpp */,
+                               A81369C6097374F500D74463 /* HTMLLabelElement.h */,
+                               A81369C5097374F500D74463 /* HTMLLegendElement.cpp */,
+                               A81369C4097374F500D74463 /* HTMLLegendElement.h */,
+                               A8DF3FCD097FA0FB0052981B /* HTMLNameCollection.cpp */,
+                               A8DF3FCC097FA0FB0052981B /* HTMLNameCollection.h */,
+                               550A0BCB085F604D007353D6 /* HTMLNames.cpp */,
+                               550A0BCC085F604D007353D6 /* HTMLNames.h */,
+                               A81369C3097374F500D74463 /* HTMLOptGroupElement.cpp */,
+                               A81369C2097374F500D74463 /* HTMLOptGroupElement.h */,
+                               A81369C1097374F500D74463 /* HTMLOptionElement.cpp */,
+                               A81369C0097374F500D74463 /* HTMLOptionElement.h */,
+                               9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */,
+                               A81369BE097374F500D74463 /* HTMLOptionsCollection.h */,
+                               F523D25002DE4396018635CA /* HTMLParser.cpp */,
+                               F523D25102DE4396018635CA /* HTMLParser.h */,
+                               A81369BD097374F500D74463 /* HTMLSelectElement.cpp */,
+                               A81369BC097374F500D74463 /* HTMLSelectElement.h */,
+                               A81369BB097374F500D74463 /* HTMLTextAreaElement.cpp */,
+                               A81369BA097374F500D74463 /* HTMLTextAreaElement.h */,
+                               AB23A31009BBA7760067CC53 /* HTMLTextFieldInnerElement.cpp */,
+                               AB23A31109BBA7760067CC53 /* HTMLTextFieldInnerElement.h */,
+                               F523D25202DE4396018635CA /* HTMLTokenizer.cpp */,
+                               F523D25302DE4396018635CA /* HTMLTokenizer.h */,
                        );
                        path = html;
                        sourceTree = "<group>";
@@ -3547,7 +3617,6 @@
                        isa = PBXGroup;
                        children = (
                                F523D23402DE436B018635CA /* ecma */,
-                               F523D27702DE4398018635CA /* html */,
                                F523D29C02DE43D9018635CA /* misc */,
                                BC41978B059293BE0016347F /* xbl */,
                                BC06F24406D18A35004A6FA3 /* xsl */,
@@ -3620,83 +3689,6 @@
                        path = ecma;
                        sourceTree = "<group>";
                };
-               F523D27702DE4398018635CA /* html */ = {
-                       isa = PBXGroup;
-                       children = (
-                               AB23A31009BBA7760067CC53 /* HTMLTextFieldInnerElement.cpp */,
-                               AB23A31109BBA7760067CC53 /* HTMLTextFieldInnerElement.h */,
-                               A8136D370973A8E700D74463 /* FormDataList.cpp */,
-                               A8136D360973A8E700D74463 /* FormDataList.h */,
-                               F523D23702DE4396018635CA /* html_baseimpl.cpp */,
-                               F523D23802DE4396018635CA /* html_baseimpl.h */,
-                               F523D23902DE4396018635CA /* html_blockimpl.cpp */,
-                               F523D23A02DE4396018635CA /* html_blockimpl.h */,
-                               51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */,
-                               51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */,
-                               F523D23B02DE4396018635CA /* HTMLDocument.cpp */,
-                               F523D23C02DE4396018635CA /* HTMLDocument.h */,
-                               F523D24202DE4396018635CA /* html_headimpl.cpp */,
-                               F523D24302DE4396018635CA /* html_headimpl.h */,
-                               F523D24402DE4396018635CA /* html_imageimpl.cpp */,
-                               F523D24502DE4396018635CA /* html_imageimpl.h */,
-                               F523D24602DE4396018635CA /* html_inlineimpl.cpp */,
-                               F523D24702DE4396018635CA /* html_inlineimpl.h */,
-                               F523D24802DE4396018635CA /* html_listimpl.cpp */,
-                               F523D24902DE4396018635CA /* html_listimpl.h */,
-                               F523D24C02DE4396018635CA /* html_objectimpl.cpp */,
-                               F523D24D02DE4396018635CA /* html_objectimpl.h */,
-                               F523D24E02DE4396018635CA /* html_tableimpl.cpp */,
-                               F523D24F02DE4396018635CA /* html_tableimpl.h */,
-                               A8DF3FCB097FA0FB0052981B /* HTMLBaseFontElement.cpp */,
-                               A8DF3FCA097FA0FB0052981B /* HTMLBaseFontElement.h */,
-                               A81369B7097374F500D74463 /* HTMLButtonElement.cpp */,
-                               A81369B6097374F500D74463 /* HTMLButtonElement.h */,
-                               A8DF3FC9097FA0FB0052981B /* HTMLCollection.cpp */,
-                               A8DF3FC8097FA0FB0052981B /* HTMLCollection.h */,
-                               F523D23E02DE4396018635CA /* HTMLElement.cpp */,
-                               F523D23F02DE4396018635CA /* HTMLElement.h */,
-                               BCEF3432087B563E00BBF833 /* HTMLElementFactory.cpp */,
-                               BCEF3433087B563E00BBF833 /* HTMLElementFactory.h */,
-                               A81369B9097374F500D74463 /* HTMLFieldSetElement.cpp */,
-                               A81369B8097374F500D74463 /* HTMLFieldSetElement.h */,
-                               A8DF3FC7097FA0FB0052981B /* HTMLFormCollection.cpp */,
-                               A8DF3FC6097FA0FB0052981B /* HTMLFormCollection.h */,
-                               A81369B5097374F500D74463 /* HTMLFormElement.cpp */,
-                               A81369B4097374F500D74463 /* HTMLFormElement.h */,
-                               A81369B3097374F500D74463 /* HTMLGenericFormElement.cpp */,
-                               A81369B2097374F500D74463 /* HTMLGenericFormElement.h */,
-                               A81369B1097374F500D74463 /* HTMLInputElement.cpp */,
-                               A81369B0097374F500D74463 /* HTMLInputElement.h */,
-                               A81369AF097374F500D74463 /* HTMLIsIndexElement.cpp */,
-                               A81369AE097374F500D74463 /* HTMLIsIndexElement.h */,
-                               A81369C9097374F600D74463 /* HTMLKeygenElement.cpp */,
-                               A81369C8097374F500D74463 /* HTMLKeygenElement.h */,
-                               A81369C7097374F500D74463 /* HTMLLabelElement.cpp */,
-                               A81369C6097374F500D74463 /* HTMLLabelElement.h */,
-                               A81369C5097374F500D74463 /* HTMLLegendElement.cpp */,
-                               A81369C4097374F500D74463 /* HTMLLegendElement.h */,
-                               A8DF3FCD097FA0FB0052981B /* HTMLNameCollection.cpp */,
-                               A8DF3FCC097FA0FB0052981B /* HTMLNameCollection.h */,
-                               550A0BCB085F604D007353D6 /* htmlnames.cpp */,
-                               550A0BCC085F604D007353D6 /* htmlnames.h */,
-                               A81369C3097374F500D74463 /* HTMLOptGroupElement.cpp */,
-                               A81369C2097374F500D74463 /* HTMLOptGroupElement.h */,
-                               A81369C1097374F500D74463 /* HTMLOptionElement.cpp */,
-                               A81369C0097374F500D74463 /* HTMLOptionElement.h */,
-                               9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */,
-                               A81369BE097374F500D74463 /* HTMLOptionsCollection.h */,
-                               F523D25002DE4396018635CA /* htmlparser.cpp */,
-                               F523D25102DE4396018635CA /* htmlparser.h */,
-                               A81369BD097374F500D74463 /* HTMLSelectElement.cpp */,
-                               A81369BC097374F500D74463 /* HTMLSelectElement.h */,
-                               A81369BB097374F500D74463 /* HTMLTextAreaElement.cpp */,
-                               A81369BA097374F500D74463 /* HTMLTextAreaElement.h */,
-                               F523D25202DE4396018635CA /* htmltokenizer.cpp */,
-                               F523D25302DE4396018635CA /* htmltokenizer.h */,
-                       );
-                       path = html;
-                       sourceTree = "<group>";
-               };
                F523D29C02DE43D9018635CA /* misc */ = {
                        isa = PBXGroup;
                        children = (
@@ -3964,8 +3956,8 @@
                                93F198EB08245E59001E9ABC /* html_listimpl.h in Headers */,
                                93F198ED08245E59001E9ABC /* html_objectimpl.h in Headers */,
                                93F198EE08245E59001E9ABC /* html_tableimpl.h in Headers */,
-                               93F198EF08245E59001E9ABC /* htmlparser.h in Headers */,
-                               93F198F008245E59001E9ABC /* htmltokenizer.h in Headers */,
+                               93F198EF08245E59001E9ABC /* HTMLParser.h in Headers */,
+                               93F198F008245E59001E9ABC /* HTMLTokenizer.h in Headers */,
                                93F198F608245E59001E9ABC /* decoder.h in Headers */,
                                93F1991708245E59001E9ABC /* dom2_eventsimpl.h in Headers */,
                                93F1991808245E59001E9ABC /* Range.h in Headers */,
@@ -4042,7 +4034,7 @@
                                93F199F108245E59001E9ABC /* WebDashboardRegion.h in Headers */,
                                1A69D381085627410009880D /* JSDOMParser.h in Headers */,
                                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
-                               550A0BCE085F604D007353D6 /* htmlnames.h in Headers */,
+                               550A0BCE085F604D007353D6 /* HTMLNames.h in Headers */,
                                BCEF3435087B563E00BBF833 /* HTMLElementFactory.h in Headers */,
                                A8FD8B87087CB45700DC3707 /* KWQWMatrix.h in Headers */,
                                7E6FEED80898582300C44C3F /* WebCoreScriptDebugger.h in Headers */,
@@ -4721,7 +4713,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "gperf -CEot -L ANSI-C -k \"*\" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards khtml/html/DocTypeStrings.gperf > \"$DERIVED_FILE_DIR/DocTypeStrings.cpp\"";
+                       shellScript = "gperf -CEot -L ANSI-C -k \"*\" -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards html/DocTypeStrings.gperf > \"$DERIVED_FILE_DIR/DocTypeStrings.cpp\"";
                };
                932FC0D20824A2C4005B3C75 /* CharsetData.cpp */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -5033,7 +5025,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "gperf -a -L ANSI-C -C -G -c -o -t -k '*' -NfindEntity -D -s 2 khtml/html/HTMLEntityNames.gperf > \"$DERIVED_FILE_DIR/HTMLEntityNames.c\"";
+                       shellScript = "gperf -a -L ANSI-C -C -G -c -o -t -k '*' -NfindEntity -D -s 2 html/HTMLEntityNames.gperf > \"$DERIVED_FILE_DIR/HTMLEntityNames.c\"";
                };
                A83C867D0911AA19009BF4A7 /* JSXSLTProcessor.lut.h */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -5176,8 +5168,8 @@
                                93F19A9708245E59001E9ABC /* html_listimpl.cpp in Sources */,
                                93F19A9908245E59001E9ABC /* html_objectimpl.cpp in Sources */,
                                93F19A9A08245E59001E9ABC /* html_tableimpl.cpp in Sources */,
-                               93F19A9B08245E59001E9ABC /* htmlparser.cpp in Sources */,
-                               93F19A9C08245E59001E9ABC /* htmltokenizer.cpp in Sources */,
+                               93F19A9B08245E59001E9ABC /* HTMLParser.cpp in Sources */,
+                               93F19A9C08245E59001E9ABC /* HTMLTokenizer.cpp in Sources */,
                                93F19A9D08245E59001E9ABC /* decoder.cpp in Sources */,
                                93F19AB308245E59001E9ABC /* dom_elementimpl.cpp in Sources */,
                                93F19AB708245E59001E9ABC /* dom_xmlimpl.cpp in Sources */,
@@ -5223,7 +5215,7 @@
                                93F19B0808245E59001E9ABC /* WebDashboardRegion.m in Sources */,
                                1A69D382085627410009880D /* JSDOMParser.cpp in Sources */,
                                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */,
-                               550A0BCD085F604D007353D6 /* htmlnames.cpp in Sources */,
+                               550A0BCD085F604D007353D6 /* HTMLNames.cpp in Sources */,
                                BCEF3434087B563E00BBF833 /* HTMLElementFactory.cpp in Sources */,
                                A8FD8B86087CB44C00DC3707 /* KWQWMatrix.cpp in Sources */,
                                7E6FEED90898582300C44C3F /* WebCoreScriptDebugger.mm in Sources */,

diff --git a/WebCore/bindings/objc/DOM.mm b/WebCore/bindings/objc/DOM.mm
index 5313335d1503bd585169e70bd75cc2dfc884f192..80cb1a0d773d90dfc9cf78c42420ebfb915c63ad 100644 (file)
--- a/WebCore/bindings/objc/DOM.mm
+++ b/WebCore/bindings/objc/DOM.mm
@@ -51,7 +51,7 @@
 #import "AbstractView.h"
 #import "dom_elementimpl.h"
 #import "dom_xmlimpl.h"
-#import "htmlnames.h"
+#import "HTMLNames.h"
 #import "RenderImage.h"
 #import <JavaScriptCore/WebScriptObjectPrivate.h>
 #import <kxmlcore/Assertions.h>

diff --git a/WebCore/bridge/mac/WebCoreEncodings.mm b/WebCore/bridge/mac/WebCoreEncodings.mm
index d12eacf561665059a35266597f87bafc462b6bf0..73b33314f693c648ab81025a56c25007c08f5973 100644 (file)
--- a/WebCore/bridge/mac/WebCoreEncodings.mm
+++ b/WebCore/bridge/mac/WebCoreEncodings.mm
@@ -28,7 +28,7 @@
 
 #import "decoder.h"
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 @implementation WebCoreEncodings
 

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index fe5bb9b3fd7f7feeb41a8b7b55bcecfffb431467..bc836d8706028c791dbb052ce8884c6a461fa606 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -64,7 +64,7 @@
 #import "HTMLDocument.h"
 #import "html_imageimpl.h"
 #import "htmlediting.h"
-#import "htmlnames.h"
+#import "HTMLNames.h"
 #import "kjs_proxy.h"
 #import "kjs_window.h"
 #import "loader.h"

diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index 7cec0ab56ed1ea1e8758efd5364ea367f03e0aac..989fd312b6f029e4f4d33f68eba8e8fb78971688 100644 (file)
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -29,7 +29,7 @@
 #include "css_valueimpl.h"
 #include "cssparser.h"
 #include "PlatformString.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/WebCore/css/cssstyleselector.cpp b/WebCore/css/cssstyleselector.cpp
index 3b584ed3e2f9601749e11676b6aca2f567c005ff..c73d7133d9a1be94f7ecf8708e7917d02b622b30 100644 (file)
--- a/WebCore/css/cssstyleselector.cpp
+++ b/WebCore/css/cssstyleselector.cpp
@@ -37,7 +37,7 @@
 #include "CSSValueKeywords.h"
 #include "Font.h"
 #include "HTMLDocument.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "khtml_settings.h"
 #include "loader.h"
 #include "RenderObject.h"

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 6baeb1e1425977a1ff700cdf551f819dac19fa90..9779082be56905919ae2289ed1afd8dac7d9e62d 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -65,7 +65,7 @@
 #include "html_headimpl.h"
 #include "html_imageimpl.h"
 #include "HTMLElementFactory.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "JSEditor.h"
 #include "khtml_settings.h"
 #include "RenderArena.h"

diff --git a/WebCore/dom/EventTargetNode.cpp b/WebCore/dom/EventTargetNode.cpp
index 01050c8b1cd12d4690c509a93ab3010bfae842a0..fc542cc321f54471f92c244502314d0ecad69a0b 100644 (file)
--- a/WebCore/dom/EventTargetNode.cpp
+++ b/WebCore/dom/EventTargetNode.cpp
@@ -35,7 +35,7 @@
 #include "PlatformWheelEvent.h"
 #include "dom2_eventsimpl.h"
 #include "kjs_proxy.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <qptrlist.h>
 #include <qtextstream.h>
 

diff --git a/WebCore/dom/NameNodeList.cpp b/WebCore/dom/NameNodeList.cpp
index df533fc3eb213cd5db9ce38a03d472f16d8c0edf..1e6e4a75f584dcd3d255c1f10d61ac3b080b8ae2 100644 (file)
--- a/WebCore/dom/NameNodeList.cpp
+++ b/WebCore/dom/NameNodeList.cpp
@@ -26,7 +26,7 @@
 #include "NameNodeList.h"
 #include "dom_elementimpl.h"
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 using namespace WebCore;
 

diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index aae3e5b1fc5e5dac7e995fdaf33ac1efbf24cd9d..3b08c3f4937c84970cc98bce8ff61d197b4b98a6 100644 (file)
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -34,7 +34,7 @@
 #include "FrameView.h"
 #include "Text.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "kjs_binding.h"
 #include "RenderObject.h"
 #include <kxmlcore/Assertions.h>

diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp
index adaffc11e6b5908613e6f6a8ba47913398ac7b49..9f184472e0f3eb75951ed9418d941ab6d0a0cbe3 100644 (file)
--- a/WebCore/dom/Position.cpp
+++ b/WebCore/dom/Position.cpp
@@ -37,7 +37,7 @@
 #include "AbstractView.h"
 #include "dom_elementimpl.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderFlow.h"
 #include "render_line.h"
 #include "render_style.h"

diff --git a/WebCore/dom/dom_elementimpl.cpp b/WebCore/dom/dom_elementimpl.cpp
index a4f5351fa00cdaaa0801b7b1077ff5aff8dfd47c..11ee9916fc24959d7eba035dd9ac0ecd771893d6 100644 (file)
--- a/WebCore/dom/dom_elementimpl.cpp
+++ b/WebCore/dom/dom_elementimpl.cpp
@@ -35,8 +35,8 @@
 #include "CSSValueKeywords.h"
 #include "dom2_eventsimpl.h"
 #include "dom_xmlimpl.h"
-#include "htmlnames.h"
-#include "htmlparser.h"
+#include "HTMLNames.h"
+#include "HTMLParser.h"
 #include "RenderCanvas.h"
 #include <qtextstream.h>
 

diff --git a/WebCore/dom/xml_tokenizer.cpp b/WebCore/dom/xml_tokenizer.cpp
index 513d9fbb8e84bc0dccec58eb85bfe9df2350a1f1..8b01712b7ee13735bc1282dfea8e6a91a96515e7 100644 (file)
--- a/WebCore/dom/xml_tokenizer.cpp
+++ b/WebCore/dom/xml_tokenizer.cpp
@@ -39,8 +39,8 @@
 #include "dom_xmlimpl.h"
 #include "html_headimpl.h"
 #include "html_tableimpl.h"
-#include "htmlnames.h"
-#include "htmltokenizer.h"
+#include "HTMLNames.h"
+#include "HTMLTokenizer.h"
 #include <kxmlcore/Vector.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>

diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index 1a52503ec115ae9ce49c5c3c27b5781ceebbc0de..58211caf0402ea78b3378336bf8d0dedf5886595 100644 (file)
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -39,7 +39,7 @@
 #include "Range.h"
 #include "HTMLInterchange.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderObject.h"
 #include <kxmlcore/Assertions.h>
 

diff --git a/WebCore/editing/BreakBlockquoteCommand.cpp b/WebCore/editing/BreakBlockquoteCommand.cpp
index cb73a1f734a67640ccbcb5ff93845bf8d8fd0602..f6cba275e8c5a12d0fc15ca9b9b21cbe25ef739e 100644 (file)
--- a/WebCore/editing/BreakBlockquoteCommand.cpp
+++ b/WebCore/editing/BreakBlockquoteCommand.cpp
@@ -29,7 +29,7 @@
 #include "dom_elementimpl.h"
 #include "Text.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "VisiblePosition.h"
 #include <kxmlcore/Assertions.h>
 

diff --git a/WebCore/editing/CompositeEditCommand.cpp b/WebCore/editing/CompositeEditCommand.cpp
index 0843c4e1916aed85ed7332694d1f98ce19bcd7f8..e463a3cf534edd9c11a7696b8a0966a19950f1f1 100644 (file)
--- a/WebCore/editing/CompositeEditCommand.cpp
+++ b/WebCore/editing/CompositeEditCommand.cpp
@@ -34,7 +34,7 @@
 #include "DeleteSelectionCommand.h"
 #include "Range.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "InsertIntoTextNodeCommand.h"
 #include "InsertNodeBeforeCommand.h"
 #include "InsertParagraphSeparatorCommand.h"

diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index 871f6015299ff254ae562e6d630b3d02c6cc6d39..f700eeb0a77c7e4f55dc3c48a94fb59d4c9588d5 100644 (file)
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -33,7 +33,7 @@
 #include "Range.h"
 #include "Position.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "render_line.h"
 #include "RenderObject.h"
 #include "VisiblePosition.h"

diff --git a/WebCore/editing/InsertLineBreakCommand.cpp b/WebCore/editing/InsertLineBreakCommand.cpp
index b4fa4cd78c91493d6b822edd6db63ba613f560ff..a2ef70ea8eac4f87ec7401e8a4d150cc038a8a46 100644 (file)
--- a/WebCore/editing/InsertLineBreakCommand.cpp
+++ b/WebCore/editing/InsertLineBreakCommand.cpp
@@ -34,7 +34,7 @@
 #include "Range.h"
 #include "dom_elementimpl.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "visible_units.h"
 #include <kxmlcore/Assertions.h>
 

diff --git a/WebCore/editing/InsertParagraphSeparatorCommand.cpp b/WebCore/editing/InsertParagraphSeparatorCommand.cpp
index ad45e75599017603c66481e00e91de6d6d627652..8411cfb9fc6d932e3b5a7a3428b990f9bcc3c530 100644 (file)
--- a/WebCore/editing/InsertParagraphSeparatorCommand.cpp
+++ b/WebCore/editing/InsertParagraphSeparatorCommand.cpp
@@ -35,7 +35,7 @@
 #include "Text.h"
 #include "htmlediting.h"
 #include "HTMLElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderObject.h"
 #include "VisiblePosition.h"
 #include "visible_units.h"

diff --git a/WebCore/editing/JSEditor.cpp b/WebCore/editing/JSEditor.cpp
index c299558795c9cb598a14e0d2b68ca89d5d112700..f192f18beb58891eec918df7684a15b568cf0afd 100644 (file)
--- a/WebCore/editing/JSEditor.cpp
+++ b/WebCore/editing/JSEditor.cpp
@@ -33,7 +33,7 @@
 #include "css_valueimpl.h"
 #include "CSSPropertyNames.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "html_imageimpl.h"
 #include "markup.h"
 #include "ReplaceSelectionCommand.h"

diff --git a/WebCore/editing/ReplaceSelectionCommand.cpp b/WebCore/editing/ReplaceSelectionCommand.cpp
index 4203a14843dd7c8e452cf2b615ed44bbcd1450be..d473c166ce0728d20ee4983aca16f018a4796316 100644 (file)
--- a/WebCore/editing/ReplaceSelectionCommand.cpp
+++ b/WebCore/editing/ReplaceSelectionCommand.cpp
@@ -42,7 +42,7 @@
 #include "Position.h"
 #include "HTMLInterchange.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderObject.h"
 #include "SelectionController.h"
 #include "visible_units.h"

diff --git a/WebCore/editing/TextIterator.cpp b/WebCore/editing/TextIterator.cpp
index fea2107de39102111b2de5aa51670ab2db218735..cd7c0ef796624f1ac4efd87391b365932a067c85 100644 (file)
--- a/WebCore/editing/TextIterator.cpp
+++ b/WebCore/editing/TextIterator.cpp
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "TextIterator.h"
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "InlineTextBox.h"
 #include "Position.h"
 #include "Range.h"

diff --git a/WebCore/editing/VisiblePosition.cpp b/WebCore/editing/VisiblePosition.cpp
index e10c9670d22db0f07b7f2fd749979a7f67adf553..deb7c1272e73367d0d590846896aeee70105c253 100644 (file)
--- a/WebCore/editing/VisiblePosition.cpp
+++ b/WebCore/editing/VisiblePosition.cpp
@@ -27,7 +27,7 @@
 #include "VisiblePosition.h"
 #include "visible_units.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "render_line.h"
 #include "RenderObject.h"
 #include "InlineTextBox.h"

diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp
index 9682b38a28911663e1c428efe9e310839eadebad..0bc72bdf621d0422265f0001ebc62699e4a8ee52 100644 (file)
--- a/WebCore/editing/htmlediting.cpp
+++ b/WebCore/editing/htmlediting.cpp
@@ -32,7 +32,7 @@
 #include "Text.h"
 #include "VisiblePosition.h"
 #include "HTMLInterchange.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderObject.h"
 #include <qregexp.h>
 

diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index a0264f95e83b8db1070bebbac3c19f257e0602d5..4d37223097baab5ea62a55a825074e9a638605e6 100644 (file)
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -39,7 +39,7 @@
 #include "Position.h"
 #include "dom_xmlimpl.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "visible_units.h"
 #include <kxmlcore/Assertions.h>
 

diff --git a/WebCore/editing/visible_units.cpp b/WebCore/editing/visible_units.cpp
index 9eac87882dcbb904221508519219013edabb9f38..aae8c89511665cad6833f232e91a9043ebbffc74 100644 (file)
--- a/WebCore/editing/visible_units.cpp
+++ b/WebCore/editing/visible_units.cpp
@@ -34,7 +34,7 @@
 #include "VisiblePosition.h"
 #include "dom_elementimpl.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "TextIterator.h"
 
 namespace WebCore {

diff --git a/WebCore/html/CanvasRenderingContext2D.cpp b/WebCore/html/CanvasRenderingContext2D.cpp
index ddc84bc12da32aab796dda3d4cf7459ae74ad7f6..39677c4f5bb80b8b322e3e89ca7e0cb76af7634d 100644 (file)
--- a/WebCore/html/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/CanvasRenderingContext2D.cpp
@@ -32,7 +32,7 @@
 #include "CanvasPattern.h"
 #include "cssparser.h"
 #include "HTMLCanvasElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderHTMLCanvas.h"
 
 namespace WebCore {

diff --git a/WebCore/khtml/html/DocTypeStrings.gperf b/WebCore/html/DocTypeStrings.gperf
similarity index 100%
rename from WebCore/khtml/html/DocTypeStrings.gperf
rename to WebCore/html/DocTypeStrings.gperf

diff --git a/WebCore/khtml/html/FormDataList.cpp b/WebCore/html/FormDataList.cpp
similarity index 100%
rename from WebCore/khtml/html/FormDataList.cpp
rename to WebCore/html/FormDataList.cpp

diff --git a/WebCore/khtml/html/FormDataList.h b/WebCore/html/FormDataList.h
similarity index 100%
rename from WebCore/khtml/html/FormDataList.h
rename to WebCore/html/FormDataList.h

diff --git a/WebCore/khtml/html/HTMLBaseFontElement.cpp b/WebCore/html/HTMLBaseFontElement.cpp
similarity index 98%
rename from WebCore/khtml/html/HTMLBaseFontElement.cpp
rename to WebCore/html/HTMLBaseFontElement.cpp
index 0c0947b58d2414ebbdc9e9071aa32c7397eac5de..3685212d0bc7aa7174830e94f0d58203f93f34c7 100644 (file)
--- a/WebCore/khtml/html/HTMLBaseFontElement.cpp
+++ b/WebCore/html/HTMLBaseFontElement.cpp
@@ -23,7 +23,7 @@
  */
 #include "config.h"
 #include "HTMLBaseFontElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLBaseFontElement.h b/WebCore/html/HTMLBaseFontElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLBaseFontElement.h
rename to WebCore/html/HTMLBaseFontElement.h

diff --git a/WebCore/khtml/html/HTMLButtonElement.cpp b/WebCore/html/HTMLButtonElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLButtonElement.cpp
rename to WebCore/html/HTMLButtonElement.cpp
index c4b13852039cd21fc0a727a22c23706fd3e84b1f..d199db582dbeed0b3a66e62fff070a839c1fbf41 100644 (file)
--- a/WebCore/khtml/html/HTMLButtonElement.cpp
+++ b/WebCore/html/HTMLButtonElement.cpp
@@ -34,7 +34,7 @@
 #include "render_button.h"
 
 #include "EventNames.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLButtonElement.h b/WebCore/html/HTMLButtonElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLButtonElement.h
rename to WebCore/html/HTMLButtonElement.h

diff --git a/WebCore/khtml/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLCanvasElement.cpp
rename to WebCore/html/HTMLCanvasElement.cpp
index c104d02d0e07ef971b0d03c02b0005304a6e12b7..f3ec75ad2619075a683ad8ec9d753924d84b95f5 100644 (file)
--- a/WebCore/khtml/html/HTMLCanvasElement.cpp
+++ b/WebCore/html/HTMLCanvasElement.cpp
@@ -30,7 +30,7 @@
 #include "CanvasPattern.h"
 #include "CanvasRenderingContext2D.h"
 #include "CanvasStyle.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderHTMLCanvas.h"
 
 namespace WebCore {

diff --git a/WebCore/khtml/html/HTMLCanvasElement.h b/WebCore/html/HTMLCanvasElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLCanvasElement.h
rename to WebCore/html/HTMLCanvasElement.h

diff --git a/WebCore/khtml/html/HTMLCollection.cpp b/WebCore/html/HTMLCollection.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLCollection.cpp
rename to WebCore/html/HTMLCollection.cpp
index 4bbd0002a02145f4d4649b65aee6742b8776eabf..695c34ede7ac1cfdad85a6cdfc088d78415c44db 100644 (file)
--- a/WebCore/khtml/html/HTMLCollection.cpp
+++ b/WebCore/html/HTMLCollection.cpp
@@ -26,7 +26,7 @@
 #include "HTMLDocument.h"
 #include "HTMLElement.h"
 #include <kxmlcore/Vector.h>
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLCollection.h b/WebCore/html/HTMLCollection.h
similarity index 100%
rename from WebCore/khtml/html/HTMLCollection.h
rename to WebCore/html/HTMLCollection.h

diff --git a/WebCore/khtml/html/HTMLDocument.cpp b/WebCore/html/HTMLDocument.cpp
similarity index 98%
rename from WebCore/khtml/html/HTMLDocument.cpp
rename to WebCore/html/HTMLDocument.cpp
index 6387ccac9b9b435ace8696195c9f7112f468a6be..c1601ce0eed73b5634c9ec8812e436378c998e06 100644 (file)
--- a/WebCore/khtml/html/HTMLDocument.cpp
+++ b/WebCore/html/HTMLDocument.cpp
@@ -62,13 +62,13 @@
 #include "css/css_stylesheetimpl.h"
 #include "css/cssstyleselector.h"
 #include "CSSPropertyNames.h"
-#include "html/html_baseimpl.h"
-#include "html/html_headimpl.h"
-#include "html/html_imageimpl.h"
-#include "html/html_imageimpl.h"
-#include "html/htmltokenizer.h"
+#include "html_baseimpl.h"
+#include "html_headimpl.h"
+#include "html_imageimpl.h"
+#include "html_imageimpl.h"
+#include "HTMLTokenizer.h"
 #include "HTMLElementFactory.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "khtml_settings.h"
 #include "rendering/RenderObject.h"
 #include "dom2_eventsimpl.h"

diff --git a/WebCore/khtml/html/HTMLDocument.h b/WebCore/html/HTMLDocument.h
similarity index 100%
rename from WebCore/khtml/html/HTMLDocument.h
rename to WebCore/html/HTMLDocument.h

diff --git a/WebCore/khtml/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLElement.cpp
rename to WebCore/html/HTMLElement.cpp
index 7d464986ae01d355367c34b8a07dc1ce93f71dde..d3017dc0efe16072886d8c30f268de8df23e22ef 100644 (file)
--- a/WebCore/khtml/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -37,8 +37,8 @@
 #include "dom2_eventsimpl.h"
 #include "HTMLDocument.h"
 #include "HTMLElementFactory.h"
-#include "htmlnames.h"
-#include "htmltokenizer.h"
+#include "HTMLNames.h"
+#include "HTMLTokenizer.h"
 #include "markup.h"
 #include "render_replaced.h"
 #include "TextIterator.h"

diff --git a/WebCore/khtml/html/HTMLElement.h b/WebCore/html/HTMLElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLElement.h
rename to WebCore/html/HTMLElement.h

diff --git a/WebCore/khtml/html/HTMLElementFactory.cpp b/WebCore/html/HTMLElementFactory.cpp
similarity index 100%
rename from WebCore/khtml/html/HTMLElementFactory.cpp
rename to WebCore/html/HTMLElementFactory.cpp

diff --git a/WebCore/khtml/html/HTMLElementFactory.h b/WebCore/html/HTMLElementFactory.h
similarity index 100%
rename from WebCore/khtml/html/HTMLElementFactory.h
rename to WebCore/html/HTMLElementFactory.h

diff --git a/WebCore/khtml/html/HTMLEntityNames.gperf b/WebCore/html/HTMLEntityNames.gperf
similarity index 100%
rename from WebCore/khtml/html/HTMLEntityNames.gperf
rename to WebCore/html/HTMLEntityNames.gperf

diff --git a/WebCore/khtml/html/HTMLFieldSetElement.cpp b/WebCore/html/HTMLFieldSetElement.cpp
similarity index 98%
rename from WebCore/khtml/html/HTMLFieldSetElement.cpp
rename to WebCore/html/HTMLFieldSetElement.cpp
index 1e81bd02d1924f7568c199c7c770de63b16f0041..fbc0de2413e466b65ba60273f75456f5a46dd475 100644 (file)
--- a/WebCore/khtml/html/HTMLFieldSetElement.cpp
+++ b/WebCore/html/HTMLFieldSetElement.cpp
@@ -28,7 +28,7 @@
 #include "HTMLFieldSetElement.h"
 
 #include "rendering/render_form.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLFieldSetElement.h b/WebCore/html/HTMLFieldSetElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLFieldSetElement.h
rename to WebCore/html/HTMLFieldSetElement.h

diff --git a/WebCore/khtml/html/HTMLFormCollection.cpp b/WebCore/html/HTMLFormCollection.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLFormCollection.cpp
rename to WebCore/html/HTMLFormCollection.cpp
index 3108665f4fe52f300a91c5ff4f4ed1414b7b6148..97498e4c5b4ba24ec6ace17176c98bcdcc2bd5fe 100644 (file)
--- a/WebCore/khtml/html/HTMLFormCollection.cpp
+++ b/WebCore/html/HTMLFormCollection.cpp
@@ -26,7 +26,7 @@
 #include "HTMLGenericFormElement.h"
 #include "HTMLFormElement.h"
 #include "html_imageimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <kxmlcore/Vector.h>
 
 namespace WebCore {

diff --git a/WebCore/khtml/html/HTMLFormCollection.h b/WebCore/html/HTMLFormCollection.h
similarity index 100%
rename from WebCore/khtml/html/HTMLFormCollection.h
rename to WebCore/html/HTMLFormCollection.h

diff --git a/WebCore/khtml/html/HTMLFormElement.cpp b/WebCore/html/HTMLFormElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLFormElement.cpp
rename to WebCore/html/HTMLFormElement.cpp
index 978d368841544b0ffbeb2187ecc85cfc6cfc7975..63f2c2ab3f1050d834150ea2675d4f931a24f80d 100644 (file)
--- a/WebCore/khtml/html/HTMLFormElement.cpp
+++ b/WebCore/html/HTMLFormElement.cpp
@@ -38,7 +38,7 @@
 #include "Frame.h"
 
 #include "TextEncoding.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLFormElement.h b/WebCore/html/HTMLFormElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLFormElement.h
rename to WebCore/html/HTMLFormElement.h

diff --git a/WebCore/khtml/html/HTMLGenericFormElement.cpp b/WebCore/html/HTMLGenericFormElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLGenericFormElement.cpp
rename to WebCore/html/HTMLGenericFormElement.cpp
index 073d26f29c4c14dff55ed76dd14c94e572002c60..e5818fbcb88eea54894217acda1785c4a8358440 100644 (file)
--- a/WebCore/khtml/html/HTMLGenericFormElement.cpp
+++ b/WebCore/html/HTMLGenericFormElement.cpp
@@ -33,7 +33,7 @@
 #include "HTMLFormElement.h"
 #include "render_replaced.h"
 #include "RenderTheme.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLGenericFormElement.h b/WebCore/html/HTMLGenericFormElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLGenericFormElement.h
rename to WebCore/html/HTMLGenericFormElement.h

diff --git a/WebCore/khtml/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLInputElement.cpp
rename to WebCore/html/HTMLInputElement.cpp
index c08b5228d9b3e151bec12a02a40e777e29eb6e72..89d7cae0b4d9121c46ecc93274df4bb1fb18000f 100644 (file)
--- a/WebCore/khtml/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -39,7 +39,7 @@
 #include "CSSPropertyNames.h"
 #include "dom2_eventsimpl.h"
 #include "html_imageimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "render_button.h"
 #include "render_form.h"
 #include "RenderTheme.h"

diff --git a/WebCore/khtml/html/HTMLInputElement.h b/WebCore/html/HTMLInputElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLInputElement.h
rename to WebCore/html/HTMLInputElement.h

diff --git a/WebCore/khtml/html/HTMLIsIndexElement.cpp b/WebCore/html/HTMLIsIndexElement.cpp
similarity index 98%
rename from WebCore/khtml/html/HTMLIsIndexElement.cpp
rename to WebCore/html/HTMLIsIndexElement.cpp
index 5e6bec591d2913220a71d4692687db226df09606..8c19873a431b93c40afa709d2b43655475eaddf4 100644 (file)
--- a/WebCore/khtml/html/HTMLIsIndexElement.cpp
+++ b/WebCore/html/HTMLIsIndexElement.cpp
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include "HTMLIsIndexElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLIsIndexElement.h b/WebCore/html/HTMLIsIndexElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLIsIndexElement.h
rename to WebCore/html/HTMLIsIndexElement.h

diff --git a/WebCore/khtml/html/HTMLKeygenElement.cpp b/WebCore/html/HTMLKeygenElement.cpp
similarity index 100%
rename from WebCore/khtml/html/HTMLKeygenElement.cpp
rename to WebCore/html/HTMLKeygenElement.cpp

diff --git a/WebCore/khtml/html/HTMLKeygenElement.h b/WebCore/html/HTMLKeygenElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLKeygenElement.h
rename to WebCore/html/HTMLKeygenElement.h

diff --git a/WebCore/khtml/html/HTMLLabelElement.cpp b/WebCore/html/HTMLLabelElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLLabelElement.cpp
rename to WebCore/html/HTMLLabelElement.cpp
index ce116a7747a556be8e897c3aeb287b4164de94e3..e74790874167bf0bd3f6415b26e53401c9e640d2 100644 (file)
--- a/WebCore/khtml/html/HTMLLabelElement.cpp
+++ b/WebCore/html/HTMLLabelElement.cpp
@@ -29,7 +29,7 @@
 #include "HTMLFormElement.h"
 
 #include "rendering/render_form.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "EventNames.h"
 #include "Document.h"
 

diff --git a/WebCore/khtml/html/HTMLLabelElement.h b/WebCore/html/HTMLLabelElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLLabelElement.h
rename to WebCore/html/HTMLLabelElement.h

diff --git a/WebCore/khtml/html/HTMLLegendElement.cpp b/WebCore/html/HTMLLegendElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLLegendElement.cpp
rename to WebCore/html/HTMLLegendElement.cpp
index ccef0de21597fef8840b3e78b0b23e8dba6b879b..5283a2992e90aa7dc55b6f8c5cf085ecf7a80911 100644 (file)
--- a/WebCore/khtml/html/HTMLLegendElement.cpp
+++ b/WebCore/html/HTMLLegendElement.cpp
@@ -28,7 +28,7 @@
 #include "HTMLLegendElement.h"
 
 #include "rendering/render_form.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLLegendElement.h b/WebCore/html/HTMLLegendElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLLegendElement.h
rename to WebCore/html/HTMLLegendElement.h

diff --git a/WebCore/khtml/html/HTMLNameCollection.cpp b/WebCore/html/HTMLNameCollection.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLNameCollection.cpp
rename to WebCore/html/HTMLNameCollection.cpp
index 1d3de14140838d188ee2850a84da5d348053f111..c4cb5145727c552a64afd474fef01900b6116466 100644 (file)
--- a/WebCore/khtml/html/HTMLNameCollection.cpp
+++ b/WebCore/html/HTMLNameCollection.cpp
@@ -27,7 +27,7 @@
 
 #include "Document.h"
 #include "html_objectimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLNameCollection.h b/WebCore/html/HTMLNameCollection.h
similarity index 100%
rename from WebCore/khtml/html/HTMLNameCollection.h
rename to WebCore/html/HTMLNameCollection.h

diff --git a/WebCore/khtml/html/htmlnames.cpp b/WebCore/html/HTMLNames.cpp
similarity index 99%
rename from WebCore/khtml/html/htmlnames.cpp
rename to WebCore/html/HTMLNames.cpp
index 551ba2301d8a6210ef04f4bd65ffaff16819b88f..c653bcf3992b68b6a45c5fe20e114f7e2cb5643e 100644 (file)
--- a/WebCore/khtml/html/htmlnames.cpp
+++ b/WebCore/html/HTMLNames.cpp
@@ -28,7 +28,7 @@
 #define QNAME_DEFAULT_CONSTRUCTOR 1
 #endif
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "StaticConstructors.h"
 
 namespace WebCore { namespace HTMLNames {

diff --git a/WebCore/khtml/html/htmlnames.h b/WebCore/html/HTMLNames.h
similarity index 100%
rename from WebCore/khtml/html/htmlnames.h
rename to WebCore/html/HTMLNames.h

diff --git a/WebCore/khtml/html/HTMLOptGroupElement.cpp b/WebCore/html/HTMLOptGroupElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLOptGroupElement.cpp
rename to WebCore/html/HTMLOptGroupElement.cpp
index 1cff258b6dd66b1e00f698ba0003e7e1ab99e10e..b62adb2060f3ea34712e7cd965c0c3541e488151 100644 (file)
--- a/WebCore/khtml/html/HTMLOptGroupElement.cpp
+++ b/WebCore/html/HTMLOptGroupElement.cpp
@@ -28,7 +28,7 @@
 #include "HTMLOptGroupElement.h"
 
 #include "HTMLSelectElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLOptGroupElement.h b/WebCore/html/HTMLOptGroupElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLOptGroupElement.h
rename to WebCore/html/HTMLOptGroupElement.h

diff --git a/WebCore/khtml/html/HTMLOptionElement.cpp b/WebCore/html/HTMLOptionElement.cpp
similarity index 100%
rename from WebCore/khtml/html/HTMLOptionElement.cpp
rename to WebCore/html/HTMLOptionElement.cpp

diff --git a/WebCore/khtml/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h
similarity index 99%
rename from WebCore/khtml/html/HTMLOptionElement.h
rename to WebCore/html/HTMLOptionElement.h
index 2718e52110052f98d127dc4b7a5c4a02d279f537..f5ba890270a26d49ab70220f0c379875568fcdb0 100644 (file)
--- a/WebCore/khtml/html/HTMLOptionElement.h
+++ b/WebCore/html/HTMLOptionElement.h
@@ -26,7 +26,7 @@
 #define HTML_HTMLOptionElementImpl_H
 
 #include "HTMLGenericFormElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
     class RenderSelect;

diff --git a/WebCore/khtml/html/HTMLOptionsCollection.cpp b/WebCore/html/HTMLOptionsCollection.cpp
similarity index 100%
rename from WebCore/khtml/html/HTMLOptionsCollection.cpp
rename to WebCore/html/HTMLOptionsCollection.cpp

diff --git a/WebCore/khtml/html/HTMLOptionsCollection.h b/WebCore/html/HTMLOptionsCollection.h
similarity index 100%
rename from WebCore/khtml/html/HTMLOptionsCollection.h
rename to WebCore/html/HTMLOptionsCollection.h

diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/html/HTMLParser.cpp
similarity index 99%
rename from WebCore/khtml/html/htmlparser.cpp
rename to WebCore/html/HTMLParser.cpp
index a3a259498411073109c5730695f41d5c929b66ea..4500ee93b1d98d9aa43d69c4187a2296cdb1ecec 100644 (file)
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/html/HTMLParser.cpp
@@ -27,7 +27,7 @@
 // KDE HTML Widget -- HTML Parser
 
 #include "config.h"
-#include "htmlparser.h"
+#include "HTMLParser.h"
 
 #include "DocumentFragment.h"
 #include "Frame.h"
@@ -50,7 +50,7 @@
 #include "html_objectimpl.h"
 #include "html_tableimpl.h"
 #include "HTMLElementFactory.h"
-#include "htmltokenizer.h"
+#include "HTMLTokenizer.h"
 #include "RenderObject.h"
 #include <kxmlcore/HashMap.h>
 #include <kxmlcore/HashSet.h>

diff --git a/WebCore/khtml/html/htmlparser.h b/WebCore/html/HTMLParser.h
similarity index 100%
rename from WebCore/khtml/html/htmlparser.h
rename to WebCore/html/HTMLParser.h

diff --git a/WebCore/khtml/html/HTMLSelectElement.cpp b/WebCore/html/HTMLSelectElement.cpp
similarity index 100%
rename from WebCore/khtml/html/HTMLSelectElement.cpp
rename to WebCore/html/HTMLSelectElement.cpp

diff --git a/WebCore/khtml/html/HTMLSelectElement.h b/WebCore/html/HTMLSelectElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLSelectElement.h
rename to WebCore/html/HTMLSelectElement.h

diff --git a/WebCore/khtml/html/HTMLTextAreaElement.cpp b/WebCore/html/HTMLTextAreaElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLTextAreaElement.cpp
rename to WebCore/html/HTMLTextAreaElement.cpp
index 066dfa2b61199e196ae2cebaba4209f88a845dfd..11cef511e26e70b9c6baf01e70f4a77a736de455 100644 (file)
--- a/WebCore/khtml/html/HTMLTextAreaElement.cpp
+++ b/WebCore/html/HTMLTextAreaElement.cpp
@@ -32,7 +32,7 @@
 #include "Document.h"
 
 #include "EventNames.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/HTMLTextAreaElement.h b/WebCore/html/HTMLTextAreaElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLTextAreaElement.h
rename to WebCore/html/HTMLTextAreaElement.h

diff --git a/WebCore/khtml/html/HTMLTextFieldInnerElement.cpp b/WebCore/html/HTMLTextFieldInnerElement.cpp
similarity index 99%
rename from WebCore/khtml/html/HTMLTextFieldInnerElement.cpp
rename to WebCore/html/HTMLTextFieldInnerElement.cpp
index 35d9c1047734d3455da9392794c2a37ca33892a4..e9519d0658c2f28e0f55159b43c97d47cb8589fc 100644 (file)
--- a/WebCore/khtml/html/HTMLTextFieldInnerElement.cpp
+++ b/WebCore/html/HTMLTextFieldInnerElement.cpp
@@ -31,7 +31,7 @@
 #include "dom2_eventsimpl.h"
 #include "HTMLDocument.h"
 #include "HTMLInputElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderObject.h"
 #include "RenderTextField.h"
 

diff --git a/WebCore/khtml/html/HTMLTextFieldInnerElement.h b/WebCore/html/HTMLTextFieldInnerElement.h
similarity index 100%
rename from WebCore/khtml/html/HTMLTextFieldInnerElement.h
rename to WebCore/html/HTMLTextFieldInnerElement.h

diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
similarity index 99%
rename from WebCore/khtml/html/htmltokenizer.cpp
rename to WebCore/html/HTMLTokenizer.cpp
index bfb19a8b4b371a72904181e0381c6b81dae54665..78a7e57ef718a665ed726d6fcb08e2bda1a93a9f 100644 (file)
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -26,7 +26,7 @@
 */
 
 #include "config.h"
-#include "htmltokenizer.h"
+#include "HTMLTokenizer.h"
 
 #include "CachedScript.h"
 #include "DocLoader.h"
@@ -38,8 +38,8 @@
 #include "SystemTime.h"
 #include "csshelper.h"
 #include "HTMLDocument.h"
-#include "htmlnames.h"
-#include "htmlparser.h"
+#include "HTMLNames.h"
+#include "HTMLParser.h"
 #include "kjs_proxy.h"
 #include <ctype.h>
 #include <stdlib.h>

diff --git a/WebCore/khtml/html/htmltokenizer.h b/WebCore/html/HTMLTokenizer.h
similarity index 100%
rename from WebCore/khtml/html/htmltokenizer.h
rename to WebCore/html/HTMLTokenizer.h

diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/html/html_baseimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_baseimpl.cpp
rename to WebCore/html/html_baseimpl.cpp
index 40e9b77b346fe3009634721ffed2dae1e5584c7a..a63692af4ed650930c6a5d1ec9b8fc6e54d8e9d5 100644 (file)
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/html/html_baseimpl.cpp
@@ -41,7 +41,7 @@
 #include "CSSValueKeywords.h"
 #include "dom2_eventsimpl.h"
 #include "HTMLDocument.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "loader.h"
 #include "render_frames.h"
 

diff --git a/WebCore/khtml/html/html_baseimpl.h b/WebCore/html/html_baseimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_baseimpl.h
rename to WebCore/html/html_baseimpl.h

diff --git a/WebCore/khtml/html/html_blockimpl.cpp b/WebCore/html/html_blockimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_blockimpl.cpp
rename to WebCore/html/html_blockimpl.cpp
index 47c1123c61020bf4f14de74f2ffa908e0b7b0236..ed8e5e79981fc2eeb9f50917c6647788cae1a7d1 100644 (file)
--- a/WebCore/khtml/html/html_blockimpl.cpp
+++ b/WebCore/html/html_blockimpl.cpp
@@ -29,7 +29,7 @@
 
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/html_blockimpl.h b/WebCore/html/html_blockimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_blockimpl.h
rename to WebCore/html/html_blockimpl.h

diff --git a/WebCore/khtml/html/html_headimpl.cpp b/WebCore/html/html_headimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_headimpl.cpp
rename to WebCore/html/html_headimpl.cpp
index 88b722e779f2a4e4090054e3949668c57cc85fcd..7c9925e456b73a1edde910bbc9299669868024fe 100644 (file)
--- a/WebCore/khtml/html/html_headimpl.cpp
+++ b/WebCore/html/html_headimpl.cpp
@@ -38,7 +38,7 @@
 #include "csshelper.h"
 #include "cssstyleselector.h"
 #include "HTMLDocument.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "kjs_proxy.h"
 
 namespace WebCore {

diff --git a/WebCore/khtml/html/html_headimpl.h b/WebCore/html/html_headimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_headimpl.h
rename to WebCore/html/html_headimpl.h

diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/html/html_imageimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_imageimpl.cpp
rename to WebCore/html/html_imageimpl.cpp
index 6b4b50903eb0254a121a890a3287a3fd98e97a17..a8c867d0434a12e0e269a23796628b0f81414e65 100644 (file)
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/html/html_imageimpl.cpp
@@ -33,7 +33,7 @@
 #include "CSSValueKeywords.h"
 #include "HTMLDocument.h"
 #include "RenderImage.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/html_imageimpl.h b/WebCore/html/html_imageimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_imageimpl.h
rename to WebCore/html/html_imageimpl.h

diff --git a/WebCore/khtml/html/html_inlineimpl.cpp b/WebCore/html/html_inlineimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_inlineimpl.cpp
rename to WebCore/html/html_inlineimpl.cpp
index f18a2616ebfe04a9b37c3ae092e35bdda9a8a798..eccec786bde2cdb4daca71d51e2e419a9c096920 100644 (file)
--- a/WebCore/khtml/html/html_inlineimpl.cpp
+++ b/WebCore/html/html_inlineimpl.cpp
@@ -24,7 +24,7 @@
 // -------------------------------------------------------------------------
 
 #include "config.h"
-#include "html/html_inlineimpl.h"
+#include "html_inlineimpl.h"
 
 #include "EventNames.h"
 #include "Frame.h"
@@ -36,7 +36,7 @@
 #include "dom2_eventsimpl.h"
 #include "HTMLDocument.h"
 #include "html_imageimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderFlow.h"
 #include "RenderImage.h"
 #include "rendering/RenderBR.h"

diff --git a/WebCore/khtml/html/html_inlineimpl.h b/WebCore/html/html_inlineimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_inlineimpl.h
rename to WebCore/html/html_inlineimpl.h

diff --git a/WebCore/khtml/html/html_listimpl.cpp b/WebCore/html/html_listimpl.cpp
similarity index 100%
rename from WebCore/khtml/html/html_listimpl.cpp
rename to WebCore/html/html_listimpl.cpp

diff --git a/WebCore/khtml/html/html_listimpl.h b/WebCore/html/html_listimpl.h
similarity index 99%
rename from WebCore/khtml/html/html_listimpl.h
rename to WebCore/html/html_listimpl.h
index 2bc99bbd2c3bfebd45ce9b07c1c6cfea28df0a59..c3a9645ef1f100cc6ed89f883dd9a2b2c8aede9e 100644 (file)
--- a/WebCore/khtml/html/html_listimpl.h
+++ b/WebCore/html/html_listimpl.h
@@ -29,7 +29,7 @@
  */
 
 #include "HTMLElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore
 {

diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/html/html_objectimpl.cpp
similarity index 99%
rename from WebCore/khtml/html/html_objectimpl.cpp
rename to WebCore/html/html_objectimpl.cpp
index 2153a394410758dcfa33897bf89495a3cc89059a..7885125542d851a5d432c10a27e33e53d4e690b8 100644 (file)
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/html/html_objectimpl.cpp
@@ -42,7 +42,7 @@
 #include "RenderImage.h"
 #include <java/kjavaappletwidget.h>
 #include <DeprecatedString.h>
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/khtml/html/html_objectimpl.h b/WebCore/html/html_objectimpl.h
similarity index 100%
rename from WebCore/khtml/html/html_objectimpl.h
rename to WebCore/html/html_objectimpl.h

diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/html/html_tableimpl.cpp
similarity index 100%
rename from WebCore/khtml/html/html_tableimpl.cpp
rename to WebCore/html/html_tableimpl.cpp

diff --git a/WebCore/khtml/html/html_tableimpl.h b/WebCore/html/html_tableimpl.h
similarity index 99%
rename from WebCore/khtml/html/html_tableimpl.h
rename to WebCore/html/html_tableimpl.h
index 648a27273ee85960b0d3ee6a136eccd0242bc57f..22897fb080fb6a3f4e9625a7a043acef214b3e16 100644 (file)
--- a/WebCore/khtml/html/html_tableimpl.h
+++ b/WebCore/html/html_tableimpl.h
@@ -29,7 +29,7 @@
 #define HTMLTableElementImpl_H
 
 #include "HTMLElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/kcanvas/KCanvasTreeDebug.cpp b/WebCore/kcanvas/KCanvasTreeDebug.cpp
index c5990fe5819efe9221e0e19e2e57702cc7819709..42eb384a4c95f5043fe1782994f8c10ac98455ae 100644 (file)
--- a/WebCore/kcanvas/KCanvasTreeDebug.cpp
+++ b/WebCore/kcanvas/KCanvasTreeDebug.cpp
@@ -53,7 +53,7 @@
 
 #include "PlatformString.h"
 #include "AtomicString.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 #include <qtextstream.h>
 #include "FloatSize.h"

diff --git a/WebCore/khtml/ecma/JSDOMParser.cpp b/WebCore/khtml/ecma/JSDOMParser.cpp
index d5d2d35b3d99427498b669465284518548893a1a..ade558b3137c06de05a950935eeac50bc5c61ea5 100644 (file)
--- a/WebCore/khtml/ecma/JSDOMParser.cpp
+++ b/WebCore/khtml/ecma/JSDOMParser.cpp
@@ -22,7 +22,7 @@
 #include "JSDOMParser.h"
 #include "JSDOMParser.lut.h"
 
-#include "html/HTMLDocument.h"
+#include "HTMLDocument.h"
 #include "DOMImplementation.h"
 
 using namespace WebCore;

diff --git a/WebCore/khtml/ecma/kjs_css.cpp b/WebCore/khtml/ecma/kjs_css.cpp
index f677583e0af74e271d617b8187b915428c72eb54..e32997e47d015e9e1fc971ffda6e8539b13e6d7c 100644 (file)
--- a/WebCore/khtml/ecma/kjs_css.cpp
+++ b/WebCore/khtml/ecma/kjs_css.cpp
@@ -28,9 +28,9 @@
 #include "css/css_stylesheetimpl.h"
 #include "css/css_valueimpl.h"
 #include "Document.h"
-#include "html/html_headimpl.h" // for HTMLStyleElement
+#include "html_headimpl.h" // for HTMLStyleElement
 #include "kjs_dom.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 #include "kjs_css.lut.h"
 

diff --git a/WebCore/khtml/ecma/kjs_dom.cpp b/WebCore/khtml/ecma/kjs_dom.cpp
index 1d1e107b22bf5974cbd8236e4b68cd303f92363d..0929a352922ceb975a012cdb1ff2de43b4d3b823 100644 (file)
--- a/WebCore/khtml/ecma/kjs_dom.cpp
+++ b/WebCore/khtml/ecma/kjs_dom.cpp
@@ -45,7 +45,7 @@
 #include "dom_xmlimpl.h"
 #include "HTMLDocument.h"
 #include "html_objectimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "khtml_settings.h"
 #include "kjs_css.h"
 #include "kjs_events.h"

diff --git a/WebCore/khtml/ecma/kjs_events.cpp b/WebCore/khtml/ecma/kjs_events.cpp
index abde5c43217021bcebc638c8affa884ff0560571..dcafae8b0179eb055644bddd9eeeb9a537c63ba4 100644 (file)
--- a/WebCore/khtml/ecma/kjs_events.cpp
+++ b/WebCore/khtml/ecma/kjs_events.cpp
@@ -29,8 +29,8 @@
 #include "JSWheelEvent.h"
 #include "dom2_eventsimpl.h"
 #include "AbstractView.h"
-#include "html/html_imageimpl.h"
-#include "htmlnames.h"
+#include "html_imageimpl.h"
+#include "HTMLNames.h"
 #include "kjs_proxy.h"
 #include "kjs_views.h"
 #include "kjs_window.h"

diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index 1d91d6e7d5fab1e44da4a898f39d96a45b81a859..675277ee23cbdb6d0a7803f16280f0aac49f15e7 100644 (file)
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "decoder.h"
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <ctype.h>
 #include <kxmlcore/Assertions.h>
 #include <qregexp.h>

diff --git a/WebCore/khtml/xsl/XSLStyleSheet.cpp b/WebCore/khtml/xsl/XSLStyleSheet.cpp
index 46f8f05d5a6746fcf891c0eb29345f692a016eec..1203948fbb50064cb19bc0e5e3970d104d102714 100644 (file)
--- a/WebCore/khtml/xsl/XSLStyleSheet.cpp
+++ b/WebCore/khtml/xsl/XSLStyleSheet.cpp
@@ -25,7 +25,7 @@
 
 #include "PlatformString.h"
 
-#include "html/HTMLDocument.h"
+#include "HTMLDocument.h"
 #include "loader.h"
 #include "CachedXSLStyleSheet.h"
 #include "DocLoader.h"

diff --git a/WebCore/khtml/xsl/XSLTProcessor.cpp b/WebCore/khtml/xsl/XSLTProcessor.cpp
index 34c4a136eee3f0bc217538c920d2febd233d22f1..8c436537b20580841cda7b4f97348bacef00b072 100644 (file)
--- a/WebCore/khtml/xsl/XSLTProcessor.cpp
+++ b/WebCore/khtml/xsl/XSLTProcessor.cpp
@@ -27,7 +27,7 @@
 #include "XSLStyleSheet.h"
 #include "xml_tokenizer.h"
 #include "Text.h"
-#include "htmltokenizer.h"
+#include "HTMLTokenizer.h"
 #include "HTMLDocument.h"
 #include "DOMImplementation.h"
 #include "loader.h"

diff --git a/WebCore/ksvg2/misc/SVGImageLoader.h b/WebCore/ksvg2/misc/SVGImageLoader.h
index f2d5c0fee1f13e4f55e91c25b1d13644ca7865b2..1c089299cddd1fa61e7d3fc60111b70f5ed9f15b 100644 (file)
--- a/WebCore/ksvg2/misc/SVGImageLoader.h
+++ b/WebCore/ksvg2/misc/SVGImageLoader.h
@@ -23,7 +23,7 @@
 #define KSVG_SVGImageLoader_H
 #if SVG_SUPPORT
 
-#include "khtml/html/html_imageimpl.h"
+#include "html_imageimpl.h"
 
 namespace WebCore
 {

diff --git a/WebCore/ksvg2/svg/SVGElement.cpp b/WebCore/ksvg2/svg/SVGElement.cpp
index b206d5642d01615b5145cbc256306a28ac76c5ff..e7ee3143daaa9c9315a2e9cd0f7773e011504854 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGElement.cpp
@@ -31,7 +31,7 @@
 #include "SVGNames.h"
 #include "SVGSVGElement.h"
 #include "css_stylesheetimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "ksvg.h"
 #include "PlatformString.h"
 #include <kdom/Namespace.h>

diff --git a/WebCore/ksvg2/svg/SVGSVGElement.cpp b/WebCore/ksvg2/svg/SVGSVGElement.cpp
index 906bcda81ece094e0675e0f603c118eecce4cc98..2acadc017e5db70c97601d06af7fea98f6ea3683 100644 (file)
--- a/WebCore/ksvg2/svg/SVGSVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGSVGElement.cpp
@@ -49,7 +49,7 @@
 #include "SVGZoomEvent.h"
 #include "StringImpl.h"
 #include "CSSPropertyNames.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "ksvg.h"
 #include <kcanvas/KCanvas.h>
 #include <kcanvas/KCanvasContainer.h>

diff --git a/WebCore/kwq/WebCoreAXObject.mm b/WebCore/kwq/WebCoreAXObject.mm
index 2456cb55da5343fa2f63e0f179961b89438eecd8..a7ee61e6c8e7b848a51ca70daca603c1754d128d 100644 (file)
--- a/WebCore/kwq/WebCoreAXObject.mm
+++ b/WebCore/kwq/WebCoreAXObject.mm
@@ -63,7 +63,7 @@
 #import "visible_units.h"
 #import "DOMInternal.h"
 #import "EventNames.h"
-#import "htmlnames.h"
+#import "HTMLNames.h"
 
 using namespace WebCore;
 using namespace EventNames;

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index cb7d48ca85a3a6c74fec9a7ad15e94023f41967c..7d6a356d8f8dff374955ccd0714f8512f0d41326 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -64,7 +64,7 @@
 #include "html_imageimpl.h"
 #include "html_objectimpl.h"
 #include "htmlediting.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "khtml_settings.h"
 #include "kjs_proxy.h"
 #include "kjs_window.h"

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 9352ced188dcc98115955333ff74a4d9c082ccd9..55230fdc1154e23e758c8840b8938d0c2ede72bf 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -42,7 +42,7 @@
 #include "dom2_eventsimpl.h"
 #include "HTMLDocument.h"
 #include "html_inlineimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "khtml_settings.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 127e3c334117b9c94cd1dc0064e8b80d0edaa359..dc44fb4de34233e4e2082232ddf7d1fc2f08f6aa 100644 (file)
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -33,7 +33,7 @@
 #include "RenderTextFragment.h"
 #include "SelectionController.h"
 #include "VisiblePosition.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderCanvas.h"
 #include "RenderTheme.h"
 #include <qtextstream.h>

diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index ce636c35885af4d7ef3e6b9151eeeb9362cec413..b38c18eb675cbf0774ce0b4415ff2217302323ff 100644 (file)
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -33,7 +33,7 @@
 #include "GraphicsContext.h"
 #include "HTMLElement.h"
 #include "RenderTableCell.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"
 #include "RenderFlexibleBox.h"

diff --git a/WebCore/rendering/RenderFlow.cpp b/WebCore/rendering/RenderFlow.cpp
index a414572d74c5a0e5935deada91a62a7442424db8..e1b818ab42ea585dd5107cd41f1d71360cbf5c49 100644 (file)
--- a/WebCore/rendering/RenderFlow.cpp
+++ b/WebCore/rendering/RenderFlow.cpp
@@ -29,7 +29,7 @@
 #include "GraphicsContext.h"
 #include "InlineTextBox.h"
 #include "RenderBlock.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"
 #include "RenderInline.h"

diff --git a/WebCore/rendering/RenderHTMLCanvas.cpp b/WebCore/rendering/RenderHTMLCanvas.cpp
index 07ca119bb1cb87c373e0de0bbaa86e4846fa3484..d298534ce86d5a202d91aeb692997295b955b23d 100644 (file)
--- a/WebCore/rendering/RenderHTMLCanvas.cpp
+++ b/WebCore/rendering/RenderHTMLCanvas.cpp
@@ -33,7 +33,7 @@
 #include "Document.h"
 #include "GraphicsContext.h"
 #include "HTMLCanvasElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/rendering/RenderImage.cpp b/WebCore/rendering/RenderImage.cpp
index f309d5194323a8c7a76468eb656d4e84f3673cdb..2b1a3e5ac00a97de7ae6b4d8ec58fb9160966153 100644 (file)
--- a/WebCore/rendering/RenderImage.cpp
+++ b/WebCore/rendering/RenderImage.cpp
@@ -33,7 +33,7 @@
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
 #include "html_imageimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderCanvas.h"
 
 namespace WebCore {

diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index 295df476d7ce4099efba9b28090281b4dd8368b7..82bf1925fc5209cfc421c8831b6b539cd00a0947 100644 (file)
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -51,7 +51,7 @@
 #include "GraphicsContext.h"
 #include "dom2_eventsimpl.h"
 #include "html_blockimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"
 #include "RenderInline.h"

diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 5daa263582101c2819a3750a90b9c35cf38bf93d..fc7d4b30af3c4060e3e63449d754b801394f0db5 100644 (file)
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -45,7 +45,7 @@
 #include "dom2_eventsimpl.h"
 #include "dom_elementimpl.h"
 #include "Position.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"
 #include "RenderFlexibleBox.h"

diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index 55d5136eb6b3e498d2db4065a9782f99645638d5..744b9c4449cd6c550711598a9e86da954228cf54 100644 (file)
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -33,7 +33,7 @@
 #include "RenderTableCell.h"
 #include "Document.h"
 #include "table_layout.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <qtextstream.h>
 
 namespace WebCore {

diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp
index 77212c0fd0ba1f83716a5587af5136c5ccb5c931..c4a5e2983775a4cfe36d0db62de22235f61c0172 100644 (file)
--- a/WebCore/rendering/RenderTableCell.cpp
+++ b/WebCore/rendering/RenderTableCell.cpp
@@ -30,7 +30,7 @@
 #include "GraphicsContext.h"
 #include "RenderTableCol.h"
 #include "html_tableimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <qtextstream.h>
 
 namespace WebCore {

diff --git a/WebCore/rendering/RenderTableCol.cpp b/WebCore/rendering/RenderTableCol.cpp
index 8ffeb8bdeca44f2a9371d117f62ca0163fdb74b8..249b5bff43c9ed57386c23b1f826cddcc26073ed 100644 (file)
--- a/WebCore/rendering/RenderTableCol.cpp
+++ b/WebCore/rendering/RenderTableCol.cpp
@@ -28,7 +28,7 @@
 #include "RenderTableCol.h"
 
 #include "html_tableimpl.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <qtextstream.h>
 
 namespace WebCore {

diff --git a/WebCore/rendering/RenderTableRow.cpp b/WebCore/rendering/RenderTableRow.cpp
index 0296e550ecfe2dd6b46b29711ba87ae10db4cf1f..9d4798ba8b0ba6556c2413aef0e319d72fa3b87b 100644 (file)
--- a/WebCore/rendering/RenderTableRow.cpp
+++ b/WebCore/rendering/RenderTableRow.cpp
@@ -28,7 +28,7 @@
 #include "RenderTableRow.h"
 #include "RenderTableCell.h"
 #include "Document.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/rendering/RenderTableSection.cpp b/WebCore/rendering/RenderTableSection.cpp
index 51a646e64b10d44dc267fa84a965ed4941ffba74..9d36fd3769e87598ab439e99b47badee5ff5bcf1 100644 (file)
--- a/WebCore/rendering/RenderTableSection.cpp
+++ b/WebCore/rendering/RenderTableSection.cpp
@@ -31,7 +31,7 @@
 #include "RenderTableRow.h"
 #include "RenderTableCol.h"
 #include "Document.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include <qtextstream.h>
 
 namespace WebCore {

diff --git a/WebCore/rendering/RenderTextField.cpp b/WebCore/rendering/RenderTextField.cpp
index b5aa8291f51ed7f858684d3aa0ed18ce3406f4d9..b881e79345a3d8dc98fdfa8cb264869a44357d47 100644 (file)
--- a/WebCore/rendering/RenderTextField.cpp
+++ b/WebCore/rendering/RenderTextField.cpp
@@ -25,7 +25,7 @@
 #include "Document.h"
 #include "Frame.h"
 #include "RenderText.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "HTMLInputElement.h"
 #include "HTMLTextFieldInnerElement.h"
 #include "dom_elementimpl.h"

diff --git a/WebCore/rendering/RenderTheme.cpp b/WebCore/rendering/RenderTheme.cpp
index 3fec9f2bef3a66631ce20f44debc09931f613263..b435733e3091c0a1ce0e5ba8a23ff76500f52f87 100644 (file)
--- a/WebCore/rendering/RenderTheme.cpp
+++ b/WebCore/rendering/RenderTheme.cpp
@@ -25,7 +25,7 @@
 #include "Document.h"
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "render_style.h"
 
 // The methods in this file are shared by all themes on every platform.

diff --git a/WebCore/rendering/render_applet.cpp b/WebCore/rendering/render_applet.cpp
index 348ac9725eb0a043a7344bff059d08acf4808ee1..ad87ce9360df28d5d6175f8e7c739e4c5e2e10d3 100644 (file)
--- a/WebCore/rendering/render_applet.cpp
+++ b/WebCore/rendering/render_applet.cpp
@@ -29,7 +29,7 @@
 #include "html_objectimpl.h"
 #include "java/kjavaappletwidget.h"
 #include "RenderCanvas.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/rendering/render_button.cpp b/WebCore/rendering/render_button.cpp
index 32bc75c36e03504a3553a27c0153591727bd1039..ebdb338ac4a2edb7e3142b63719b3b29b5e0d8ed 100644 (file)
--- a/WebCore/rendering/render_button.cpp
+++ b/WebCore/rendering/render_button.cpp
@@ -27,7 +27,7 @@
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
 #include "RenderText.h"
-#include "htmlnames.h"
+#include "HTMLNames.h"
 
 namespace WebCore {
 

diff --git a/WebCore/rendering/render_frames.cpp b/WebCore/rendering/render_frames.cpp
index e9a547eab794e0ba737b6d318108a0295b49069e..d526b759054fee9a1419bbf11399f6e86997f175 100644 (file)
--- a/WebCore/rendering/render_frames.cpp
+++ b/WebCore/rendering/render_frames.cpp
@@ -38,8 +38,8 @@
 #include "dom2_eventsimpl.h"
 #include "html_baseimpl.h"
 #include "html_objectimpl.h"
-#include "htmlnames.h"
-#include "htmltokenizer.h"
+#include "HTMLNames.h"
+#include "HTMLTokenizer.h"
 #include "RenderArena.h"
 #include "RenderCanvas.h"
 #include <qtextstream.h>

diff --git a/WebCore/rendering/render_list.cpp b/WebCore/rendering/render_list.cpp
index a9f570f19d053ffdee5a6bc0b935a03a30befb97..5695fcd19eeb99c35f1243116d944fa9085579ac 100644 (file)
--- a/WebCore/rendering/render_list.cpp
+++ b/WebCore/rendering/render_list.cpp
@@ -32,7 +32,7 @@
 #include "Document.h"
 #include "CachedImage.h"
 
-#include "htmlnames.h"
+#include "HTMLNames.h"
 #include "html_listimpl.h"
 
 namespace WebCore {