Changeset 90849 in webkit

Timestamp:

Jul 12, 2011 2:20:35 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

Isolate HTMLTextFormControlElement into a separate file
​https://bugs.webkit.org/show_bug.cgi?id=64381

Reviewed by Dimitri Glazkov.

Extracted HTMLTextFormControlElement.h and HTMLTextFormControlElement.cpp out of
HTMLFormControlElement.h and HTMLFormControlElement.cpp.

Also moved defaultEventHandler from HTMLFormControlElementWithState to HTMLTextFormControlElement
because it was specific to HTMLTextFormControlElement, and replaced all references to
HTMLFormControlElementWithState in HTMLInputElement and HTMLTextAreaElement by ones to
HTMLTextFormControlElement.

• CMakeLists.txt:
• GNUmakefile.list.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• editing/TextIterator.cpp:
• editing/htmlediting.cpp:
• html/HTMLElementsAllInOne.cpp:
• html/HTMLFormControlElement.cpp:

(WebCore::HTMLFormControlElement::isFocusable):

• html/HTMLFormControlElement.h:
• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::isKeyboardFocusable):
(WebCore::HTMLInputElement::isMouseFocusable):
(WebCore::HTMLInputElement::updateFocusAppearance):
(WebCore::HTMLInputElement::canStartSelection):
(WebCore::HTMLInputElement::parseMappedAttribute):
(WebCore::HTMLInputElement::finishParsingChildren):
(WebCore::HTMLInputElement::rendererIsNeeded):
(WebCore::HTMLInputElement::attach):
(WebCore::HTMLInputElement::detach):
(WebCore::HTMLInputElement::copyNonAttributeProperties):
(WebCore::HTMLInputElement::defaultEventHandler):
(WebCore::HTMLInputElement::willMoveToNewOwnerDocument):
(WebCore::HTMLInputElement::didMoveToNewOwnerDocument):
(WebCore::HTMLInputElement::addSubresourceAttributeURLs):
(WebCore::HTMLInputElement::recalcWillValidate):

• html/HTMLInputElement.h:
• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::defaultEventHandler):

• html/HTMLTextAreaElement.h:
• html/HTMLTextFormControlElement.cpp: Copied from Source/WebCore/html/HTMLFormControlElement.cpp.

(WebCore::HTMLTextFormControlElement::defaultEventHandler):

• html/HTMLTextFormControlElement.h: Copied from Source/WebCore/html/HTMLFormControlElement.h.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• WebCore.gypi (modified) (2 diffs)
• WebCore.pro (modified) (2 diffs)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (45 diffs)
• editing/TextIterator.cpp (modified) (1 diff)
• editing/htmlediting.cpp (modified) (1 diff)
• html/HTMLElementsAllInOne.cpp (modified) (1 diff)
• html/HTMLFormControlElement.cpp (modified) (4 diffs)
• html/HTMLFormControlElement.h (modified) (3 diffs)
• html/HTMLInputElement.cpp (modified) (15 diffs)
• html/HTMLInputElement.h (modified) (1 diff)
• html/HTMLTextAreaElement.cpp (modified) (1 diff)
• html/HTMLTextAreaElement.h (modified) (1 diff)
• html/HTMLTextFormControlElement.cpp (copied) (copied from trunk/Source/WebCore/html/HTMLFormControlElement.cpp) (4 diffs)
• html/HTMLTextFormControlElement.h (copied) (copied from trunk/Source/WebCore/html/HTMLFormControlElement.h) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -775 +775 @@
     html/HTMLTableSectionElement.cpp
     html/HTMLTextAreaElement.cpp
+    html/HTMLTextFormControlElement.cpp
     html/HTMLTitleElement.cpp
     html/HTMLUListElement.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Isolate HTMLTextFormControlElement into a separate file
+        https://bugs.webkit.org/show_bug.cgi?id=64381
+
+        Reviewed by Dimitri Glazkov.
+
+        Extracted HTMLTextFormControlElement.h and HTMLTextFormControlElement.cpp out of
+        HTMLFormControlElement.h and HTMLFormControlElement.cpp.
+
+        Also moved defaultEventHandler from HTMLFormControlElementWithState to HTMLTextFormControlElement
+        because it was specific to HTMLTextFormControlElement, and replaced all references to
+        HTMLFormControlElementWithState in HTMLInputElement and HTMLTextAreaElement by ones to
+        HTMLTextFormControlElement.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * editing/TextIterator.cpp:
+        * editing/htmlediting.cpp:
+        * html/HTMLElementsAllInOne.cpp:
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::HTMLFormControlElement::isFocusable):
+        * html/HTMLFormControlElement.h:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::isKeyboardFocusable):
+        (WebCore::HTMLInputElement::isMouseFocusable):
+        (WebCore::HTMLInputElement::updateFocusAppearance):
+        (WebCore::HTMLInputElement::canStartSelection):
+        (WebCore::HTMLInputElement::parseMappedAttribute):
+        (WebCore::HTMLInputElement::finishParsingChildren):
+        (WebCore::HTMLInputElement::rendererIsNeeded):
+        (WebCore::HTMLInputElement::attach):
+        (WebCore::HTMLInputElement::detach):
+        (WebCore::HTMLInputElement::copyNonAttributeProperties):
+        (WebCore::HTMLInputElement::defaultEventHandler):
+        (WebCore::HTMLInputElement::willMoveToNewOwnerDocument):
+        (WebCore::HTMLInputElement::didMoveToNewOwnerDocument):
+        (WebCore::HTMLInputElement::addSubresourceAttributeURLs):
+        (WebCore::HTMLInputElement::recalcWillValidate):
+        * html/HTMLInputElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::defaultEventHandler):
+        * html/HTMLTextAreaElement.h:
+        * html/HTMLTextFormControlElement.cpp: Copied from Source/WebCore/html/HTMLFormControlElement.cpp.
+        (WebCore::HTMLTextFormControlElement::defaultEventHandler):
+        * html/HTMLTextFormControlElement.h: Copied from Source/WebCore/html/HTMLFormControlElement.h.
+
 2011-07-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -1777 +1777 @@
         Source/WebCore/html/HTMLTextAreaElement.cpp \
         Source/WebCore/html/HTMLTextAreaElement.h \
+        Source/WebCore/html/HTMLTextFormControlElement.cpp \
+        Source/WebCore/html/HTMLTextFormControlElement.h \
         Source/WebCore/html/HTMLTitleElement.cpp \
         Source/WebCore/html/HTMLTitleElement.h \

trunk/Source/WebCore/WebCore.gypi

@@ -620 +620 @@
             'html/HTMLTablePartElement.h',
             'html/HTMLTextAreaElement.h',
+            'html/HTMLTextFormControlElement.h',
             'html/InputType.h',
             'html/VoidCallback.h',
@@ -3021 +3022 @@
             'html/HTMLTableSectionElement.h',
             'html/HTMLTextAreaElement.cpp',
+            'html/HTMLTextFormControlElement.cpp',
             'html/HTMLTitleElement.cpp',
             'html/HTMLTitleElement.h',

trunk/Source/WebCore/WebCore.pro

@@ -733 +733 @@
     html/HTMLTableSectionElement.cpp \
     html/HTMLTextAreaElement.cpp \
+    html/HTMLTextFormControlElement.cpp \
     html/HTMLTitleElement.cpp \
     html/HTMLUListElement.cpp \
@@ -1726 +1727 @@
     html/HTMLTableSectionElement.h \
     html/HTMLTextAreaElement.h \
+    html/HTMLTextFormControlElement.h \
     html/HTMLTitleElement.h \
     html/HTMLTrackElement.h \

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

@@ -56919 +56919 @@
                         </File>
                         <File
+                                RelativePath="..\html\HTMLTextFormControlElement.cpp"
+                                >
+                                <FileConfiguration
+                                        Name="Debug|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug_Cairo_CFLite|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release_Cairo_CFLite|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug_All|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Production|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="..\html\HTMLTextFormControlElement.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\html\HTMLTitleElement.cpp"
                                 >

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

@@ -3218 +3218 @@
                 9BAB6C6D12550631001626D4 /* EditingStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BAB6C6B12550631001626D4 /* EditingStyle.cpp */; };
                 9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BAF3B2312C1A39800014BF1 /* WritingDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                9BC6C21B13CCC97B008E0337 /* HTMLTextFormControlElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BC6C21913CCC97B008E0337 /* HTMLTextFormControlElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                9BC6C21C13CCC97B008E0337 /* HTMLTextFormControlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BC6C21A13CCC97B008E0337 /* HTMLTextFormControlElement.cpp */; };
                 9BD0BF9312A42BF50072FD43 /* ScopedEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9BD0BF9112A42BF50072FD43 /* ScopedEventQueue.h */; };
                 9BD0BF9412A42BF50072FD43 /* ScopedEventQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BD0BF9212A42BF50072FD43 /* ScopedEventQueue.cpp */; };
@@ -9741 +9743 @@
                 9BAB6C6B12550631001626D4 /* EditingStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditingStyle.cpp; sourceTree = "<group>"; };
                 9BAF3B2312C1A39800014BF1 /* WritingDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritingDirection.h; sourceTree = "<group>"; };
+                9BC6C21913CCC97B008E0337 /* HTMLTextFormControlElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTextFormControlElement.h; sourceTree = "<group>"; };
+                9BC6C21A13CCC97B008E0337 /* HTMLTextFormControlElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLTextFormControlElement.cpp; sourceTree = "<group>"; };
                 9BD0BF9112A42BF50072FD43 /* ScopedEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScopedEventQueue.h; sourceTree = "<group>"; };
                 9BD0BF9212A42BF50072FD43 /* ScopedEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScopedEventQueue.cpp; sourceTree = "<group>"; };
@@ -12716 +12720 @@
                         isa = PBXGroup;
                         children = (
+                                00CA93B413C6697C00F7FE95 /* NewXMLDocumentParser.cpp */,
+                                00CA93B113C6691600F7FE95 /* NewXMLDocumentParser.h */,
                                 00B9318113BA867F0035A948 /* XMLDocumentParser.cpp */,
                                 00B9318213BA867F0035A948 /* XMLDocumentParser.h */,
@@ -12721 +12727 @@
                                 00B9318513BA867F0035A948 /* XMLDocumentParserScope.cpp */,
                                 00B9318613BA867F0035A948 /* XMLDocumentParserScope.h */,
