RS by Tim Hatcher.

        Renamed RenderSelect to DeprecatedRenderSelect to prepare for new popup menu and list menu implementations.

        * WebCore.xcodeproj/project.pbxproj:
        * html/HTMLOptionElement.h:
        * html/HTMLSelectElement.cpp:
        (WebCore::HTMLSelectElement::recalcStyle):
        (WebCore::HTMLSelectElement::createRenderer):
        (WebCore::HTMLSelectElement::setRecalcListItems):
        (WebCore::HTMLSelectElement::reset):
        (WebCore::HTMLSelectElement::notifyOptionSelected):
        * html/HTMLSelectElement.h:
        * rendering/DeprecatedRenderSelect.cpp: Added.
        (WebCore::DeprecatedRenderSelect::DeprecatedRenderSelect):
        (WebCore::DeprecatedRenderSelect::setWidgetWritingDirection):
        (WebCore::DeprecatedRenderSelect::setStyle):
        (WebCore::DeprecatedRenderSelect::updateFromElement):
        (WebCore::DeprecatedRenderSelect::baselinePosition):
        (WebCore::DeprecatedRenderSelect::calcMinMaxWidth):
        (WebCore::DeprecatedRenderSelect::layout):
        (WebCore::DeprecatedRenderSelect::valueChanged):
        (WebCore::DeprecatedRenderSelect::selectionChanged):
        (WebCore::DeprecatedRenderSelect::setOptionsChanged):
        (WebCore::DeprecatedRenderSelect::createListBox):
        (WebCore::DeprecatedRenderSelect::updateSelection):
        * rendering/DeprecatedRenderSelect.h: Added.
        (WebCore::DeprecatedRenderSelect::renderName):
        * rendering/RenderSelect.cpp: Removed.
        * rendering/RenderSelect.h: Removed.

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

diff --git a/LayoutTests/editing/selection/replaced-boundaries-3-expected.txt b/LayoutTests/editing/selection/replaced-boundaries-3-expected.txt
index 28c71fa4a254bc941d7c749d5f01896f9160198e..535bd4b22b448a8fc3940465dcdf4b872d0ad857 100644 (file)
--- a/LayoutTests/editing/selection/replaced-boundaries-3-expected.txt
+++ b/LayoutTests/editing/selection/replaced-boundaries-3-expected.txt
@@ -18,7 +18,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 22x18
           text run at (0,0) width 22: "abc"
         RenderBR {BR} at (22,14) size 0x0
-        RenderSelect {SELECT} at (2,20) size 226x18
+        DeprecatedRenderSelect {SELECT} at (2,20) size 226x18
         RenderText {#text} at (0,0) size 0x0
 selection start: position 1 of child 0 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
 selection end:   position 1 of child 1 {BR} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/editing/selection/select-box-expected.txt b/LayoutTests/editing/selection/select-box-expected.txt
index 11e7498f2d65b533e06778d336aa477b92217908..67c421acf205c9a61f23a5dec9a7e1be9b285d58 100644 (file)
--- a/LayoutTests/editing/selection/select-box-expected.txt
+++ b/LayoutTests/editing/selection/select-box-expected.txt
@@ -89,7 +89,7 @@ layer at (0,0) size 800x600
         RenderBlock {DIV} at (0,0) size 784x22
           RenderText {#text} at (0,1) size 71x18
             text run at (0,1) width 71: "select box: "
-          RenderSelect {SELECT} at (73,2) size 38x18
+          DeprecatedRenderSelect {SELECT} at (73,2) size 38x18
           RenderText {#text} at (113,1) size 66x18
             text run at (113,1) width 66: " the end ..."
 caret: position 89 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/LayoutTests/fast/block/margin-collapse/103-expected.txt b/LayoutTests/fast/block/margin-collapse/103-expected.txt
index 229341e1017f3bb2f3d133bf9f96930ba4bff6ce..869cf3476352cc4d367e68a0ccb298ca7c911a9e 100644 (file)
--- a/LayoutTests/fast/block/margin-collapse/103-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/103-expected.txt
@@ -37,15 +37,15 @@ layer at (0,0) size 785x1691
             RenderBlock (floating) {SPAN} at (0,68) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 128x15
                 text run at (0,2) width 128: "Your degree program*"
-            RenderSelect {SELECT} at (325,68) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,68) size 180x18
             RenderBlock (floating) {SPAN} at (0,88) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 110x15
                 text run at (0,2) width 110: "Your year of study*"
-            RenderSelect {SELECT} at (325,88) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,88) size 180x18
             RenderBlock (floating) {SPAN} at (0,108) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 152x15
                 text run at (0,2) width 152: "Shakespeare classes taken"
-            RenderSelect {SELECT} at (325,108) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,108) size 180x18
             RenderBlock {P} at (0,139) size 560x20 [color=#333333]
               RenderText {#text} at (0,2) size 156x15
                 text run at (0,2) width 156: "* indicates a required field"
@@ -55,12 +55,12 @@ layer at (0,0) size 785x1691
             RenderBlock (floating) {SPAN} at (0,210) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 321x15
                 text run at (0,2) width 321: "What percentage of your research time is spent online?"
-            RenderSelect {SELECT} at (325,210) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,210) size 180x18
             RenderBlock (floating) {SPAN} at (0,230) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 300x35
                 text run at (0,2) width 300: "What is holding you back from doing more research"
                 text run at (0,22) width 41: "online?"
-            RenderSelect {SELECT} at (325,230) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,230) size 180x18
             RenderBlock (floating) {SPAN} at (0,250) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 220x15
                 text run at (0,2) width 220: "Your research is primarily focused on:"
@@ -97,11 +97,11 @@ layer at (0,0) size 785x1691
             RenderBlock (floating) {SPAN} at (0,427) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 274x15
                 text run at (0,2) width 274: "Which area of the ISE did you find most useful?"
-            RenderSelect {SELECT} at (325,427) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,427) size 180x18
             RenderBlock (floating) {SPAN} at (0,447) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 252x15
                 text run at (0,2) width 252: "How did you find the navigation of the ISE?"