-                                00CA93B113C6691600F7FE95 /* NewXMLDocumentParser.h */,
-                                00CA93B413C6697C00F7FE95 /* NewXMLDocumentParser.cpp */,
                         );
                         path = parser;
@@ -13687 +13691 @@
                         isa = PBXGroup;
                         children = (
+                                41815C1B138319630057AAA4 /* js */,
                                 B1AD4E7713A12A7200846B27 /* track */,
+                                B1AD4E4B13A12A0B00846B27 /* CueIndex.cpp */,
+                                B1AD4E4C13A12A0B00846B27 /* CueIndex.h */,
                                 B1AD4E7113A12A4600846B27 /* CueLoader.cpp */,
                                 B1AD4E7213A12A4600846B27 /* CueLoader.h */,
-                                B1AD4E4B13A12A0B00846B27 /* CueIndex.cpp */,
-                                B1AD4E4C13A12A0B00846B27 /* CueIndex.h */,
+                                417DA4CF13734326007C57FB /* Internals.cpp */,
+                                417DA4CE13734326007C57FB /* Internals.h */,
+                                41813F9113818AD60057AAA4 /* Internals.idl */,
                                 B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */,
                                 B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */,
@@ -13702 +13710 @@
                                 B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */,
                                 B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */,
-                                41815C1B138319630057AAA4 /* js */,
-                                417DA4CF13734326007C57FB /* Internals.cpp */,
-                                417DA4CE13734326007C57FB /* Internals.h */,
-                                41813F9113818AD60057AAA4 /* Internals.idl */,
                         );
                         path = testing;