-            RenderSelect {SELECT} at (325,447) size 180x18
+            DeprecatedRenderSelect {SELECT} at (325,447) size 180x18
             RenderBlock (floating) {SPAN} at (0,467) size 325x20 [color=#333333]
               RenderText {#text} at (0,2) size 206x15
                 text run at (0,2) width 206: "Please describe your use of the ISE."

diff --git a/LayoutTests/fast/forms/001-expected.txt b/LayoutTests/fast/forms/001-expected.txt
index fbda27fe1253ba362608d7485031dc3ef9ce4d96..4cb0d9e3447cd9dc95ae4b2649dcd3825b3e9ef3 100644 (file)
--- a/LayoutTests/fast/forms/001-expected.txt
+++ b/LayoutTests/fast/forms/001-expected.txt
@@ -10,7 +10,7 @@ layer at (0,0) size 800x600
         RenderTableSection {TBODY} at (2,2) size 780x20
           RenderTableRow {TR} at (0,0) size 780x20
             RenderTableCell {TD} at (0,0) size 57x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderSelect {SELECT} at (3,1) size 51x18
+              DeprecatedRenderSelect {SELECT} at (3,1) size 51x18
             RenderTableCell {TD} at (57,9) size 723x2 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
       RenderBlock {P} at (0,98) size 784x24
         RenderTable {TABLE} at (0,0) size 784x24 [border: (2px outset #808080)]

diff --git a/LayoutTests/fast/forms/003-expected.txt b/LayoutTests/fast/forms/003-expected.txt
index 2c1faf42e50fb82e52acc8fcf237c96af50c9eb1..e0e074bac6fab91c03c240b4ccf4467e6a537a9c 100644 (file)
--- a/LayoutTests/fast/forms/003-expected.txt
+++ b/LayoutTests/fast/forms/003-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSelect {SELECT} at (2,0) size 59x18
+      DeprecatedRenderSelect {SELECT} at (2,0) size 59x18
       RenderBlock (anonymous) at (0,20) size 784x18
         RenderText {#text} at (0,0) size 292x18
           text run at (0,0) width 292: "This text should be *below* the select widget."

diff --git a/LayoutTests/fast/forms/004-expected.txt b/LayoutTests/fast/forms/004-expected.txt
index ace3c50c80f0b872d9f0851bd9a1f346761f4543..73e75f4a084bf23f68c4304750bde1c8c38b3f64 100644 (file)
--- a/LayoutTests/fast/forms/004-expected.txt
+++ b/LayoutTests/fast/forms/004-expected.txt
@@ -3,8 +3,8 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSelect {SELECT} at (2,2) size 59x18
+      DeprecatedRenderSelect {SELECT} at (2,2) size 59x18
       RenderText {#text} at (63,1) size 4x18
         text run at (63,1) width 4: " "
-      RenderSelect {SELECT} at (69,2) size 79x18
+      DeprecatedRenderSelect {SELECT} at (69,2) size 79x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.txt
index 2b6e15b5280d78d5706c8f393309a736addb5600..4a6a0bb858a89d0edca0fb61431d54b037131d09 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label01-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 673x18
         text run at (0,0) width 673: "In the selection list below, the text 'The label for this element is \"1\"' should appear, and not the character '1'"
       RenderBR {BR} at (673,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 197x18
+      DeprecatedRenderSelect {SELECT} at (2,20) size 197x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.txt
index 41d76b9ab41e06c528de0d9c79ca7a06bb24fd09..afe23f6978d2e6ce4430997bef9fcc8e6e1befa4 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label02-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 300x18
         text run at (0,0) width 300: "With the label empty, the enclosing text is used."
       RenderBR {BR} at (300,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 309x18
+      DeprecatedRenderSelect {SELECT} at (2,20) size 309x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.txt
index 160d88fcf7f0323c2890b3f452a6ac1767ee02d8..1b2655159d302de23afda11d3f0131fb6e543773 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label03-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 436x18
         text run at (0,0) width 436: "When the label contains only white space, the containing text is used."
       RenderBR {BR} at (436,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 338x18
+      DeprecatedRenderSelect {SELECT} at (2,20) size 338x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.txt
index 49d1ab970a45c0c56077630acc3abc0379572f8a..5e1740ad5ca643f3f1077d26f76339bebbac3c33 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label04-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 595x18
         text run at (0,0) width 595: "The label attribute appears, but is missing the equals value piece, so the containing text is used."
       RenderBR {BR} at (595,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 464x18
+      DeprecatedRenderSelect {SELECT} at (2,20) size 464x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.txt
index 393a40b58aa24acad3cd554f7026108c06925d09..48221d0a43c3334d221a1eab38acc5ea427d3220 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label05-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 668x18
         text run at (0,0) width 668: "In the list box below, the text \"This text should appear\" should be shown as the first entry into the list box."
       RenderBR {BR} at (668,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 144x72
+      DeprecatedRenderSelect {SELECT} at (2,20) size 144x72
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
index e9f54e9b0ea76f7d33b692ace1083187b9242fad..4349969af1ad3c577d11f2a8b9d79dae10f8f424 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label06-expected.txt
@@ -6,5 +6,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 718x18
         text run at (0,0) width 718: "The select item below has a label specified, and no enclosed text. There should be no text shown in the select box."
       RenderBR {BR} at (718,14) size 0x0
-      RenderSelect {SELECT} at (2,20) size 53x18
+      DeprecatedRenderSelect {SELECT} at (2,20) size 53x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt b/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
index 5914bf088b7078b6b2ec52aae4130f7e3b929cfb..350c2f611d1720d9a1827e8d1416a2f986542020 100644 (file)
--- a/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
+++ b/LayoutTests/fast/forms/HTMLOptionElement_label07-expected.txt
@@ -7,5 +7,5 @@ layer at (0,0) size 800x600
         text run at (0,0) width 781: "The select item below has a label specified, and enclosed text that is whitespace. There should be no text shown in the select"
         text run at (0,18) width 28: "box."
       RenderBR {BR} at (28,32) size 0x0
-      RenderSelect {SELECT} at (2,38) size 36x18
+      DeprecatedRenderSelect {SELECT} at (2,38) size 36x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/form-element-geometry-expected.txt b/LayoutTests/fast/forms/form-element-geometry-expected.txt
index c742f1a5f5c0fcddc4c65d89e544b73ac137f8ef..d7f614245b17475839ce965d70dbe3e642627b66 100644 (file)
--- a/LayoutTests/fast/forms/form-element-geometry-expected.txt
+++ b/LayoutTests/fast/forms/form-element-geometry-expected.txt
@@ -25,7 +25,7 @@ layer at (0,0) size 785x625
             RenderTableCell {TD} at (62,2) size 68x24 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 66x22 [border: (2px solid #0000FF)]
                 RenderInline {FONT} at (0,0) size 62x18
-                  RenderSelect {SELECT} at (2,2) size 62x18
+                  DeprecatedRenderSelect {SELECT} at (2,2) size 62x18
               RenderBlock (anonymous) at (1,23) size 66x0
                 RenderInline {FONT} at (0,0) size 0x0
             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
@@ -51,7 +51,7 @@ layer at (0,0) size 785x625
                       text run at (0,0) width 36: "button"
             RenderTableCell {TD} at (62,2) size 68x24 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 66x22 [border: (2px solid #0000FF)]
-                RenderSelect {SELECT} at (2,2) size 62x18
+                DeprecatedRenderSelect {SELECT} at (2,2) size 62x18
             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
                 RenderBlock {INPUT} at (2,2) size 12x13
@@ -71,7 +71,7 @@ layer at (0,0) size 785x625
             RenderTableCell {TD} at (62,2) size 68x24 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 66x22 [border: (2px solid #0000FF)]
                 RenderInline {FONT} at (0,0) size 62x13
-                  RenderSelect {SELECT} at (2,2) size 62x18
+                  DeprecatedRenderSelect {SELECT} at (2,2) size 62x18
             RenderTableCell {TD} at (132,4) size 18x19 [r=0 c=2 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 16x17 [border: (2px solid #0000FF)]
                 RenderInline {FONT} at (0,0) size 12x12
@@ -88,7 +88,7 @@ layer at (0,0) size 785x625
                 RenderTextField {INPUT} at (2,2) size 78x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
             RenderTableCell {TD} at (88,2) size 40x64 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 38x62 [border: (2px solid #0000FF)]
-                RenderSelect {SELECT} at (2,2) size 34x58
+                DeprecatedRenderSelect {SELECT} at (2,2) size 34x58
             RenderTableCell {TD} at (130,2) size 240x24 [r=0 c=2 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 238x22 [border: (2px solid #0000FF)]
                 RenderFileButton {INPUT} at (2,2) size 234x18
@@ -108,7 +108,7 @@ layer at (0,0) size 785x625
                 text run at (0,0) width 36: "button"
           RenderText {#text} at (99,0) size 6x28
             text run at (99,0) width 6: " "
-          RenderSelect {SELECT} at (107,9) size 62x18
+          DeprecatedRenderSelect {SELECT} at (107,9) size 62x18
           RenderText {#text} at (171,0) size 6x28
             text run at (171,0) width 6: " "
           RenderBlock {INPUT} at (180,11) size 12x13
@@ -125,7 +125,7 @@ layer at (0,0) size 785x625
               text run at (0,0) width 36: "button"
         RenderText {#text} at (83,1) size 4x18
           text run at (83,1) width 4: " "
-        RenderSelect {SELECT} at (89,2) size 62x18
+        DeprecatedRenderSelect {SELECT} at (89,2) size 62x18
         RenderText {#text} at (153,1) size 4x18
           text run at (153,1) width 4: " "
         RenderBlock {INPUT} at (160,4) size 12x13
@@ -143,7 +143,7 @@ layer at (0,0) size 785x625
                 text run at (0,0) width 36: "button"
           RenderText {#text} at (74,5) size 3x13
             text run at (74,5) width 3: " "
-          RenderSelect {SELECT} at (79,2) size 62x18
+          DeprecatedRenderSelect {SELECT} at (79,2) size 62x18
           RenderText {#text} at (143,5) size 3x13
             text run at (143,5) width 3: " "
           RenderBlock {INPUT} at (149,4) size 12x13
@@ -168,33 +168,33 @@ layer at (0,0) size 785x625
       RenderBlock {DIV} at (0,536) size 769x29
         RenderInline {FONT} at (0,0) size 181x28
           RenderText {#text} at (0,0) size 0x0
-          RenderSelect {SELECT} at (2,9) size 36x18
+          DeprecatedRenderSelect {SELECT} at (2,9) size 36x18
           RenderText {#text} at (40,0) size 6x28
             text run at (40,0) width 6: " "
-          RenderSelect {SELECT} at (48,9) size 36x18
+          DeprecatedRenderSelect {SELECT} at (48,9) size 36x18
           RenderText {#text} at (86,0) size 6x28
             text run at (86,0) width 6: " "
-          RenderSelect {SELECT} at (94,9) size 85x18
+          DeprecatedRenderSelect {SELECT} at (94,9) size 85x18
           RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,565) size 769x22
-        RenderSelect {SELECT} at (2,2) size 36x18
+        DeprecatedRenderSelect {SELECT} at (2,2) size 36x18
         RenderText {#text} at (40,1) size 4x18
           text run at (40,1) width 4: " "
-        RenderSelect {SELECT} at (46,2) size 36x18
+        DeprecatedRenderSelect {SELECT} at (46,2) size 36x18
         RenderText {#text} at (84,1) size 4x18
           text run at (84,1) width 4: " "
-        RenderSelect {SELECT} at (90,2) size 85x18
+        DeprecatedRenderSelect {SELECT} at (90,2) size 85x18
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,587) size 769x22
         RenderInline {FONT} at (0,0) size 175x13
           RenderText {#text} at (0,0) size 0x0
-          RenderSelect {SELECT} at (2,2) size 36x18
+          DeprecatedRenderSelect {SELECT} at (2,2) size 36x18
           RenderText {#text} at (40,5) size 3x13
             text run at (40,5) width 3: " "
-          RenderSelect {SELECT} at (45,2) size 36x18
+          DeprecatedRenderSelect {SELECT} at (45,2) size 36x18
           RenderText {#text} at (83,5) size 3x13
             text run at (83,5) width 3: " "
-          RenderSelect {SELECT} at (88,2) size 85x18
+          DeprecatedRenderSelect {SELECT} at (88,2) size 85x18
           RenderText {#text} at (0,0) size 0x0
 layer at (16,242) size 72x13
   RenderBlock {DIV} at (3,3) size 72x13

diff --git a/LayoutTests/fast/forms/option-script-expected.txt b/LayoutTests/fast/forms/option-script-expected.txt
index 7f2825da73bf1e723fc2cb1196f6ff830a2bda43..1e54c86266fd1b5c0e2f864105cc330026cc6142 100644 (file)
--- a/LayoutTests/fast/forms/option-script-expected.txt
+++ b/LayoutTests/fast/forms/option-script-expected.txt
@@ -11,6 +11,6 @@ layer at (0,0) size 800x600
         text run at (0,18) width 109: "TEST FAILED: "
         text run at (109,18) width 316: "If the popup menu says \"document.write('Text')\". "
       RenderBR {BR} at (425,32) size 0x0
-      RenderSelect {SELECT} at (2,38) size 55x18
+      DeprecatedRenderSelect {SELECT} at (2,38) size 55x18
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/forms/option-strip-whitespace-expected.txt b/LayoutTests/fast/forms/option-strip-whitespace-expected.txt
index 4af7e6e3bb7474731196e00e565b2cb9344cc4b2..d1d6139364fd7bca3c7e6ec129a35569bbea8d72 100644 (file)
--- a/LayoutTests/fast/forms/option-strip-whitespace-expected.txt
+++ b/LayoutTests/fast/forms/option-strip-whitespace-expected.txt
@@ -9,27 +9,27 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,34) size 784x262
         RenderText {#text} at (0,41) size 71x18
           text run at (0,41) width 71: "Five Tabs: "
-        RenderSelect {SELECT} at (73,2) size 67x58
+        DeprecatedRenderSelect {SELECT} at (73,2) size 67x58
         RenderBR {BR} at (142,55) size 0x0
         RenderBR {BR} at (0,62) size 0x18
         RenderText {#text} at (0,121) size 84x18
           text run at (0,121) width 84: "Five Spaces: "
-        RenderSelect {SELECT} at (86,82) size 67x58
+        DeprecatedRenderSelect {SELECT} at (86,82) size 67x58
         RenderBR {BR} at (155,135) size 0x0
         RenderBR {BR} at (0,142) size 0x18
         RenderText {#text} at (0,161) size 298x18
           text run at (0,161) width 298: "Five Spaces (with leading/trailing whitespace): "
-        RenderSelect {SELECT} at (300,162) size 92x18
+        DeprecatedRenderSelect {SELECT} at (300,162) size 92x18
         RenderBR {BR} at (394,175) size 0x0
         RenderBR {BR} at (0,182) size 0x18
         RenderText {#text} at (0,201) size 285x18
           text run at (0,201) width 285: "Five Tabs (with leading/trailing whitespace): "
-        RenderSelect {SELECT} at (287,202) size 81x18
+        DeprecatedRenderSelect {SELECT} at (287,202) size 81x18
         RenderBR {BR} at (370,215) size 0x0
         RenderBR {BR} at (0,222) size 0x18
         RenderText {#text} at (0,241) size 126x18
           text run at (0,241) width 126: "Mixed Whitespace: "
-        RenderSelect {SELECT} at (128,242) size 81x18
+        DeprecatedRenderSelect {SELECT} at (128,242) size 81x18
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/invalid/014-expected.txt b/LayoutTests/fast/invalid/014-expected.txt
index 703a7832bcff2171477b968f054d78155e507022..1b1b49b03cd58298b5251b49fa6b0d9b02a1cbfd 100644 (file)
--- a/LayoutTests/fast/invalid/014-expected.txt
+++ b/LayoutTests/fast/invalid/014-expected.txt
@@ -9,13 +9,13 @@ layer at (0,0) size 800x600
           text run at (282,0) width 321: "H2 should allow a form inside it, but p should not. "
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {FORM} at (0,18) size 784x22
-        RenderSelect {SELECT} at (2,2) size 39x18
+        DeprecatedRenderSelect {SELECT} at (2,2) size 39x18
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,56) size 784x0
 layer at (470,45) size 47x50
   RenderBlock (positioned) {H2} at (470,45) size 47x50 [border: (2px solid #008000)]
     RenderBlock {FORM} at (2,2) size 43x22
-      RenderSelect {SELECT} at (2,2) size 39x18
+      DeprecatedRenderSelect {SELECT} at (2,2) size 39x18
       RenderText {#text} at (0,0) size 0x0
 layer at (470,42) size 4x4
   RenderBlock (positioned) {P} at (470,42) size 4x4 [border: (2px solid #008000)]

diff --git a/LayoutTests/fast/parser/document-write-option-expected.txt b/LayoutTests/fast/parser/document-write-option-expected.txt
index 728aae10dd7aeef144c9933de5dedad485aa5ec3..61251bdfd7cb432809f61db50f80ff3de785a610 100644 (file)
--- a/LayoutTests/fast/parser/document-write-option-expected.txt
+++ b/LayoutTests/fast/parser/document-write-option-expected.txt
@@ -3,5 +3,5 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderSelect {SELECT} at (2,2) size 324x18
+      DeprecatedRenderSelect {SELECT} at (2,2) size 324x18
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/fast/replaced/width100percent-expected.txt b/LayoutTests/fast/replaced/width100percent-expected.txt
index 09804e858f06ab6638abee7e170457d81d73bc3e..bd8a31c4c433c01306c8f906cab16116cc5e905e 100644 (file)
--- a/LayoutTests/fast/replaced/width100percent-expected.txt
+++ b/LayoutTests/fast/replaced/width100percent-expected.txt
@@ -167,11 +167,11 @@ layer at (0,0) size 785x980
         RenderTableSection {TBODY} at (0,0) size 769x26
           RenderTableRow {TR} at (0,1) size 769x24
             RenderTableCell {TD} at (1,1) size 53x24 [r=0 c=0 rs=1 cs=1]
-              RenderSelect {SELECT} at (1,3) size 51x18
+              DeprecatedRenderSelect {SELECT} at (1,3) size 51x18
             RenderTableCell {TD} at (55,1) size 2x24 [r=0 c=1 rs=1 cs=1]
-              RenderSelect {SELECT} at (1,3) size 51x18
+              DeprecatedRenderSelect {SELECT} at (1,3) size 51x18
             RenderTableCell {TD} at (58,1) size 2x24 [r=0 c=2 rs=1 cs=1]
-              RenderSelect {SELECT} at (1,3) size 59x18
+              DeprecatedRenderSelect {SELECT} at (1,3) size 59x18
             RenderTableCell {TD} at (61,3) size 707x20 [r=0 c=3 rs=1 cs=1]
               RenderText {#text} at (1,1) size 4x18
                 text run at (1,1) width 4: " "

diff --git a/LayoutTests/fast/text/updateNewFont-expected.txt b/LayoutTests/fast/text/updateNewFont-expected.txt
index f802dc0aa5e7575a8c8e4c622db20cf100a6ccbf..8619da8acbcfc904191149869eda87dc55714a96 100644 (file)
--- a/LayoutTests/fast/text/updateNewFont-expected.txt
+++ b/LayoutTests/fast/text/updateNewFont-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x126
   RenderBlock {HTML} at (0,0) size 800x126
     RenderBody {BODY} at (8,8) size 784x110
-      RenderSelect {SELECT} at (0,0) size 34x110
+      DeprecatedRenderSelect {SELECT} at (0,0) size 34x110
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/tables/mozilla/bugs/bug1188-expected.txt b/LayoutTests/tables/mozilla/bugs/bug1188-expected.txt
index e69b1a5b9916c764f5a84bb0d78eaef4dc76d4d9..881f7c748f266dc4bb19f3c56f6437052d6e1d74 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug1188-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug1188-expected.txt
@@ -19,7 +19,7 @@ layer at (0,0) size 800x600
                       text run at (49,5) width 127: "Search the Web with"
                 RenderText {#text} at (176,3) size 4x18
                   text run at (176,3) width 4: " "
-                RenderSelect {SELECT} at (182,4) size 80x18
+                DeprecatedRenderSelect {SELECT} at (182,4) size 80x18
                 RenderTextField {INPUT} at (266,3) size 217x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
                 RenderText {#text} at (485,3) size 4x18
                   text run at (485,3) width 4: " "

diff --git a/LayoutTests/tables/mozilla/bugs/bug18359-expected.txt b/LayoutTests/tables/mozilla/bugs/bug18359-expected.txt
index bf94dc289dadc0943457c3518cef68aeb2575305..12d8c1a8257538bd0cdc53bceb7555693a458c87 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug18359-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug18359-expected.txt
@@ -28,7 +28,7 @@ layer at (0,0) size 800x600
                   RenderText {#text} at (1,1) size 105x18
                     text run at (1,1) width 105: "Run Test Case:"
               RenderTableCell {TD} at (111,29) size 467x24 [r=1 c=1 rs=1 cs=1]
-                RenderSelect {SELECT} at (3,3) size 262x18
+                DeprecatedRenderSelect {SELECT} at (3,3) size 262x18
                 RenderText {#text} at (0,0) size 0x0
               RenderTableCell {TD} at (580,29) size 88x24 [r=1 c=2 rs=1 cs=1]
                 RenderButton {INPUT} at (3,3) size 82x18 [bgcolor=#C0C0C0]

diff --git a/LayoutTests/tables/mozilla/bugs/bug2479-3-expected.txt b/LayoutTests/tables/mozilla/bugs/bug2479-3-expected.txt
index d87c139a6246763aba03ad4ee82f3f90416f76aa..5467837d95e40b1cc339f6e7e241461631240b71 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug2479-3-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug2479-3-expected.txt
@@ -66,7 +66,7 @@ layer at (0,0) size 785x680
         RenderBlock {P} at (0,0) size 769x45
           RenderText {#text} at (0,2) size 263x18
             text run at (0,2) width 263: "How does your browser fare on this test? "
-          RenderSelect {SELECT} at (265,3) size 246x18
+          DeprecatedRenderSelect {SELECT} at (265,3) size 246x18
           RenderText {#text} at (513,2) size 4x18
             text run at (513,2) width 4: " "
           RenderInline {LABEL} at (0,0) size 222x18

diff --git a/LayoutTests/tables/mozilla/bugs/bug2479-4-expected.txt b/LayoutTests/tables/mozilla/bugs/bug2479-4-expected.txt
index dc997204f3208b4b49459474ac286ae7b1fd98c1..cdf8c27ebc6da3cc6e0b589fe36f62220994a894 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug2479-4-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug2479-4-expected.txt
@@ -184,7 +184,7 @@ layer at (0,0) size 785x2526
         RenderBlock {P} at (0,0) size 769x45
           RenderText {#text} at (0,1) size 263x18
             text run at (0,1) width 263: "How does your browser fare on this test? "
-          RenderSelect {SELECT} at (265,2) size 473x18
+          DeprecatedRenderSelect {SELECT} at (265,2) size 473x18
           RenderText {#text} at (0,0) size 0x0
           RenderInline {LABEL} at (0,0) size 222x18
             RenderText {#text} at (0,24) size 70x18

diff --git a/LayoutTests/tables/mozilla/bugs/bug29326-expected.txt b/LayoutTests/tables/mozilla/bugs/bug29326-expected.txt
index b5124134204b83d62c0be57abd7e7424bded4aa0..4917e05824e786c94ab2ec4aa9b59b59849ef905 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug29326-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug29326-expected.txt
@@ -8,5 +8,5 @@ layer at (0,0) size 800x600
           RenderTableRow {TR} at (0,2) size 398x42
             RenderTableCell {TD} at (2,2) size 394x42 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderBlock {FORM} at (2,2) size 390x22
-                RenderSelect {SELECT} at (2,2) size 54x18
+                DeprecatedRenderSelect {SELECT} at (2,2) size 54x18
                 RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/tables/mozilla/bugs/bug33855-expected.txt b/LayoutTests/tables/mozilla/bugs/bug33855-expected.txt
index 40242668dde1ac8d8131909363f266114ba92553..0f434ed6d7e64f5fe29096d14a5b508f16048547 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug33855-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug33855-expected.txt
@@ -31,7 +31,7 @@ layer at (0,0) size 800x600
                     RenderText at (0,0) size 47x13
                       text run at (0,0) width 47: "Move to:"
               RenderTableCell {TD} at (666,2) size 116x24 [r=0 c=5 rs=1 cs=1]
-                RenderSelect {SELECT} at (3,3) size 110x18
+                DeprecatedRenderSelect {SELECT} at (3,3) size 110x18
                 RenderText {#text} at (0,0) size 0x0
                 RenderText {#text} at (0,0) size 0x0
                 RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/tables/mozilla/bugs/bug4382-expected.txt b/LayoutTests/tables/mozilla/bugs/bug4382-expected.txt
index 4f72da008835a772e9f4de8bd68ebc89a01e921a..1dbbfce8bf1465a9fea7627e43111585efba5807 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug4382-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug4382-expected.txt
@@ -16,7 +16,7 @@ layer at (0,0) size 800x600
         RenderTextField {INPUT} at (53,2) size 134x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (189,2) size 4x18
           text run at (189,2) width 4: " "
-        RenderSelect {SELECT} at (195,3) size 77x18
+        DeprecatedRenderSelect {SELECT} at (195,3) size 77x18
         RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,57) size 784x36
         RenderBR {BR} at (0,0) size 0x18
@@ -24,6 +24,6 @@ layer at (0,0) size 800x600
           text run at (0,18) width 264: "The select should not contain blank items "
         RenderBR {BR} at (264,32) size 0x0
       RenderBlock {FORM} at (0,93) size 784x22
-        RenderSelect {SELECT} at (2,2) size 230x18
+        DeprecatedRenderSelect {SELECT} at (2,2) size 230x18
 layer at (64,31) size 128x13
   RenderBlock {DIV} at (3,3) size 128x13

diff --git a/LayoutTests/tables/mozilla/bugs/bug96334-expected.txt b/LayoutTests/tables/mozilla/bugs/bug96334-expected.txt
index b7e408d95f95024bb7186d804c6fefadcd224c98..8ab1256708ea89ab7d62d4fab3c823929ed28d38 100644 (file)
--- a/LayoutTests/tables/mozilla/bugs/bug96334-expected.txt
+++ b/LayoutTests/tables/mozilla/bugs/bug96334-expected.txt
@@ -31,7 +31,7 @@ layer at (0,0) size 999x600
                         RenderTableSection {TBODY} at (2,2) size 187x30
                           RenderTableRow {TR} at (0,2) size 187x26
                             RenderTableCell {TD} at (2,2) size 183x26 [border: (1px solid #C0C0C0)] [r=0 c=0 rs=1 cs=1]
-                              RenderSelect {SELECT} at (4,4) size 175x18
+                              DeprecatedRenderSelect {SELECT} at (4,4) size 175x18
                               RenderText {#text} at (0,0) size 0x0
             RenderTableCell {TD} at (211,2) size 774x40 [border: (1px solid #C0C0C0)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 770x36

diff --git a/LayoutTests/tables/mozilla/core/margins-expected.txt b/LayoutTests/tables/mozilla/core/margins-expected.txt
index 09482708a4d438c8dfe2184bdc956b5374b771ec..133fc652595eca081863177c92a9ac7580148e77 100644 (file)
--- a/LayoutTests/tables/mozilla/core/margins-expected.txt
+++ b/LayoutTests/tables/mozilla/core/margins-expected.txt
@@ -11,7 +11,7 @@ layer at (0,0) size 800x600
           RenderTableRow {TR} at (0,2) size 398x42
             RenderTableCell {TD} at (2,2) size 394x42 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderBlock {FORM} at (2,2) size 390x22
-                RenderSelect {SELECT} at (2,2) size 54x18
+                DeprecatedRenderSelect {SELECT} at (2,2) size 54x18
                 RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,66) size 784x18
         RenderText {#text} at (0,0) size 296x18

diff --git a/LayoutTests/tables/mozilla/dom/tableDom-expected.txt b/LayoutTests/tables/mozilla/dom/tableDom-expected.txt
index d3dbc1a00adc61395091ec6050b1fc84ee6f1fd5..ae8ee9de7d22b0329b44f3509dd1a837274639cc 100644 (file)
--- a/LayoutTests/tables/mozilla/dom/tableDom-expected.txt
+++ b/LayoutTests/tables/mozilla/dom/tableDom-expected.txt
@@ -4,7 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {FORM} at (0,0) size 784x23
-        RenderSelect {SELECT} at (2,3) size 95x18
+        DeprecatedRenderSelect {SELECT} at (2,3) size 95x18
         RenderText {#text} at (99,2) size 52x18
           text run at (99,2) width 52: "   tbody "
         RenderTextField {INPUT} at (153,2) size 43x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]

diff --git a/LayoutTests/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt b/LayoutTests/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
index 48143c6ed53a19c8c6e4e0a805961bf60c7a9a15..ae82aadbaad84b54a1dc1841076cb530191f3731 100644 (file)
--- a/LayoutTests/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
+++ b/LayoutTests/tables/mozilla_expected_failures/bugs/bug2479-5-expected.txt
@@ -134,7 +134,7 @@ layer at (8,8) size 769x1776
               RenderBlock {P} at (1,17) size 458x63
                 RenderText {#text} at (0,0) size 259x18
                   text run at (0,0) width 259: "How does your browser fare on this test?"
-                RenderSelect {SELECT} at (2,20) size 454x18 [color=#000000]
+                DeprecatedRenderSelect {SELECT} at (2,20) size 454x18 [color=#000000]
                 RenderText {#text} at (0,0) size 0x0
                 RenderInline {LABEL} at (0,0) size 222x18
                   RenderText {#text} at (0,42) size 70x18

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d080697deae5ef0e210433a1af45e37c85bfcfc..2844f8dbf10e32f229042104e2cfd3e0af1a47f4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2006-06-20  Adele Peterson  <adele@apple.com>
+
+        RS by Tim Hatcher.
+
+        Renamed RenderSelect to DeprecatedRenderSelect to prepare for new popup menu and list menu implementations.
+       
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/HTMLOptionElement.h:
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::recalcStyle):
+        (WebCore::HTMLSelectElement::createRenderer):
+        (WebCore::HTMLSelectElement::setRecalcListItems):
+        (WebCore::HTMLSelectElement::reset):
+        (WebCore::HTMLSelectElement::notifyOptionSelected):
+        * html/HTMLSelectElement.h:
+        * rendering/DeprecatedRenderSelect.cpp: Added.
+        (WebCore::DeprecatedRenderSelect::DeprecatedRenderSelect):
+        (WebCore::DeprecatedRenderSelect::setWidgetWritingDirection):
+        (WebCore::DeprecatedRenderSelect::setStyle):
+        (WebCore::DeprecatedRenderSelect::updateFromElement):
+        (WebCore::DeprecatedRenderSelect::baselinePosition):
+        (WebCore::DeprecatedRenderSelect::calcMinMaxWidth):
+        (WebCore::DeprecatedRenderSelect::layout):
+        (WebCore::DeprecatedRenderSelect::valueChanged):
+        (WebCore::DeprecatedRenderSelect::selectionChanged):
+        (WebCore::DeprecatedRenderSelect::setOptionsChanged):
+        (WebCore::DeprecatedRenderSelect::createListBox):
+        (WebCore::DeprecatedRenderSelect::updateSelection):
+        * rendering/DeprecatedRenderSelect.h: Added.
+        (WebCore::DeprecatedRenderSelect::renderName):
+        * rendering/RenderSelect.cpp: Removed.
+        * rendering/RenderSelect.h: Removed.
+
 2006-06-20  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 97f1b803fa3443491131edd91716ae6c4c0370bc..25a069f910402d0d56f12cd7a0d3869e96b5f7c0 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1300,12 +1300,10 @@
                A8EA73CD0A1900E300A8EF5F /* RenderImageButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA73B90A1900E300A8EF5F /* RenderImageButton.h */; };
                A8EA73CE0A1900E300A8EF5F /* RenderTextArea.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA73BA0A1900E300A8EF5F /* RenderTextArea.h */; };
                A8EA73CF0A1900E300A8EF5F /* RenderImageButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73BB0A1900E300A8EF5F /* RenderImageButton.cpp */; };
-               A8EA73D00A1900E300A8EF5F /* RenderSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73BC0A1900E300A8EF5F /* RenderSelect.cpp */; };
                A8EA73D10A1900E300A8EF5F /* RenderLegend.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA73BD0A1900E300A8EF5F /* RenderLegend.h */; };
                A8EA73D20A1900E300A8EF5F /* RenderLineEdit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73BE0A1900E300A8EF5F /* RenderLineEdit.cpp */; };
                A8EA73D30A1900E300A8EF5F /* RenderFormElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73BF0A1900E300A8EF5F /* RenderFormElement.cpp */; };
                A8EA73D40A1900E300A8EF5F /* RenderLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA73C00A1900E300A8EF5F /* RenderLabel.cpp */; };
-               A8EA73D60A1900E300A8EF5F /* RenderSelect.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA73C20A1900E300A8EF5F /* RenderSelect.h */; };
                A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E50A1916DF00A8EF5F /* HTMLOListElement.h */; };
                A8EA79F20A1916DF00A8EF5F /* HTMLUListElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A8EA79E60A1916DF00A8EF5F /* HTMLUListElement.h */; };
                A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8EA79E70A1916DF00A8EF5F /* HTMLUListElement.cpp */; };
@@ -1375,6 +1373,8 @@
                AB4261D80A2F6C9700BDD17D /* missingImage.tiff in Resources */ = {isa = PBXBuildFile; fileRef = AB4261D70A2F6C9700BDD17D /* missingImage.tiff */; };
                AB67D1A8097F3AE300F9392E /* RenderTextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */; };
                AB67D1A9097F3AE300F9392E /* RenderTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextField.h */; };
+               ABE7B5230A489F830031881C /* DeprecatedRenderSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */; };
+               ABE7B5240A489F830031881C /* DeprecatedRenderSelect.h in Headers */ = {isa = PBXBuildFile; fileRef = ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */; };
                BC066F6F09FEB2FA00C589A7 /* WebCoreTextRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC1A37AD097C715F0019F3D8 /* DOM.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A3797097C715F0019F3D8 /* DOM.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC1A37AE097C715F0019F3D8 /* DOM.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A3798097C715F0019F3D8 /* DOM.mm */; };
@@ -3029,12 +3029,10 @@
                A8EA73B90A1900E300A8EF5F /* RenderImageButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderImageButton.h; sourceTree = "<group>"; };
                A8EA73BA0A1900E300A8EF5F /* RenderTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextArea.h; sourceTree = "<group>"; };
                A8EA73BB0A1900E300A8EF5F /* RenderImageButton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderImageButton.cpp; sourceTree = "<group>"; };
-               A8EA73BC0A1900E300A8EF5F /* RenderSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSelect.cpp; sourceTree = "<group>"; };
                A8EA73BD0A1900E300A8EF5F /* RenderLegend.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderLegend.h; sourceTree = "<group>"; };
                A8EA73BE0A1900E300A8EF5F /* RenderLineEdit.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLineEdit.cpp; sourceTree = "<group>"; };
                A8EA73BF0A1900E300A8EF5F /* RenderFormElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFormElement.cpp; sourceTree = "<group>"; };
                A8EA73C00A1900E300A8EF5F /* RenderLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLabel.cpp; sourceTree = "<group>"; };
-               A8EA73C20A1900E300A8EF5F /* RenderSelect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderSelect.h; sourceTree = "<group>"; };
                A8EA79E50A1916DF00A8EF5F /* HTMLOListElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLOListElement.h; sourceTree = "<group>"; };
                A8EA79E60A1916DF00A8EF5F /* HTMLUListElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HTMLUListElement.h; sourceTree = "<group>"; };
                A8EA79E70A1916DF00A8EF5F /* HTMLUListElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLUListElement.cpp; sourceTree = "<group>"; };
@@ -3102,6 +3100,8 @@
                AB4261D70A2F6C9700BDD17D /* missingImage.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = missingImage.tiff; sourceTree = "<group>"; };
                AB67D1A6097F3AE300F9392E /* RenderTextField.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextField.cpp; sourceTree = "<group>"; };
                AB67D1A7097F3AE300F9392E /* RenderTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderTextField.h; sourceTree = "<group>"; };
+               ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedRenderSelect.cpp; sourceTree = "<group>"; };
+               ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedRenderSelect.h; sourceTree = "<group>"; };
                BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreTextRenderer.h; sourceTree = "<group>"; };
                BC06F24906D18A7E004A6FA3 /* XSLStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLStyleSheet.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BC06F24A06D18A7E004A6FA3 /* XSLStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = XSLStyleSheet.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -5222,6 +5222,8 @@
                F523D2F302DE443B018635CA /* rendering */ = {
                        isa = PBXGroup;
                        children = (
+                               ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */,
+                               ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */,
                                A8CFF04B0A154F09000A4234 /* AutoTableLayout.cpp */,
                                A8CFF0490A154F09000A4234 /* AutoTableLayout.h */,
                                BCEA4813097D93020094C9E4 /* bidi.cpp */,
@@ -5306,8 +5308,6 @@
                                A871DECD0A1530C700B12A68 /* RenderPartObject.h */,
                                A871DFDE0A15376B00B12A68 /* RenderReplaced.cpp */,
                                A871DFDF0A15376B00B12A68 /* RenderReplaced.h */,
-                               A8EA73BC0A1900E300A8EF5F /* RenderSelect.cpp */,
-                               A8EA73C20A1900E300A8EF5F /* RenderSelect.h */,
                                A8DF4AE20980C42C0052981B /* RenderTable.cpp */,
                                A8DF4AE10980C42C0052981B /* RenderTable.h */,
                                A8DF4AE00980C42C0052981B /* RenderTableCell.cpp */,
@@ -6162,7 +6162,6 @@
                                A8EA73CD0A1900E300A8EF5F /* RenderImageButton.h in Headers */,
                                A8EA73CE0A1900E300A8EF5F /* RenderTextArea.h in Headers */,
                                A8EA73D10A1900E300A8EF5F /* RenderLegend.h in Headers */,
-                               A8EA73D60A1900E300A8EF5F /* RenderSelect.h in Headers */,
                                A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */,
                                A8EA79F20A1916DF00A8EF5F /* HTMLUListElement.h in Headers */,
                                A8EA79F40A1916DF00A8EF5F /* HTMLMenuElement.h in Headers */,
@@ -6313,6 +6312,7 @@
                                85031B4E0A44EFC700F992E0 /* UIEvent.h in Headers */,
                                85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */,
                                85031B510A44EFC700F992E0 /* WheelEvent.h in Headers */,
+                               ABE7B5240A489F830031881C /* DeprecatedRenderSelect.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -7012,7 +7012,6 @@
                                A8EA73C80A1900E300A8EF5F /* RenderTextArea.cpp in Sources */,
                                A8EA73CA0A1900E300A8EF5F /* RenderLegend.cpp in Sources */,
                                A8EA73CF0A1900E300A8EF5F /* RenderImageButton.cpp in Sources */,
-                               A8EA73D00A1900E300A8EF5F /* RenderSelect.cpp in Sources */,
                                A8EA73D20A1900E300A8EF5F /* RenderLineEdit.cpp in Sources */,
                                A8EA73D30A1900E300A8EF5F /* RenderFormElement.cpp in Sources */,
                                A8EA73D40A1900E300A8EF5F /* RenderLabel.cpp in Sources */,
@@ -7164,6 +7163,7 @@
                                85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
                                85031B4D0A44EFC700F992E0 /* UIEvent.cpp in Sources */,
                                85031B500A44EFC700F992E0 /* WheelEvent.cpp in Sources */,
+                               ABE7B5230A489F830031881C /* DeprecatedRenderSelect.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/WebCore/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h
index 9f4d7a52f2f4970388eec6f3399f834882b92447..1659f72f8dc7a53769f2a1ea85c1b31377fd8581 100644 (file)
--- a/WebCore/html/HTMLOptionElement.h
+++ b/WebCore/html/HTMLOptionElement.h
@@ -32,11 +32,11 @@ namespace WebCore {
 class HTMLSelectElement;
 class HTMLFormElement;
 class MappedAttribute;
-class RenderSelect;
+class DeprecatedRenderSelect;
 
 class HTMLOptionElement : public HTMLGenericFormElement
 {
-    friend class RenderSelect;
+    friend class DeprecatedRenderSelect;
     friend class HTMLSelectElement;
 
 public:

diff --git a/WebCore/html/HTMLSelectElement.cpp b/WebCore/html/HTMLSelectElement.cpp
index 4a4f89186356c149d61f0eda6509b038cb25faeb..ca5c736d20102f001c492231ab9184b5ac50fe77 100644 (file)
--- a/WebCore/html/HTMLSelectElement.cpp
+++ b/WebCore/html/HTMLSelectElement.cpp
@@ -37,7 +37,7 @@
 #include "HTMLOptionElement.h"
 #include "HTMLOptionsCollection.h"
 #include "KeyboardEvent.h"
-#include "RenderSelect.h"
+#include "DeprecatedRenderSelect.h"
 #include "cssstyleselector.h"
 #include <wtf/Vector.h>
 
@@ -76,7 +76,7 @@ bool HTMLSelectElement::checkDTD(const Node* newChild)
 void HTMLSelectElement::recalcStyle( StyleChange ch )
 {
     if (hasChangedChild() && renderer())
-        static_cast<RenderSelect*>(renderer())->setOptionsChanged(true);
+        static_cast<DeprecatedRenderSelect*>(renderer())->setOptionsChanged(true);
 
     HTMLGenericFormElement::recalcStyle( ch );
 }
@@ -272,7 +272,7 @@ void HTMLSelectElement::parseMappedAttribute(MappedAttribute *attr)
 
 RenderObject *HTMLSelectElement::createRenderer(RenderArena *arena, RenderStyle *style)
 {
-    return new (arena) RenderSelect(this);
+    return new (arena) DeprecatedRenderSelect(this);
 }
 
 bool HTMLSelectElement::appendFormData(FormDataList& list, bool)
@@ -390,7 +390,7 @@ void HTMLSelectElement::setRecalcListItems()
 {
     m_recalcListItems = true;
     if (renderer())
-        static_cast<RenderSelect*>(renderer())->setOptionsChanged(true);
+        static_cast<DeprecatedRenderSelect*>(renderer())->setOptionsChanged(true);
     setChanged();
 }
 
@@ -415,7 +415,7 @@ void HTMLSelectElement::reset()
     if (!optionSelected && firstOption)
         firstOption->setSelected(true);
     if (renderer())
-        static_cast<RenderSelect*>(renderer())->setSelectionChanged(true);
+        static_cast<DeprecatedRenderSelect*>(renderer())->setSelectionChanged(true);
     setChanged(true);
 }
 
@@ -431,7 +431,7 @@ void HTMLSelectElement::notifyOptionSelected(HTMLOptionElement *selectedOption,
         }
     }
     if (renderer())
-        static_cast<RenderSelect*>(renderer())->setSelectionChanged(true);
+        static_cast<DeprecatedRenderSelect*>(renderer())->setSelectionChanged(true);
 
     setChanged(true);
 }

diff --git a/WebCore/html/HTMLSelectElement.h b/WebCore/html/HTMLSelectElement.h
index f534650522c0da6f2920fff34c2a22b8c770a89c..721105e43094151655cd6dec65ae68971ebf6759 100644 (file)
--- a/WebCore/html/HTMLSelectElement.h
+++ b/WebCore/html/HTMLSelectElement.h
@@ -33,10 +33,10 @@ namespace WebCore {
 
 class HTMLOptionElement;
 class HTMLOptionsCollection;
-class RenderSelect;
+class DeprecatedRenderSelect;
 
 class HTMLSelectElement : public HTMLGenericFormElement {
-    friend class RenderSelect;
+    friend class DeprecatedRenderSelect;
 
 public:
     HTMLSelectElement(Document*, HTMLFormElement* = 0);

diff --git a/WebCore/rendering/RenderSelect.cpp b/WebCore/rendering/DeprecatedRenderSelect.cpp
similarity index 94%
rename from WebCore/rendering/RenderSelect.cpp
rename to WebCore/rendering/DeprecatedRenderSelect.cpp
index 409a6c1610a21f6662999d7edc4354af64f8e24c..2ba96c404270107103d76ef79162b423167ad628 100644 (file)
--- a/WebCore/rendering/RenderSelect.cpp
+++ b/WebCore/rendering/DeprecatedRenderSelect.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "RenderSelect.h"
+#include "DeprecatedRenderSelect.h"
 
 #include "HTMLNames.h"
 #include "HTMLOptGroupElement.h"
@@ -38,7 +38,7 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-RenderSelect::RenderSelect(HTMLSelectElement* element)
+DeprecatedRenderSelect::DeprecatedRenderSelect(HTMLSelectElement* element)
     : RenderFormElement(element)
     , m_size(element->size())
     , m_multiple(element->multiple())
@@ -53,7 +53,7 @@ RenderSelect::RenderSelect(HTMLSelectElement* element)
         setWidget(new QComboBox);
 }
 
-void RenderSelect::setWidgetWritingDirection()
+void DeprecatedRenderSelect::setWidgetWritingDirection()
 {
     TextDirection d = style()->direction() == RTL ? RTL : LTR;
     if (m_useListBox)
@@ -62,13 +62,13 @@ void RenderSelect::setWidgetWritingDirection()
         static_cast<QComboBox*>(m_widget)->setWritingDirection(d);
 }
 
-void RenderSelect::setStyle(RenderStyle* s)
+void DeprecatedRenderSelect::setStyle(RenderStyle* s)
 {
     RenderFormElement::setStyle(s);
     setWidgetWritingDirection();
 }
 
-void RenderSelect::updateFromElement()
+void DeprecatedRenderSelect::updateFromElement()
 {
     m_ignoreSelectEvents = true;
 
@@ -173,7 +173,7 @@ void RenderSelect::updateFromElement()
     RenderFormElement::updateFromElement();
 }
 
-short RenderSelect::baselinePosition(bool f, bool isRootLineBox) const
+short DeprecatedRenderSelect::baselinePosition(bool f, bool isRootLineBox) const
 {
     if (m_useListBox) {
         // FIXME: Should get the hardcoded constant of 7 by calling a QListBox function,
@@ -183,7 +183,7 @@ short RenderSelect::baselinePosition(bool f, bool isRootLineBox) const
     return RenderFormElement::baselinePosition(f, isRootLineBox);
 }
 
-void RenderSelect::calcMinMaxWidth()
+void DeprecatedRenderSelect::calcMinMaxWidth()
 {
     ASSERT(!minMaxKnown());
 
@@ -199,7 +199,7 @@ void RenderSelect::calcMinMaxWidth()
     RenderFormElement::calcMinMaxWidth();
 }
 
-void RenderSelect::layout()
+void DeprecatedRenderSelect::layout()
 {
     ASSERT(needsLayout());
     ASSERT(minMaxKnown());
@@ -244,7 +244,7 @@ void RenderSelect::layout()
     m_widget->setEnabled(foundOption && ! static_cast<HTMLSelectElement*>(node())->disabled());
 }
 
-void RenderSelect::valueChanged(Widget*)
+void DeprecatedRenderSelect::valueChanged(Widget*)
 {
     if (m_ignoreSelectEvents)
         return;
@@ -292,7 +292,7 @@ void RenderSelect::valueChanged(Widget*)
     static_cast<HTMLSelectElement*>(node())->onChange();
 }
 
-void RenderSelect::selectionChanged(Widget*)
+void DeprecatedRenderSelect::selectionChanged(Widget*)
 {
     if (m_ignoreSelectEvents)
         return;
@@ -314,12 +314,12 @@ void RenderSelect::selectionChanged(Widget*)
     static_cast<HTMLSelectElement*>(node())->onChange();
 }
 
-void RenderSelect::setOptionsChanged(bool _optionsChanged)
+void DeprecatedRenderSelect::setOptionsChanged(bool _optionsChanged)
 {
     m_optionsChanged = _optionsChanged;
 }
 
-QListBox* RenderSelect::createListBox()
+QListBox* DeprecatedRenderSelect::createListBox()
 {
     QListBox *lb = new QListBox();
     lb->setSelectionMode(m_multiple ? QListBox::Extended : QListBox::Single);
@@ -327,7 +327,7 @@ QListBox* RenderSelect::createListBox()
     return lb;
 }
 
-void RenderSelect::updateSelection()
+void DeprecatedRenderSelect::updateSelection()
 {
     Vector<HTMLElement*> listItems = static_cast<HTMLSelectElement*>(node())->listItems();
     int i;

diff --git a/WebCore/rendering/RenderSelect.h b/WebCore/rendering/DeprecatedRenderSelect.h
similarity index 88%
rename from WebCore/rendering/RenderSelect.h
rename to WebCore/rendering/DeprecatedRenderSelect.h
index 0d1645f6609232596a6c631d70599de3b8e2583e..c0f35606758d6a5ccedd1fb69d057ee60777acaf 100644 (file)
--- a/WebCore/rendering/RenderSelect.h
+++ b/WebCore/rendering/DeprecatedRenderSelect.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RenderSelect_h
-#define RenderSelect_h
+#ifndef DeprecatedRenderSelect_h
+#define DeprecatedRenderSelect_h
 
 #include "RenderFormElement.h"
 
@@ -34,11 +34,11 @@ namespace WebCore {
     
     class HTMLSelectElement;
 
-    class RenderSelect : public RenderFormElement {
+    class DeprecatedRenderSelect : public RenderFormElement {
     public:
-        RenderSelect(HTMLSelectElement*);
+        DeprecatedRenderSelect(HTMLSelectElement*);
 
-        virtual const char* renderName() const { return "RenderSelect"; }
+        virtual const char* renderName() const { return "DeprecatedRenderSelect"; }
 
         short baselinePosition(bool f, bool b) const;
         int calcReplacedHeight() const { if (!m_useListBox) return intrinsicHeight(); return RenderFormElement::calcReplacedHeight(); }
@@ -74,4 +74,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // RenderSelect_h
+#endif // DeprecatedRenderSelect_h