@@ -14316 +14320 @@
                         isa = PBXGroup;
                         children = (
-                                CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */,
-                                CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */,
-                                CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */,
-                                CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */,
-                                CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */,
-                                CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */,
                                 51E1ECAD0C91C54600DC255B /* AutodrainedPool.mm */,
                                 65A640F00533BB1F0085E777 /* BlockExceptions.h */,
@@ -14386 +14384 @@
                                 E1A3162B134BC32D007C9A4F /* WebNSAttributedStringExtras.h */,
                                 E1A3162C134BC32D007C9A4F /* WebNSAttributedStringExtras.mm */,
+                                CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */,
+                                CD8203071395AB6A00F956C6 /* WebVideoFullscreenController.mm */,
+                                CD8203081395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.h */,
+                                CD8203091395AB6A00F956C6 /* WebVideoFullscreenHUDWindowController.mm */,
+                                CD82030E1395ACE700F956C6 /* WebWindowAnimation.h */,
+                                CD82030F1395ACE700F956C6 /* WebWindowAnimation.mm */,
                                 935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */,
                                 9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
@@ -16224 +16228 @@
                                 A81369BA097374F500D74463 /* HTMLTextAreaElement.h */,
                                 A80E7E160A1A7CCB007FB8C5 /* HTMLTextAreaElement.idl */,
+                                9BC6C21A13CCC97B008E0337 /* HTMLTextFormControlElement.cpp */,
+                                9BC6C21913CCC97B008E0337 /* HTMLTextFormControlElement.h */,
                                 A871DC1D0A15205700B12A68 /* HTMLTitleElement.cpp */,
                                 A871DC1C0A15205700B12A68 /* HTMLTitleElement.h */,
@@ -17453 +17459 @@
                                 08B35B16127B6A88005314DD /* SVGAnimatedNumberList.h */,
                                 B22277ED0D00BF1F0071B782 /* SVGAnimatedNumberList.idl */,
+                                431A2F9B13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp */,
                                 431A2F9A13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h */,
-                                431A2F9B13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp */,
                                 0863951313B5FE5700BB344D /* SVGAnimatedPath.cpp */,
                                 0863951413B5FE5700BB344D /* SVGAnimatedPath.h */,
+                                43B9336813B261B1004584BF /* SVGAnimatedPointList.cpp */,
                                 43B9336713B261B1004584BF /* SVGAnimatedPointList.h */,
-                                43B9336813B261B1004584BF /* SVGAnimatedPointList.cpp */,
                                 431A302013B89DCC007791E4 /* SVGAnimatedPreserveAspectRatio.cpp */,
                                 08FE0BC4127E2AC1000C4FB5 /* SVGAnimatedPreserveAspectRatio.h */,
@@ -18101 +18107 @@
                                 087E0AF513606D0B00FA4BA8 /* SVGGlyph.h */,
                                 930FC6891072B9280045293E /* TextRenderingMode.h */,
+                                376DCCE013B4F966002EBEFC /* TextRun.cpp */,
                                 A824B4640E2EF2EA0081A7B7 /* TextRun.h */,
-                                376DCCE013B4F966002EBEFC /* TextRun.cpp */,
                                 37C28A6710F659CC008C7813 /* TypesettingFeatures.h */,
                                 E4AFCFA40DAF29A300F5F55C /* UnitBezier.h */,
@@ -18734 +18740 @@
                                 089582530E857A7E00F82C83 /* ImageLoader.cpp */,
                                 089582540E857A7E00F82C83 /* ImageLoader.h */,
-                                984264EF12D5280A000D88A4 /* LinkLoaderClient.h */,
                                 98CE4325129E00BD005821DC /* LinkLoader.cpp */,
                                 98CE4329129E00E5005821DC /* LinkLoader.h */,
+                                984264EF12D5280A000D88A4 /* LinkLoaderClient.h */,
                                 93E227DC0AF589AD00D48324 /* MainResourceLoader.cpp */,
                                 656D37290ADBA5DE00A4554D /* MainResourceLoader.h */,
@@ -20184 +20190 @@
                                 49EECDE310503C2400099FAB /* ArrayBuffer.h in Headers */,
                                 49EECDE010503C2400099FAB /* ArrayBufferView.h in Headers */,
+                                FD5686CA13AC180200B69C68 /* AsyncAudioDecoder.h in Headers */,
                                 2EF1BFF7121CB0BD00C27627 /* AsyncFileStream.h in Headers */,
                                 89D08DA012228451001241DF /* AsyncFileSystem.h in Headers */,
@@ -20195 +20202 @@
                                 FD315FF712B0267600C1A359 /* AudioBasicProcessorNode.h in Headers */,
                                 FD315FF912B0267600C1A359 /* AudioBuffer.h in Headers */,
+                                FD5686CC13AC181400B69C68 /* AudioBufferCallback.h in Headers */,
                                 FD315FFC12B0267600C1A359 /* AudioBufferSourceNode.h in Headers */,
                                 FD31607C12B026F700C1A359 /* AudioBus.h in Headers */,
@@ -20428 +20436 @@
                                 6565815109D13043000E61D7 /* CSSValueKeywords.h in Headers */,
                                 A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
+                                B1AD4E5D13A12A0B00846B27 /* CueIndex.h in Headers */,
+                                B1AD4E7413A12A4600846B27 /* CueLoader.h in Headers */,
+                                B1AD4E7C13A12A7200846B27 /* CueParser.h in Headers */,
+                                B1AD4E7D13A12A7200846B27 /* CueParserPrivate.h in Headers */,
                                 93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                 BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
@@ -21406 +21418 @@
                                 A871DB250A150BD600B12A68 /* HTMLTableSectionElement.h in Headers */,
                                 A81369D6097374F600D74463 /* HTMLTextAreaElement.h in Headers */,
+                                9BC6C21B13CCC97B008E0337 /* HTMLTextFormControlElement.h in Headers */,
                                 A871DC280A15205700B12A68 /* HTMLTitleElement.h in Headers */,
                                 977B3878122883E900B81FF8 /* HTMLTokenizer.h in Headers */,
@@ -21509 +21522 @@
                                 4FA3B90B125CD12200300BAD /* InspectorState.h in Headers */,
                                 82AB1774125C826700C5069D /* InspectorStyleSheet.h in Headers */,
+                                82889B4D13C62392009A6156 /* InspectorStyleTextEditor.h in Headers */,
                                 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                 4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */,
@@ -21547 +21561 @@
                                 65DF31DB09D1C123000BE325 /* JSAttr.h in Headers */,
                                 FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */,
+                                FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */,
                                 FDA15EA012B03EE1003A583A /* JSAudioBufferSourceNode.h in Headers */,
                                 FDA15EA212B03EE1003A583A /* JSAudioChannelMerger.h in Headers */,
@@ -22060 +22075 @@
                                 85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
                                 2D9066070BE141D400956998 /* LayoutState.h in Headers */,
+                                BACF290113B2A0D500781F90 /* LayoutTypes.h in Headers */,
                                 512DD8F50D91E6AF000F89EE /* LegacyWebArchive.h in Headers */,
                                 BCE65BEB0EACDF16007E4533 /* Length.h in Headers */,
@@ -22072 +22088 @@
                                 84730D911248F0B300D3A9C9 /* LightSource.h in Headers */,
                                 B22279650D00BF220071B782 /* LinearGradientAttributes.h in Headers */,
+                                A5ABB78713B904BC00F197E3 /* LineBreakIteratorPoolICU.h in Headers */,
                                 AB31C91E10AE1B8E000C7B92 /* LineClampValue.h in Headers */,
                                 89B5EAA211E8003D00F2367E /* LineEnding.h in Headers */,
@@ -22077 +22094 @@
                                 98CE432A129E00E5005821DC /* LinkLoader.h in Headers */,
                                 984264F112D5280A000D88A4 /* LinkLoaderClient.h in Headers */,
+                                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
+                                B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */,
                                 656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */,
                                 7EE6846912D26E3800E79415 /* LoaderRunLoopCF.h in Headers */,
@@ -22155 +22174 @@
                                 93309DFC099E64920056E581 /* MoveSelectionCommand.h in Headers */,
                                 B12D234213560282002A28D4 /* MultipleTrackList.h in Headers */,
+                                B1AD4E6313A12A0B00846B27 /* MutableTextTrack.h in Headers */,
                                 85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */,
                                 A81872230977D3C0005826D9 /* NamedNodeMap.h in Headers */,
@@ -22534 +22554 @@
                                 B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */,
                                 1A4A954E0B4EDCCB002D8C3C /* SharedBuffer.h in Headers */,
+                                97B1F02F13B025D200F5103F /* SharedBufferChunkReader.h in Headers */,
                                 498770EB1242C535002226BA /* SharedGraphicsContext3D.h in Headers */,
                                 93309EA3099EB78C0056E581 /* SharedTimer.h in Headers */,
@@ -22624 +22645 @@
                                 BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */,
                                 A8C4A7FD09D563270003AC8D /* StyledElement.h in Headers */,
+                                BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
                                 AA4C3A770B2B1679002334A2 /* StyleElement.h in Headers */,
-                                BC5EB8B90E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h in Headers */,
                                 BCEF444A0E6745E0001C1287 /* StyleGeneratedImage.h in Headers */,
                                 BCEF43CF0E673DA1001C1287 /* StyleImage.h in Headers */,
@@ -22649 +22670 @@
                                 93B2D8160F9920D2006AE6B2 /* SuddenTermination.h in Headers */,
                                 97C078501165D5BE003A32EF /* SuffixTree.h in Headers */,
+                                087558C613B4A57D00F49307 /* SurrogatePairAwareTextIterator.h in Headers */,
                                 62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */,
                                 B22279740D00BF220071B782 /* SVGAElement.h in Headers */,
@@ -22656 +22678 @@
                                 087B84961272CEC800A14417 /* SVGAnimatedAngle.h in Headers */,
                                 085797091278394C00A8EC5F /* SVGAnimatedBoolean.h in Headers */,
+                                43A625F813B3304000AC94B8 /* SVGAnimatedColor.h in Headers */,
                                 08D46CE3127AD5FC0089694B /* SVGAnimatedEnumeration.h in Headers */,
                                 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */,
@@ -22664 +22687 @@
                                 08B35B13127B6A7C005314DD /* SVGAnimatedNumber.h in Headers */,
                                 08B35B17127B6A88005314DD /* SVGAnimatedNumberList.h in Headers */,
+                                431A2F9C13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h in Headers */,
+                                0863951613B5FE5700BB344D /* SVGAnimatedPath.h in Headers */,
                                 089A8E07128D8B3D00E7A534 /* SVGAnimatedPathSegListPropertyTearOff.h in Headers */,
+                                43B9336913B261B1004584BF /* SVGAnimatedPointList.h in Headers */,
                                 08FE0BC5127E2AC1000C4FB5 /* SVGAnimatedPreserveAspectRatio.h in Headers */,
                                 088A0E05126EF1DB00978F7A /* SVGAnimatedProperty.h in Headers */,
@@ -22683 +22709 @@
                                 B22279980D00BF220071B782 /* SVGAnimationElement.h in Headers */,
                                 439D334513A6911C00C20F4F /* SVGAnimatorFactory.h in Headers */,
+                                08FB3F8413BC754C0099FC18 /* SVGAttributeToPropertyMap.h in Headers */,
                                 B222799C0D00BF220071B782 /* SVGCircleElement.h in Headers */,
                                 B222799F0D00BF220071B782 /* SVGClipPathElement.h in Headers */,
@@ -22807 +22834 @@
                                 B2227A970D00BF220071B782 /* SVGPreserveAspectRatio.h in Headers */,
                                 088A0E0A126EF1DB00978F7A /* SVGProperty.h in Headers */,
+                                081DD49C13BA1A6000DC7627 /* SVGPropertyInfo.h in Headers */,
                                 088A0E0B126EF1DB00978F7A /* SVGPropertyTearOff.h in Headers */,
                                 088A0E0C126EF1DB00978F7A /* SVGPropertyTraits.h in Headers */,
@@ -22910 +22938 @@
                                 A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
                                 B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
+                                B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */,
+                                B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */,
+                                B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */,
                                 498770F11242C535002226BA /* Texture.h in Headers */,
                                 97BC84A512370DC8000C6161 /* TextViewSourceParser.h in Headers */,
@@ -23093 +23124 @@
                                 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
                                 FD537353137B651800008DCE /* ZeroPole.h in Headers */,
-                                985BB96E13A94058007A0B69 /* LinkRelAttribute.h in Headers */,
-                                FD5686CA13AC180200B69C68 /* AsyncAudioDecoder.h in Headers */,
-                                FD5686CC13AC181400B69C68 /* AudioBufferCallback.h in Headers */,
-                                FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */,
-                                B1AD4E5D13A12A0B00846B27 /* CueIndex.h in Headers */,
-                                B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */,
-                                B1AD4E6313A12A0B00846B27 /* MutableTextTrack.h in Headers */,
-                                B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */,
-                                B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */,
-                                B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */,
-                                B1AD4E7413A12A4600846B27 /* CueLoader.h in Headers */,
-                                B1AD4E7C13A12A7200846B27 /* CueParser.h in Headers */,
-                                B1AD4E7D13A12A7200846B27 /* CueParserPrivate.h in Headers */,
-                                97B1F02F13B025D200F5103F /* SharedBufferChunkReader.h in Headers */,
-                                BACF290113B2A0D500781F90 /* LayoutTypes.h in Headers */,
-                                43B9336913B261B1004584BF /* SVGAnimatedPointList.h in Headers */,
-                                43A625F813B3304000AC94B8 /* SVGAnimatedColor.h in Headers */,
-                                087558C613B4A57D00F49307 /* SurrogatePairAwareTextIterator.h in Headers */,
-                                0863951613B5FE5700BB344D /* SVGAnimatedPath.h in Headers */,
-                                431A2F9C13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.h in Headers */,
-                                A5ABB78713B904BC00F197E3 /* LineBreakIteratorPoolICU.h in Headers */,
-                                081DD49C13BA1A6000DC7627 /* SVGPropertyInfo.h in Headers */,
-                                08FB3F8413BC754C0099FC18 /* SVGAttributeToPropertyMap.h in Headers */,
-                                82889B4D13C62392009A6156 /* InspectorStyleTextEditor.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -23478 +23485 @@
                                 49EECDE210503C2400099FAB /* ArrayBuffer.cpp in Sources */,
                                 49EECDDF10503C2400099FAB /* ArrayBufferView.cpp in Sources */,
+                                FD5686C913AC180200B69C68 /* AsyncAudioDecoder.cpp in Sources */,
                                 89D08D9F12228451001241DF /* AsyncFileSystem.cpp in Sources */,
                                 A8C4A80E09D563270003AC8D /* Attr.cpp in Sources */,
@@ -23673 +23681 @@
                                 1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */,
                                 A80E6CE40A1989CA007FB8C5 /* CSSValueList.cpp in Sources */,
+                                B1AD4E5C13A12A0B00846B27 /* CueIndex.cpp in Sources */,
+                                B1AD4E7313A12A4600846B27 /* CueLoader.cpp in Sources */,
+                                B1AD4E7B13A12A7200846B27 /* CueParser.cpp in Sources */,
                                 E11AF15111B9A1A300805103 /* Cursor.cpp in Sources */,
                                 93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
@@ -24306 +24317 @@
                                 A871DB260A150BD600B12A68 /* HTMLTableSectionElement.cpp in Sources */,
                                 A81369D7097374F600D74463 /* HTMLTextAreaElement.cpp in Sources */,
+                                9BC6C21C13CCC97B008E0337 /* HTMLTextFormControlElement.cpp in Sources */,
                                 A871DC290A15205700B12A68 /* HTMLTitleElement.cpp in Sources */,
                                 977B3877122883E900B81FF8 /* HTMLTokenizer.cpp in Sources */,
@@ -24343 +24355 @@
                                 1A71D57B0F33819000F9CE4E /* IdentifierRep.cpp in Sources */,
                                 B275356F0B053814002CE64F /* Image.cpp in Sources */,
+                                43D2597713C816F400608559 /* ImageBuffer.cpp in Sources */,
                                 B2A10B940B3818D700099AA4 /* ImageBufferCG.cpp in Sources */,
                                 2292B27C1356669400CF11EF /* ImageBufferDataCG.cpp in Sources */,
@@ -24393 +24406 @@
                                 4FA3B90A125CD12200300BAD /* InspectorState.cpp in Sources */,
                                 82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
+                                82889B4C13C62392009A6156 /* InspectorStyleTextEditor.cpp in Sources */,
                                 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
                                 4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */,
@@ -24427 +24441 @@
                                 BC2ED6BC0C6BD2F000920BFF /* JSAttrCustom.cpp in Sources */,
                                 FDA15E9D12B03EE1003A583A /* JSAudioBuffer.cpp in Sources */,
+                                FDF7E9C313AC21DB00A51EAC /* JSAudioBufferCallback.cpp in Sources */,
                                 FDA15E9F12B03EE1003A583A /* JSAudioBufferSourceNode.cpp in Sources */,
                                 FDEAAAF312B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp in Sources */,
@@ -25067 +25082 @@
                                 A7AD2F870EC89D07008AB002 /* LinkHash.cpp in Sources */,
                                 98CE4326129E00BD005821DC /* LinkLoader.cpp in Sources */,
+                                985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */,
+                                B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */,
                                 656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.mm in Sources */,
                                 7EE6846812D26E3800E79415 /* LoaderRunLoopCF.cpp in Sources */,
@@ -25139 +25156 @@
                                 93309DFB099E64920056E581 /* MoveSelectionCommand.cpp in Sources */,
                                 B12D234113560282002A28D4 /* MultipleTrackList.cpp in Sources */,
+                                B1AD4E6213A12A0B00846B27 /* MutableTextTrack.cpp in Sources */,
                                 85031B490A44EFC700F992E0 /* MutationEvent.cpp in Sources */,
                                 BCF34A3711A231CD00C71804 /* NamedNodeMap.cpp in Sources */,
@@ -25431 +25449 @@
                                 1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */,
                                 512DD8E30D91E2B4000F89EE /* SharedBufferCF.cpp in Sources */,
+                                97B1F02E13B025CA00F5103F /* SharedBufferChunkReader.cpp in Sources */,
                                 1A4A95520B4EDCFF002D8C3C /* SharedBufferMac.mm in Sources */,
                                 498770EA1242C535002226BA /* SharedGraphicsContext3D.cpp in Sources */,
@@ -25511 +25530 @@
                                 BCEF447A0E6747D0001C1287 /* StyleCachedImage.cpp in Sources */,
                                 A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */,
+                                BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */,
                                 AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources */,
-                                BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */,
                                 BCEF447D0E674806001C1287 /* StyleGeneratedImage.cpp in Sources */,
                                 BC2273030E82F1E600E7F975 /* StyleInheritedData.cpp in Sources */,
@@ -25531 +25550 @@
                                 7E37EF2E1339208800B29250 /* SubresourceLoaderCF.cpp in Sources */,
                                 93B2D8180F9920EE006AE6B2 /* SuddenTermination.mm in Sources */,
+                                087558C513B4A57D00F49307 /* SurrogatePairAwareTextIterator.cpp in Sources */,
                                 62C1217C11AB9E77003C462C /* SuspendableTimer.cpp in Sources */,
                                 B22279730D00BF220071B782 /* SVGAElement.cpp in Sources */,
@@ -25536 +25556 @@
                                 B22279760D00BF220071B782 /* SVGAngle.cpp in Sources */,
                                 B22279790D00BF220071B782 /* SVGAnimateColorElement.cpp in Sources */,
+                                4362C7B913AC6F1A00344BEB /* SVGAnimatedAngle.cpp in Sources */,
+                                431A308813B8F978007791E4 /* SVGAnimatedBoolean.cpp in Sources */,
+                                43A625F913B3304000AC94B8 /* SVGAnimatedColor.cpp in Sources */,
+                                43F6FD9613BCD0B100224052 /* SVGAnimatedInteger.cpp in Sources */,
                                 4381763B13A697D4007D1187 /* SVGAnimatedLength.cpp in Sources */,
+                                431A2FD713B7707A007791E4 /* SVGAnimatedLengthList.cpp in Sources */,
+                                43A0F0B113AC7D6D00A5F0A7 /* SVGAnimatedNumber.cpp in Sources */,
+                                4331AC7813B6870000A9E5AE /* SVGAnimatedNumberList.cpp in Sources */,
+                                431A2F9D13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp in Sources */,
+                                08B5F25513B5FFF2002959EC /* SVGAnimatedPath.cpp in Sources */,
+                                43B9336A13B261B1004584BF /* SVGAnimatedPointList.cpp in Sources */,
+                                431A302113B89DCC007791E4 /* SVGAnimatedPreserveAspectRatio.cpp in Sources */,
+                                43142E7A13B1E97700F1C871 /* SVGAnimatedRect.cpp in Sources */,
+                                43A6266713B3D11000AC94B8 /* SVGAnimatedString.cpp in Sources */,
+                                43A0F0B613ACCCFF00A5F0A7 /* SVGAnimatedType.cpp in Sources */,
                                 B222798F0D00BF220071B782 /* SVGAnimateElement.cpp in Sources */,
                                 B22279920D00BF220071B782 /* SVGAnimateMotionElement.cpp in Sources */,
                                 B22279940D00BF220071B782 /* SVGAnimateTransformElement.cpp in Sources */,
                                 B22279970D00BF220071B782 /* SVGAnimationElement.cpp in Sources */,
+                                08FB17C113BC7E9100040086 /* SVGAttributeToPropertyMap.cpp in Sources */,
                                 B222799B0D00BF220071B782 /* SVGCircleElement.cpp in Sources */,
                                 B222799E0D00BF220071B782 /* SVGClipPathElement.cpp in Sources */,
@@ -25706 +25741 @@
                                 93309E1B099E64920056E581 /* TextIterator.cpp in Sources */,
                                 93F19A9D08245E59001E9ABC /* TextResourceDecoder.cpp in Sources */,
+                                376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */,
                                 B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
+                                B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */,
+                                B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */,
+                                B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */,
                                 498770F01242C535002226BA /* Texture.cpp in Sources */,
                                 97BC84A412370DC8000C6161 /* TextViewSourceParser.cpp in Sources */,
@@ -25857 +25896 @@
                                 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
                                 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
-                                985BB96D13A94058007A0B69 /* LinkRelAttribute.cpp in Sources */,
-                                FD5686C913AC180200B69C68 /* AsyncAudioDecoder.cpp in Sources */,
-                                FDF7E9C313AC21DB00A51EAC /* JSAudioBufferCallback.cpp in Sources */,
-                                B1AD4E5C13A12A0B00846B27 /* CueIndex.cpp in Sources */,
-                                B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */,
-                                B1AD4E6213A12A0B00846B27 /* MutableTextTrack.cpp in Sources */,
-                                B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */,
-                                B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */,
-                                B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */,
-                                B1AD4E7313A12A4600846B27 /* CueLoader.cpp in Sources */,
-                                B1AD4E7B13A12A7200846B27 /* CueParser.cpp in Sources */,
-                                4362C7B913AC6F1A00344BEB /* SVGAnimatedAngle.cpp in Sources */,
-                                43A0F0B113AC7D6D00A5F0A7 /* SVGAnimatedNumber.cpp in Sources */,
-                                43A0F0B613ACCCFF00A5F0A7 /* SVGAnimatedType.cpp in Sources */,
-                                97B1F02E13B025CA00F5103F /* SharedBufferChunkReader.cpp in Sources */,
-                                43142E7A13B1E97700F1C871 /* SVGAnimatedRect.cpp in Sources */,
-                                43B9336A13B261B1004584BF /* SVGAnimatedPointList.cpp in Sources */,
-                                43A625F913B3304000AC94B8 /* SVGAnimatedColor.cpp in Sources */,
-                                43A6266713B3D11000AC94B8 /* SVGAnimatedString.cpp in Sources */,
-                                087558C513B4A57D00F49307 /* SurrogatePairAwareTextIterator.cpp in Sources */,
-                                08B5F25513B5FFF2002959EC /* SVGAnimatedPath.cpp in Sources */,
-                                376DCCE113B4F966002EBEFC /* TextRun.cpp in Sources */,
-                                4331AC7813B6870000A9E5AE /* SVGAnimatedNumberList.cpp in Sources */,
-                                431A2F9D13B6F2B0007791E4 /* SVGAnimatedNumberOptionalNumber.cpp in Sources */,
-                                431A2FD713B7707A007791E4 /* SVGAnimatedLengthList.cpp in Sources */,
-                                431A302113B89DCC007791E4 /* SVGAnimatedPreserveAspectRatio.cpp in Sources */,
-                                431A308813B8F978007791E4 /* SVGAnimatedBoolean.cpp in Sources */,
-                                08FB17C113BC7E9100040086 /* SVGAttributeToPropertyMap.cpp in Sources */,
-                                43F6FD9613BCD0B100224052 /* SVGAnimatedInteger.cpp in Sources */,
-                                82889B4C13C62392009A6156 /* InspectorStyleTextEditor.cpp in Sources */,
-                                43D2597713C816F400608559 /* ImageBuffer.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -31 +31 @@
 #include "Frame.h"
 #include "HTMLElement.h"
-#include "HTMLFormControlElement.h"
+#include "HTMLTextFormControlElement.h"
 #include "HTMLNames.h"
 #include "htmlediting.h"

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -32 +32 @@
 #include "HTMLDivElement.h"
 #include "HTMLElementFactory.h"
-#include "HTMLFormControlElement.h"
+#include "HTMLTextFormControlElement.h"
 #include "HTMLInterchange.h"
 #include "HTMLLIElement.h"

trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp

@@ -103 +103 @@
 #include "HTMLTableSectionElement.cpp"
 #include "HTMLTextAreaElement.cpp"
+#include "HTMLTextFormControlElement.cpp"
 #include "HTMLTitleElement.cpp"
 #include "HTMLUListElement.cpp"

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -27 +27 @@
 
 #include "Attribute.h"
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "Document.h"
-#include "DocumentParser.h"
 #include "ElementRareData.h"
 #include "Event.h"
@@ -40 +37 @@
 #include "HTMLNames.h"
 #include "LabelsNodeList.h"
-#include "Page.h"
 #include "RenderBox.h"
-#include "RenderTextControl.h"
 #include "RenderTheme.h"
 #include "ScriptEventListener.h"
 #include "ValidationMessage.h"
 #include "ValidityState.h"
-#include <limits>
 #include <wtf/Vector.h>
-#include <wtf/unicode/CharacterNames.h>
 
 namespace WebCore {
@@ -283 +276 @@
 bool HTMLFormControlElement::isFocusable() const
 {
-    if (!renderer() || 
-        !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
+    if (!renderer() || !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
         return false;
     // HTMLElement::isFocusable handles visibility and calls suportsFocus which
@@ -553 +545 @@
 }
 
-void HTMLFormControlElementWithState::defaultEventHandler(Event* event)
-{
-    if (event->type() == eventNames().webkitEditableContentChangedEvent && renderer() && renderer()->isTextControl()) {
-        toRenderTextControl(renderer())->subtreeHasChanged();
-        return;
-    }
-
-    HTMLFormControlElement::defaultEventHandler(event);
-}
-
-HTMLTextFormControlElement::HTMLTextFormControlElement(const QualifiedName& tagName, Document* doc, HTMLFormElement* form)
-    : HTMLFormControlElementWithState(tagName, doc, form)
-    , m_cachedSelectionStart(-1)
-    , m_cachedSelectionEnd(-1)
-{
-}
-
-HTMLTextFormControlElement::~HTMLTextFormControlElement()
-{
-}
-
-void HTMLTextFormControlElement::insertedIntoDocument()
-{
-    HTMLFormControlElement::insertedIntoDocument();
-    String initialValue = value();
-    setTextAsOfLastFormControlChangeEvent(initialValue.isNull() ? emptyString() : initialValue);
-}
-
-void HTMLTextFormControlElement::dispatchFocusEvent()
-{
-    if (supportsPlaceholder())
-        updatePlaceholderVisibility(false);
-    handleFocusEvent();
-    HTMLFormControlElementWithState::dispatchFocusEvent();
-}
-
-void HTMLTextFormControlElement::dispatchBlurEvent()
-{
-    if (supportsPlaceholder())
-        updatePlaceholderVisibility(false);
-    handleBlurEvent();
-    HTMLFormControlElementWithState::dispatchBlurEvent();
-}
-
-String HTMLTextFormControlElement::strippedPlaceholder() const
-{
-    // According to the HTML5 specification, we need to remove CR and LF from
-    // the attribute value.
-    const AtomicString& attributeValue = getAttribute(placeholderAttr);
-    if (!attributeValue.contains(newlineCharacter) && !attributeValue.contains(carriageReturn))
-        return attributeValue;
-
-    Vector<UChar> stripped;
-    unsigned length = attributeValue.length();
-    stripped.reserveCapacity(length);
-    for (unsigned i = 0; i < length; ++i) {
-        UChar character = attributeValue[i];
-        if (character == newlineCharacter || character == carriageReturn)
-            continue;
-        stripped.append(character);
-    }
-    return String::adopt(stripped);
-}
-
-static bool isNotLineBreak(UChar ch) { return ch != newlineCharacter && ch != carriageReturn; }
-
-bool HTMLTextFormControlElement::isPlaceholderEmpty() const
-{
-    const AtomicString& attributeValue = getAttribute(placeholderAttr);
-    return attributeValue.string().find(isNotLineBreak) == notFound;
-}
-
-bool HTMLTextFormControlElement::placeholderShouldBeVisible() const
-{
-    return supportsPlaceholder()
-        && isEmptyValue()
-        && isEmptySuggestedValue()
-        && !isPlaceholderEmpty()
-        && (document()->focusedNode() != this || (renderer() && renderer()->theme()->shouldShowPlaceholderWhenFocused()));
-}
-
-void HTMLTextFormControlElement::updatePlaceholderVisibility(bool placeholderValueChanged)
-{
-    if (supportsPlaceholder() && renderer())
-        toRenderTextControl(renderer())->updatePlaceholderVisibility(placeholderShouldBeVisible(), placeholderValueChanged);
-}
-
-RenderTextControl* HTMLTextFormControlElement::textRendererAfterUpdateLayout()
-{
-    if (!isTextFormControl())
-        return 0;
-    document()->updateLayoutIgnorePendingStylesheets();
-    return toRenderTextControl(renderer());
-}
-
-void HTMLTextFormControlElement::setSelectionStart(int start)
-{
-    setSelectionRange(start, max(start, selectionEnd()));
-}
-
-void HTMLTextFormControlElement::setSelectionEnd(int end)
-{
-    setSelectionRange(min(end, selectionStart()), end);
-}
-
-void HTMLTextFormControlElement::select()
-{
-    setSelectionRange(0, numeric_limits<int>::max());
-}
-
-String HTMLTextFormControlElement::selectedText() const
-{
-    // FIXME: We should be able to extract selected contents even if there were no renderer.
-    if (!renderer() || renderer()->isTextControl())
-        return String();
-
-    RenderTextControl* textControl = toRenderTextControl(renderer());
-    return textControl->text().substring(selectionStart(), selectionEnd() - selectionStart());
-}
-
-void HTMLTextFormControlElement::dispatchFormControlChangeEvent()
-{
-    if (m_textAsOfLastFormControlChangeEvent != value()) {
-        HTMLElement::dispatchChangeEvent();
-        setTextAsOfLastFormControlChangeEvent(value());
-    }
-    setChangedSinceLastFormControlChangeEvent(false);
-}
-
-static inline bool hasVisibleTextArea(RenderTextControl* textControl, HTMLElement* innerText)
-{
-    ASSERT(textControl);
-    return textControl->style()->visibility() != HIDDEN && innerText && innerText->renderer() && innerText->renderBox()->height();
-}
-
-void HTMLTextFormControlElement::setSelectionRange(int start, int end)
-{
-    document()->updateLayoutIgnorePendingStylesheets();
-
-    if (!renderer() || !renderer()->isTextControl())
-        return;
-
-    end = max(end, 0);
-    start = min(max(start, 0), end);
-
-    RenderTextControl* control = toRenderTextControl(renderer());
-    if (!hasVisibleTextArea(control, innerTextElement())) {
-        cacheSelection(start, end);
-        return;
-    }
-    VisiblePosition startPosition = control->visiblePositionForIndex(start);
-    VisiblePosition endPosition;
-    if (start == end)
-        endPosition = startPosition;
-    else
-        endPosition = control->visiblePositionForIndex(end);
-
-    // startPosition and endPosition can be null position for example when
-    // "-webkit-user-select: none" style attribute is specified.
-    if (startPosition.isNotNull() && endPosition.isNotNull()) {
-        ASSERT(startPosition.deepEquivalent().deprecatedNode()->shadowAncestorNode() == this
-            && endPosition.deepEquivalent().deprecatedNode()->shadowAncestorNode() == this);
-    }
-    VisibleSelection newSelection = VisibleSelection(startPosition, endPosition);
-
-    if (Frame* frame = document()->frame())
-        frame->selection()->setSelection(newSelection);
-}
-
-int HTMLTextFormControlElement::selectionStart() const
-{
-    if (!isTextFormControl())
-        return 0;
-    if (document()->focusedNode() != this && hasCachedSelectionStart())
-        return m_cachedSelectionStart;
-
-    return computeSelectionStart();
-}
-
-int HTMLTextFormControlElement::computeSelectionStart() const
-{
-    Frame* frame = document()->frame();
-    if (!frame)
-        return 0;
-
-    return RenderTextControl::indexForVisiblePosition(innerTextElement(), frame->selection()->start());
-}
-
-int HTMLTextFormControlElement::selectionEnd() const
-{
-    if (!isTextFormControl())
-        return 0;
-    if (document()->focusedNode() != this && hasCachedSelectionEnd())
-        return m_cachedSelectionEnd;
-    return computeSelectionEnd();
-}
-
-int HTMLTextFormControlElement::computeSelectionEnd() const
-{
-    Frame* frame = document()->frame();
-    if (!frame)
-        return 0;
-
-    return RenderTextControl::indexForVisiblePosition(innerTextElement(), frame->selection()->end());
-}
-
-static inline void setContainerAndOffsetForRange(Node* node, int offset, Node*& containerNode, int& offsetInContainer)
-{
-    if (node->isTextNode()) {
-        containerNode = node;
-        offsetInContainer = offset;
-    } else {
-        containerNode = node->parentNode();
-        offsetInContainer = node->nodeIndex() + offset;
-    }
-}
-
-PassRefPtr<Range> HTMLTextFormControlElement::selection() const
-{
-    if (!renderer() || !isTextFormControl() || !hasCachedSelectionStart() || !hasCachedSelectionEnd())
-        return 0;
-
-    int start = m_cachedSelectionStart;
-    int end = m_cachedSelectionEnd;
-
-    ASSERT(start <= end);
-    HTMLElement* innerText = innerTextElement();
-    if (!innerText)
-        return 0;
-
-    if (!innerText->firstChild())
-        return Range::create(document(), innerText, 0, innerText, 0);
-
-    int offset = 0;
-    Node* startNode = 0;
-    Node* endNode = 0;
-    for (Node* node = innerText->firstChild(); node; node = node->traverseNextNode(innerText)) {
-        ASSERT(!node->firstChild());
-        ASSERT(node->isTextNode() || node->hasTagName(brTag));
-        int length = node->isTextNode() ? lastOffsetInNode(node) : 1;
-
-        if (offset <= start && start <= offset + length)
-            setContainerAndOffsetForRange(node, start - offset, startNode, start);
-
-        if (offset <= end && end <= offset + length) {
-            setContainerAndOffsetForRange(node, end - offset, endNode, end);
-            break;
-        }
-
-        offset += length;
-    }
-
-    if (!startNode || !endNode)
-        return 0;
-
-    return Range::create(document(), startNode, start, endNode, end);
-}
-
-void HTMLTextFormControlElement::restoreCachedSelection()
-{
-    setSelectionRange(m_cachedSelectionStart, m_cachedSelectionEnd);
-}
-
-void HTMLTextFormControlElement::selectionChanged(bool userTriggered)
-{
-    if (!renderer() || !isTextFormControl())
-        return;
-
-    // selectionStart() or selectionEnd() will return cached selection when this node doesn't have focus
-    cacheSelection(computeSelectionStart(), computeSelectionEnd());
-
-    if (Frame* frame = document()->frame()) {
-        if (frame->selection()->isRange() && userTriggered)
-            dispatchEvent(Event::create(eventNames().selectEvent, true, false));
-    }
-}
-
-void HTMLTextFormControlElement::parseMappedAttribute(Attribute* attr)
-{
-    if (attr->name() == placeholderAttr)
-        updatePlaceholderVisibility(true);
-    else if (attr->name() == onselectAttr)
-        setAttributeEventListener(eventNames().selectEvent, createAttributeEventListener(this, attr));
-    else if (attr->name() == onchangeAttr)
-        setAttributeEventListener(eventNames().changeEvent, createAttributeEventListener(this, attr));
-    else
-        HTMLFormControlElementWithState::parseMappedAttribute(attr);
-}
-
 } // namespace Webcore

trunk/Source/WebCore/html/HTMLFormControlElement.h

@@ -32 +32 @@
 class FormDataList;
 class HTMLFormElement;
-class RenderTextControl;
 class ValidationMessage;
 class ValidityState;
-class VisibleSelection;
 
 // HTMLFormControlElement is the default implementation of FormAssociatedElement,
@@ -180 +178 @@
     virtual void willMoveToNewOwnerDocument();
     virtual void didMoveToNewOwnerDocument();
-    virtual void defaultEventHandler(Event*);
 
 private:
@@ -186 +183 @@
 };
 
-// FIXME: Give this class its own header file.
-class HTMLTextFormControlElement : public HTMLFormControlElementWithState {
-public:
-    // Common flag for HTMLInputElement::tooLong() and HTMLTextAreaElement::tooLong().
-    enum NeedsToCheckDirtyFlag {CheckDirtyFlag, IgnoreDirtyFlag};
-
-    virtual ~HTMLTextFormControlElement();
-
-    virtual void insertedIntoDocument();
-
-    // The derived class should return true if placeholder processing is needed.
-    virtual bool supportsPlaceholder() const = 0;
-    String strippedPlaceholder() const;
-    bool placeholderShouldBeVisible() const;
-
-    int selectionStart() const;
-    int selectionEnd() const;
-    void setSelectionStart(int);
-    void setSelectionEnd(int);
-    void select();
-    void setSelectionRange(int start, int end);
-    PassRefPtr<Range> selection() const;
-    String selectedText() const;
-
-    virtual void dispatchFormControlChangeEvent();
-
-    virtual int maxLength() const = 0;
-    virtual String value() const = 0;
-
-    virtual HTMLElement* innerTextElement() const = 0;
-
-    void cacheSelection(int start, int end)
-    {
-        m_cachedSelectionStart = start;
-        m_cachedSelectionEnd = end;
-    }
-
-    void selectionChanged(bool userTriggered);
-
-protected:
-    HTMLTextFormControlElement(const QualifiedName&, Document*, HTMLFormElement*);
-
-    void updatePlaceholderVisibility(bool);
-
-    virtual void parseMappedAttribute(Attribute*);
-
-    void setTextAsOfLastFormControlChangeEvent(const String& text) { m_textAsOfLastFormControlChangeEvent = text; }
-
-    void restoreCachedSelection();
-    bool hasCachedSelectionStart() const { return m_cachedSelectionStart >= 0; }
-    bool hasCachedSelectionEnd() const { return m_cachedSelectionEnd >= 0; }
-
-private:
-    int computeSelectionStart() const;
-    int computeSelectionEnd() const;
-
-    virtual void dispatchFocusEvent();
-    virtual void dispatchBlurEvent();
-
-    bool isPlaceholderEmpty() const;
-
-    // Returns true if user-editable value is empty. Used to check placeholder visibility.
-    virtual bool isEmptyValue() const = 0;
-    // Returns true if suggested value is empty. Used to check placeholder visibility.
-    virtual bool isEmptySuggestedValue() const { return true; }
-    // Called in dispatchFocusEvent(), after placeholder process, before calling parent's dispatchFocusEvent().
-    virtual void handleFocusEvent() { }
-    // Called in dispatchBlurEvent(), after placeholder process, before calling parent's dispatchBlurEvent().
-    virtual void handleBlurEvent() { }
-
-    RenderTextControl* textRendererAfterUpdateLayout();
-
-    String m_textAsOfLastFormControlChangeEvent;
-    
-    int m_cachedSelectionStart;
-    int m_cachedSelectionEnd;
-};
-
-// This function returns 0 when node is an input element and not a text field.
-inline HTMLTextFormControlElement* toTextFormControl(Node* node)
-{
-    return (node && node->isElementNode() && static_cast<Element*>(node)->isTextFormControl()) ? static_cast<HTMLTextFormControlElement*>(node) : 0;
-}
-
 } // namespace
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -457 +457 @@
 {
     if (isTextField())
-        return HTMLFormControlElementWithState::isFocusable();
-    return HTMLFormControlElementWithState::isKeyboardFocusable(event) && m_inputType->isKeyboardFocusable();
+        return HTMLTextFormControlElement::isFocusable();
+    return HTMLTextFormControlElement::isKeyboardFocusable(event) && m_inputType->isKeyboardFocusable();
 }
 
@@ -464 +464 @@
 {
     if (isTextField())
-        return HTMLFormControlElementWithState::isFocusable();
-    return HTMLFormControlElementWithState::isMouseFocusable();
+        return HTMLTextFormControlElement::isFocusable();
+    return HTMLTextFormControlElement::isMouseFocusable();
 }
 
@@ -478 +478 @@
             document()->frame()->selection()->revealSelection();
     } else
-        HTMLFormControlElementWithState::updateFocusAppearance(restorePreviousSelection);
+        HTMLTextFormControlElement::updateFocusAppearance(restorePreviousSelection);
 }
 
@@ -630 +630 @@
     if (!isTextField())
         return false;
-    return HTMLFormControlElementWithState::canStartSelection();
+    return HTMLTextFormControlElement::canStartSelection();
 }
 
@@ -667 +667 @@
         m_name = attr->value();
         checkedRadioButtons().addButton(this);
-        HTMLFormControlElementWithState::parseMappedAttribute(attr);
+        HTMLTextFormControlElement::parseMappedAttribute(attr);
     } else if (attr->name() == autocompleteAttr) {
         if (equalIgnoringCase(attr->value(), "off")) {
@@ -778 +778 @@
 {
     m_parsingInProgress = false;
-    HTMLFormControlElementWithState::finishParsingChildren();
+    HTMLTextFormControlElement::finishParsingChildren();
     if (!m_stateRestored) {
         bool checked = hasAttribute(checkedAttr);
@@ -789 +789 @@
 bool HTMLInputElement::rendererIsNeeded(const NodeRenderingContext& context)
 {
-    return m_inputType->rendererIsNeeded() && HTMLFormControlElementWithState::rendererIsNeeded(context);
+    return m_inputType->rendererIsNeeded() && HTMLTextFormControlElement::rendererIsNeeded(context);
 }
 
@@ -804 +804 @@
         updateType();
 
-    HTMLFormControlElementWithState::attach();
+    HTMLTextFormControlElement::attach();
 
     m_inputType->attach();
@@ -816 +816 @@
 void HTMLInputElement::detach()
 {
-    HTMLFormControlElementWithState::detach();
+    HTMLTextFormControlElement::detach();
     setFormControlValueMatchesRenderer(false);
 }
@@ -937 +937 @@
     m_isIndeterminate = sourceElement->m_isIndeterminate;
 
-    HTMLFormControlElementWithState::copyNonAttributeProperties(source);
+    HTMLTextFormControlElement::copyNonAttributeProperties(source);
 }
 
@@ -1151 +1151 @@
     bool callBaseClassEarly = isTextField() && (evt->type() == eventNames().keydownEvent || evt->type() == eventNames().keypressEvent);
     if (callBaseClassEarly) {
-        HTMLFormControlElementWithState::defaultEventHandler(evt);
+        HTMLTextFormControlElement::defaultEventHandler(evt);
         if (evt->defaultHandled())
             return;
@@ -1217 +1217 @@
 
     if (!callBaseClassEarly && !evt->defaultHandled())
-        HTMLFormControlElementWithState::defaultEventHandler(evt);
+        HTMLTextFormControlElement::defaultEventHandler(evt);
 }
 
@@ -1390 +1390 @@
     document()->checkedRadioButtons().removeButton(this);
 
-    HTMLFormControlElementWithState::willMoveToNewOwnerDocument();
+    HTMLTextFormControlElement::willMoveToNewOwnerDocument();
 }
 
@@ -1397 +1397 @@
     registerForActivationCallbackIfNeeded();
 
-    HTMLFormControlElementWithState::didMoveToNewOwnerDocument();
+    HTMLTextFormControlElement::didMoveToNewOwnerDocument();
 }
 
 void HTMLInputElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLFormControlElementWithState::addSubresourceAttributeURLs(urls);
+    HTMLTextFormControlElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, src());
@@ -1409 +1409 @@
 bool HTMLInputElement::recalcWillValidate() const
 {
-    return m_inputType->supportsValidation() && HTMLFormControlElementWithState::recalcWillValidate();
+    return m_inputType->supportsValidation() && HTMLTextFormControlElement::recalcWillValidate();
 }
 

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -25 +25 @@
 #define HTMLInputElement_h
 
-#include "HTMLFormControlElement.h"
+#include "HTMLTextFormControlElement.h"
 
 namespace WebCore {

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -240 +240 @@
         handleBeforeTextInsertedEvent(static_cast<BeforeTextInsertedEvent*>(event));
 
-    HTMLFormControlElementWithState::defaultEventHandler(event);
+    HTMLTextFormControlElement::defaultEventHandler(event);
 }
 

trunk/Source/WebCore/html/HTMLTextAreaElement.h

@@ -25 +25 @@
 #define HTMLTextAreaElement_h
 
-#include "HTMLFormControlElement.h"
+#include "HTMLTextFormControlElement.h"
 
 namespace WebCore {

trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -24 +24 @@
 
 #include "config.h"
-#include "HTMLFormControlElement.h"
+#include "HTMLTextFormControlElement.h"
 
 #include "Attribute.h"
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "Document.h"
-#include "DocumentParser.h"
-#include "ElementRareData.h"
 #include "Event.h"
-#include "EventHandler.h"
 #include "EventNames.h"
 #include "Frame.h"
@@ -39 +34 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
-#include "LabelsNodeList.h"
-#include "Page.h"
 #include "RenderBox.h"
 #include "RenderTextControl.h"
 #include "RenderTheme.h"
 #include "ScriptEventListener.h"
-#include "ValidationMessage.h"
-#include "ValidityState.h"
-#include <limits>
 #include <wtf/Vector.h>
-#include <wtf/unicode/CharacterNames.h>
 
 namespace WebCore {
@@ -55 +44 @@
 using namespace HTMLNames;
 using namespace std;
-
-HTMLFormControlElement::HTMLFormControlElement(const QualifiedName& tagName, Document* document, HTMLFormElement* form)
-    : HTMLElement(tagName, document)
-    , FormAssociatedElement(form)
-    , m_disabled(false)
-    , m_readOnly(false)
-    , m_required(false)
-    , m_valueMatchesRenderer(false)
-    , m_willValidateInitialized(false)
-    , m_willValidate(true)
-    , m_isValid(true)
-    , m_wasChangedSinceLastFormControlChangeEvent(false)
-{
-    if (!this->form())
-        setForm(findFormAncestor());
-    if (this->form())
-        this->form()->registerFormElement(this);
-}
-
-HTMLFormControlElement::~HTMLFormControlElement()
-{
-    if (form())
-        form()->removeFormElement(this);
-}
-
-void HTMLFormControlElement::detach()
-{
-    m_validationMessage = nullptr;
-    HTMLElement::detach();
-}
-
-bool HTMLFormControlElement::formNoValidate() const
-{
-    return fastHasAttribute(formnovalidateAttr);
-}
-
-void HTMLFormControlElement::parseMappedAttribute(Attribute* attr)
-{
-    if (attr->name() == disabledAttr) {
-        bool oldDisabled = m_disabled;
-        m_disabled = !attr->isNull();
-        if (oldDisabled != m_disabled) {
-            setNeedsStyleRecalc();
-            if (renderer() && renderer()->style()->hasAppearance())
-                renderer()->theme()->stateChanged(renderer(), EnabledState);
-        }
-    } else if (attr->name() == readonlyAttr) {
-        bool oldReadOnly = m_readOnly;
-        m_readOnly = !attr->isNull();
-        if (oldReadOnly != m_readOnly) {
-            setNeedsStyleRecalc();
-            if (renderer() && renderer()->style()->hasAppearance())
-                renderer()->theme()->stateChanged(renderer(), ReadOnlyState);
-        }
-    } else if (attr->name() == requiredAttr) {
-        bool oldRequired = m_required;
-        m_required = !attr->isNull();
-        if (oldRequired != m_required) {
-            setNeedsValidityCheck();
-            setNeedsStyleRecalc(); // Updates for :required :optional classes.
-        }
-    } else
-        HTMLElement::parseMappedAttribute(attr);
-    setNeedsWillValidateCheck();
-}
-
-static bool shouldAutofocus(HTMLFormControlElement* element)
-{
-    if (!element->autofocus())
-        return false;
-    if (!element->renderer())
-        return false;
-    if (element->document()->ignoreAutofocus())
-        return false;
-    if (element->isReadOnlyFormControl())
-        return false;
-
-    // FIXME: Should this set of hasTagName checks be replaced by a
-    // virtual member function?
-    if (element->hasTagName(inputTag))
-        return !static_cast<HTMLInputElement*>(element)->isInputTypeHidden();
-    if (element->hasTagName(selectTag))
-        return true;
-    if (element->hasTagName(keygenTag))
-        return true;
-    if (element->hasTagName(buttonTag))
-        return true;
-    if (element->hasTagName(textareaTag))
-        return true;
-
-    return false;
-}
-
-static void focusPostAttach(Node* element, unsigned)
-{ 
-    static_cast<Element*>(element)->focus(); 
-    element->deref(); 
-}
-
-void HTMLFormControlElement::attach()
-{
-    ASSERT(!attached());
-
-    suspendPostAttachCallbacks();
-
-    HTMLElement::attach();
-
-    // The call to updateFromElement() needs to go after the call through
-    // to the base class's attach() because that can sometimes do a close
-    // on the renderer.
-    if (renderer())
-        renderer()->updateFromElement();
-
-    if (shouldAutofocus(this)) {
-        ref();
-        queuePostAttachCallback(focusPostAttach, this);
-    }
-
-    resumePostAttachCallbacks();
-}
-
-void HTMLFormControlElement::willMoveToNewOwnerDocument()
-{
-    FormAssociatedElement::willMoveToNewOwnerDocument();
-    HTMLElement::willMoveToNewOwnerDocument();
-}
-
-void HTMLFormControlElement::insertedIntoTree(bool deep)
-{
-    FormAssociatedElement::insertedIntoTree();
-    if (!form())
-        document()->checkedRadioButtons().addButton(this);
-
-    HTMLElement::insertedIntoTree(deep);
-}
-
-void HTMLFormControlElement::removedFromTree(bool deep)
-{
-    FormAssociatedElement::removedFromTree();
-    HTMLElement::removedFromTree(deep);
-}
-
-void HTMLFormControlElement::insertedIntoDocument()
-{
-    HTMLElement::insertedIntoDocument();
-    FormAssociatedElement::insertedIntoDocument();
-}
-
-void HTMLFormControlElement::removedFromDocument()
-{
-    HTMLElement::removedFromDocument();
-    FormAssociatedElement::removedFromDocument();
-}
-
-const AtomicString& HTMLFormControlElement::formControlName() const
-{
-    const AtomicString& name = fastGetAttribute(nameAttr);
-    return name.isNull() ? emptyAtom : name;
-}
-
-void HTMLFormControlElement::setName(const AtomicString& value)
-{
-    setAttribute(nameAttr, value);
-}
-
-bool HTMLFormControlElement::wasChangedSinceLastFormControlChangeEvent() const
-{
-    return m_wasChangedSinceLastFormControlChangeEvent;
-}
-
-void HTMLFormControlElement::setChangedSinceLastFormControlChangeEvent(bool changed)
-{
-    m_wasChangedSinceLastFormControlChangeEvent = changed;
-}
-
-void HTMLFormControlElement::dispatchFormControlChangeEvent()
-{
-    HTMLElement::dispatchChangeEvent();
-    setChangedSinceLastFormControlChangeEvent(false);
-}
-
-void HTMLFormControlElement::dispatchFormControlInputEvent()
-{
-    setChangedSinceLastFormControlChangeEvent(true);
-    HTMLElement::dispatchInputEvent();
-}
-
-void HTMLFormControlElement::setDisabled(bool b)
-{
-    setAttribute(disabledAttr, b ? "" : 0);
-}
-
-bool HTMLFormControlElement::autofocus() const
-{
-    return hasAttribute(autofocusAttr);
-}
-
-bool HTMLFormControlElement::required() const
-{
-    return m_required;
-}
-
-static void updateFromElementCallback(Node* node, unsigned)
-{
-    ASSERT_ARG(node, node->isElementNode());
-    ASSERT_ARG(node, static_cast<Element*>(node)->isFormControlElement());
-    ASSERT(node->renderer());
-    if (RenderObject* renderer = node->renderer())
-        renderer->updateFromElement();
-}
-
-void HTMLFormControlElement::recalcStyle(StyleChange change)
-{
-    HTMLElement::recalcStyle(change);
-
-    // updateFromElement() can cause the selection to change, and in turn
-    // trigger synchronous layout, so it must not be called during style recalc.
-    if (renderer())
-        queuePostAttachCallback(updateFromElementCallback, this);
-}
-
-bool HTMLFormControlElement::supportsFocus() const
-{
-    return !m_disabled;
-}
-
-bool HTMLFormControlElement::isFocusable() const
-{
-    if (!renderer() || 
-        !renderer()->isBox() || toRenderBox(renderer())->size().isEmpty())
-        return false;
-    // HTMLElement::isFocusable handles visibility and calls suportsFocus which
-    // will cover the disabled case.
-    return HTMLElement::isFocusable();
-}
-
-bool HTMLFormControlElement::isKeyboardFocusable(KeyboardEvent* event) const
-{
-    if (isFocusable())
-        if (document()->frame())
-            return document()->frame()->eventHandler()->tabsToAllFormControls(event);
-    return false;
-}
-
-bool HTMLFormControlElement::isMouseFocusable() const
-{
-#if PLATFORM(GTK) || PLATFORM(QT)
-    return HTMLElement::isMouseFocusable();
-#else
-    return false;
-#endif
-}
-
-short HTMLFormControlElement::tabIndex() const
-{
-    // Skip the supportsFocus check in HTMLElement.
-    return Element::tabIndex();
-}
-
-bool HTMLFormControlElement::recalcWillValidate() const
-{
-    // FIXME: Should return false if this element has a datalist element as an
-    // ancestor. See HTML5 4.10.10 'The datalist element.'
-    return !m_disabled && !m_readOnly;
-}
-
-bool HTMLFormControlElement::willValidate() const
-{
-    if (!m_willValidateInitialized) {
-        m_willValidateInitialized = true;
-        m_willValidate = recalcWillValidate();
-    } else {
-        // If the following assertion fails, setNeedsWillValidateCheck() is not
-        // called correctly when something which changes recalcWillValidate() result
-        // is updated.
-        ASSERT(m_willValidate == recalcWillValidate());
-    }
-    return m_willValidate;
-}
-
-void HTMLFormControlElement::setNeedsWillValidateCheck()
-{
-    // We need to recalculate willValidte immediately because willValidate
-    // change can causes style change.
-    bool newWillValidate = recalcWillValidate();
-    if (m_willValidateInitialized && m_willValidate == newWillValidate)
-        return;
-    m_willValidateInitialized = true;
-    m_willValidate = newWillValidate;
-    setNeedsStyleRecalc();
-    if (!m_willValidate)
-        hideVisibleValidationMessage();
-}
-
-String HTMLFormControlElement::validationMessage()
-{
-    return validity()->validationMessage();
-}
-
-void HTMLFormControlElement::updateVisibleValidationMessage()
-{
-    Page* page = document()->page();
-    if (!page)
-        return;
-    String message;
-    if (renderer() && willValidate()) {
-        message = validationMessage().stripWhiteSpace();
-        // HTML5 specification doesn't ask UA to show the title attribute value
-        // with the validationMessage.  However, this behavior is same as Opera
-        // and the specification describes such behavior as an example.
-        const AtomicString& title = getAttribute(titleAttr);
-        if (!message.isEmpty() && !title.isEmpty()) {
-            message.append('\n');
-            message.append(title);
-        }
-    }
-    if (message.isEmpty()) {
-        hideVisibleValidationMessage();
-        return;
-    }
-    if (!m_validationMessage) {
-        m_validationMessage = ValidationMessage::create(this);
-        m_validationMessage->setMessage(message);
-    } else {
-        // Call setMessage() even if m_validationMesage->message() == message
-        // because the existing message might be to be hidden.
-        m_validationMessage->setMessage(message);
-    }
-}
-
-void HTMLFormControlElement::hideVisibleValidationMessage()
-{
-    if (m_validationMessage)
-        m_validationMessage->requestToHideMessage();
-}
-
-String HTMLFormControlElement::visibleValidationMessage() const
-{
-    return m_validationMessage ? m_validationMessage->message() : String();
-}
-
-bool HTMLFormControlElement::checkValidity(Vector<RefPtr<FormAssociatedElement> >* unhandledInvalidControls)
-{
-    if (!willValidate() || isValidFormControlElement())
-        return true;
-    // An event handler can deref this object.
-    RefPtr<HTMLFormControlElement> protector(this);
-    RefPtr<Document> originalDocument(document());
-    bool needsDefaultAction = dispatchEvent(Event::create(eventNames().invalidEvent, false, true));
-    if (needsDefaultAction && unhandledInvalidControls && inDocument() && originalDocument == document())
-        unhandledInvalidControls->append(this);
-    return false;
-}
-
-bool HTMLFormControlElement::isValidFormControlElement()
-{
-    // If the following assertion fails, setNeedsValidityCheck() is not called
-    // correctly when something which changes validity is updated.
-    ASSERT(m_isValid == validity()->valid());
-    return m_isValid;
-}
-
-void HTMLFormControlElement::setNeedsValidityCheck()
-{
-    bool newIsValid = validity()->valid();
-    if (willValidate() && newIsValid != m_isValid) {
-        // Update style for pseudo classes such as :valid :invalid.
-        setNeedsStyleRecalc();
-    }
-    m_isValid = newIsValid;
-
-    // Updates only if this control already has a validtion message.
-    if (!visibleValidationMessage().isEmpty()) {
-        // Calls updateVisibleValidationMessage() even if m_isValid is not
-        // changed because a validation message can be chagned.
-        updateVisibleValidationMessage();
-    }
-}
-
-void HTMLFormControlElement::setCustomValidity(const String& error)
-{
-    validity()->setCustomErrorMessage(error);
-}
-
-void HTMLFormControlElement::dispatchBlurEvent()
-{
-    HTMLElement::dispatchBlurEvent();
-    hideVisibleValidationMessage();
-}
-
-HTMLFormElement* HTMLFormControlElement::virtualForm() const
-{
-    return FormAssociatedElement::form();
-}
-
-bool HTMLFormControlElement::isDefaultButtonForForm() const
-{
-    return isSuccessfulSubmitButton() && form() && form()->defaultButton() == this;
-}
-
-void HTMLFormControlElement::attributeChanged(Attribute* attr, bool preserveDecls)
-{
-    if (attr->name() == formAttr) {
-        formAttributeChanged();
-        if (!form())
-            document()->checkedRadioButtons().addButton(this);
-    } else
-        HTMLElement::attributeChanged(attr, preserveDecls);
-}
-
-bool HTMLFormControlElement::isLabelable() const
-{
-    // FIXME: Add meterTag and outputTag to the list once we support them.
-    return hasTagName(buttonTag) || hasTagName(inputTag) || hasTagName(keygenTag)
-#if ENABLE(METER_TAG)
-        || hasTagName(meterTag)
-#endif
-#if ENABLE(PROGRESS_TAG)
-        || hasTagName(progressTag)
-#endif
-        || hasTagName(selectTag) || hasTagName(textareaTag);
-}
-
-PassRefPtr<NodeList> HTMLFormControlElement::labels()
-{
-    if (!isLabelable())
-        return 0;
-    if (!document())
-        return 0;
-
-    NodeRareData* data = Node::ensureRareData();
-    if (!data->nodeLists()) {
-        data->setNodeLists(NodeListsNodeData::create());
-        treeScope()->addNodeListCache();
-    }
-
-    if (data->nodeLists()->m_labelsNodeListCache)
-        return data->nodeLists()->m_labelsNodeListCache;
-
-    RefPtr<LabelsNodeList> list = LabelsNodeList::create(this);
-    data->nodeLists()->m_labelsNodeListCache = list.get();
-    return list.release();
-}
-
-HTMLFormControlElementWithState::HTMLFormControlElementWithState(const QualifiedName& tagName, Document* doc, HTMLFormElement* f)
-    : HTMLFormControlElement(tagName, doc, f)
-{
-    document()->registerFormElementWithState(this);
-}
-
-HTMLFormControlElementWithState::~HTMLFormControlElementWithState()
-{
-    document()->unregisterFormElementWithState(this);
-}
-
-void HTMLFormControlElementWithState::willMoveToNewOwnerDocument()
-{
-    document()->unregisterFormElementWithState(this);
-    HTMLFormControlElement::willMoveToNewOwnerDocument();
-}
-
-void HTMLFormControlElementWithState::didMoveToNewOwnerDocument()
-{
-    document()->registerFormElementWithState(this);
-    HTMLFormControlElement::didMoveToNewOwnerDocument();
-}
-
-bool HTMLFormControlElementWithState::shouldAutocomplete() const
-{
-    if (!form())
-        return true;
-    return form()->shouldAutocomplete();
-}
-
-bool HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState() const
-{
-    // We don't save/restore control state in a form with autocomplete=off.
-    return attached() && shouldAutocomplete();
-}
-
-void HTMLFormControlElementWithState::finishParsingChildren()
-{
-    HTMLFormControlElement::finishParsingChildren();
-
-    // We don't save state of a control with shouldSaveAndRestoreFormControlState()=false.
-    // But we need to skip restoring process too because a control in another
-    // form might have the same pair of name and type and saved its state.
-    if (!shouldSaveAndRestoreFormControlState())
-        return;
-
-    Document* doc = document();
-    if (doc->hasStateForNewFormElements()) {
-        String state;
-        if (doc->takeStateForFormElement(name().impl(), type().impl(), state))
-            restoreFormControlState(state);
-    }
-}
-
-void HTMLFormControlElementWithState::defaultEventHandler(Event* event)
-{
-    if (event->type() == eventNames().webkitEditableContentChangedEvent && renderer() && renderer()->isTextControl()) {
-        toRenderTextControl(renderer())->subtreeHasChanged();
-        return;
-    }
-
-    HTMLFormControlElement::defaultEventHandler(event);
-}
 
 HTMLTextFormControlElement::HTMLTextFormControlElement(const QualifiedName& tagName, Document* doc, HTMLFormElement* form)
@@ -595 +77 @@
     handleBlurEvent();
     HTMLFormControlElementWithState::dispatchBlurEvent();
+}
+
+void HTMLTextFormControlElement::defaultEventHandler(Event* event)
+{
+    if (event->type() == eventNames().webkitEditableContentChangedEvent && renderer() && renderer()->isTextControl()) {
+        toRenderTextControl(renderer())->subtreeHasChanged();
+        return;
+    }
+
+    HTMLFormControlElementWithState::defaultEventHandler(event);
 }
 

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -22 +22 @@
  */
 
-#ifndef HTMLFormControlElement_h
-#define HTMLFormControlElement_h
+#ifndef HTMLTextFormControlElement_h
+#define HTMLTextFormControlElement_h
 
-#include "FormAssociatedElement.h"
-#include "HTMLElement.h"
+#include "HTMLFormControlElement.h"
 
 namespace WebCore {
 
-class FormDataList;
-class HTMLFormElement;
 class RenderTextControl;
-class ValidationMessage;
-class ValidityState;
-class VisibleSelection;
 
-// HTMLFormControlElement is the default implementation of FormAssociatedElement,
-// and form-associated element implementations should use HTMLFormControlElement
-// unless there is a special reason.
-class HTMLFormControlElement : public HTMLElement, public FormAssociatedElement {
-public:
-    virtual ~HTMLFormControlElement();
-
-    HTMLFormElement* form() const { return FormAssociatedElement::form(); }
-
-    bool formNoValidate() const;
-
-    virtual void reset() { }
-
-    virtual bool formControlValueMatchesRenderer() const { return m_valueMatchesRenderer; }
-    virtual void setFormControlValueMatchesRenderer(bool b) { m_valueMatchesRenderer = b; }
-
-    virtual bool wasChangedSinceLastFormControlChangeEvent() const;
-    virtual void setChangedSinceLastFormControlChangeEvent(bool);
-
-    virtual void dispatchFormControlChangeEvent();
-    virtual void dispatchFormControlInputEvent();
-
-    virtual bool disabled() const { return m_disabled; }
-    void setDisabled(bool);
-
-    virtual bool isFocusable() const;
-    virtual bool isEnumeratable() const { return false; }
-
-    // Determines whether or not a control will be automatically focused.
-    virtual bool autofocus() const;
-
-    bool required() const;
-
-    const AtomicString& type() const { return formControlType(); }
-
-    void setName(const AtomicString& name);
-
-    virtual bool isEnabledFormControl() const { return !disabled(); }
-    virtual bool isReadOnlyFormControl() const { return readOnly(); }
-
-    virtual bool isRadioButton() const { return false; }
-    virtual bool canTriggerImplicitSubmission() const { return false; }
-
-    // Override in derived classes to get the encoded name=value pair for submitting.
-    // Return true for a successful control (see HTML4-17.13.2).
-    virtual bool appendFormData(FormDataList&, bool) { return false; }
-
-    virtual bool isSuccessfulSubmitButton() const { return false; }
-    virtual bool isActivatedSubmit() const { return false; }
-    virtual void setActivatedSubmit(bool) { }
-
-    virtual bool willValidate() const;
-    String validationMessage();
-    void updateVisibleValidationMessage();
-    void hideVisibleValidationMessage();
-    bool checkValidity(Vector<RefPtr<FormAssociatedElement> >* unhandledInvalidControls = 0);
-    // This must be called when a validation constraint or control value is changed.
-    void setNeedsValidityCheck();
-    void setCustomValidity(const String&);
-
-    bool isLabelable() const;
-    PassRefPtr<NodeList> labels();
-
-    bool readOnly() const { return m_readOnly; }
-
-    virtual void attributeChanged(Attribute*, bool preserveDecls = false);
-
-    using TreeShared<ContainerNode>::ref;
-    using TreeShared<ContainerNode>::deref;
-
-protected:
-    HTMLFormControlElement(const QualifiedName& tagName, Document*, HTMLFormElement*);
-
-    virtual void parseMappedAttribute(Attribute*);
-    virtual void attach();
-    virtual void insertedIntoTree(bool deep);
-    virtual void removedFromTree(bool deep);
-    virtual void insertedIntoDocument();
-    virtual void removedFromDocument();
-    virtual void willMoveToNewOwnerDocument();
-
-    virtual bool supportsFocus() const;
-    virtual bool isKeyboardFocusable(KeyboardEvent*) const;
-    virtual bool isMouseFocusable() const;
-
-    virtual void recalcStyle(StyleChange);
-
-    virtual void dispatchBlurEvent();
-    virtual void detach();
-
-    // This must be called any time the result of willValidate() has changed.
-    void setNeedsWillValidateCheck();
-    virtual bool recalcWillValidate() const;
-
-private:
-    virtual const AtomicString& formControlName() const;
-    virtual const AtomicString& formControlType() const = 0;
-
-    virtual void refFormAssociatedElement() { ref(); }
-    virtual void derefFormAssociatedElement() { deref(); }
-
-    virtual bool isFormControlElement() const { return true; }
-
-    virtual short tabIndex() const;
-
-    virtual HTMLFormElement* virtualForm() const;
-    virtual bool isDefaultButtonForForm() const;
-    virtual bool isValidFormControlElement();
-    String visibleValidationMessage() const;
-
-    OwnPtr<ValidationMessage> m_validationMessage;
-    bool m_disabled : 1;
-    bool m_readOnly : 1;
-    bool m_required : 1;
-    bool m_valueMatchesRenderer : 1;
-
-    // The initial value of m_willValidate depends on the derived class. We can't
-    // initialize it with a virtual function in the constructor. m_willValidate
-    // is not deterministic as long as m_willValidateInitialized is false.
-    mutable bool m_willValidateInitialized: 1;
-    mutable bool m_willValidate : 1;
-
-    // Cache of validity()->valid().
-    // But "candidate for constraint validation" doesn't affect m_isValid.
-    bool m_isValid : 1;
-
-    bool m_wasChangedSinceLastFormControlChangeEvent : 1;
-};
-
-// FIXME: Give this class its own header file.
-class HTMLFormControlElementWithState : public HTMLFormControlElement {
-public:
-    virtual ~HTMLFormControlElementWithState();
-
-    virtual bool canContainRangeEndPoint() const { return false; }
-
-protected:
-    HTMLFormControlElementWithState(const QualifiedName& tagName, Document*, HTMLFormElement*);
-
-    virtual bool shouldAutocomplete() const;
-    virtual void finishParsingChildren();
-    virtual void willMoveToNewOwnerDocument();
-    virtual void didMoveToNewOwnerDocument();
-    virtual void defaultEventHandler(Event*);
-
-private:
-    virtual bool shouldSaveAndRestoreFormControlState() const;
-};
-
-// FIXME: Give this class its own header file.
 class HTMLTextFormControlElement : public HTMLFormControlElementWithState {
 public:
@@ -238 +82 @@
     bool hasCachedSelectionEnd() const { return m_cachedSelectionEnd >= 0; }
 
+    virtual void defaultEventHandler(Event*);
+
 private:
     int computeSelectionStart() const;