Changeset 17585 in webkit


Ignore:
Timestamp:
Nov 3, 2006, 4:35:26 PM (18 years ago)
Author:
adele
Message:

Reviewed by Oliver.

Removed DeprecatedRenderSelect and ListBox classes.

  • WebCore.xcodeproj/project.pbxproj:
  • css/html4.css:
  • html/HTMLOptionElement.h:
  • html/HTMLSelectElement.cpp: (WebCore::HTMLSelectElement::recalcStyle): (WebCore::HTMLSelectElement::isKeyboardFocusable): (WebCore::HTMLSelectElement::isMouseFocusable): (WebCore::HTMLSelectElement::createRenderer): (WebCore::HTMLSelectElement::setRecalcListItems): (WebCore::HTMLSelectElement::notifyOptionSelected): (WebCore::HTMLSelectElement::defaultEventHandler): (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): (WebCore::HTMLSelectElement::updateListBoxSelection):
  • html/HTMLSelectElement.h:
  • platform/ListBox.h: Removed.
  • platform/mac/FontCacheMac.mm:
  • platform/mac/ListBoxMac.mm: Removed.
  • platform/win/TemporaryLinkStubs.cpp:
  • rendering/DeprecatedRenderSelect.cpp: Removed.
  • rendering/DeprecatedRenderSelect.h: Removed.
Location:
trunk/WebCore
Files:
4 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r17584 r17585  
     12006-11-03  Adele Peterson  <adele@apple.com>
     2
     3        Reviewed by Oliver.
     4
     5        Removed DeprecatedRenderSelect and ListBox classes.
     6
     7        * WebCore.xcodeproj/project.pbxproj:
     8        * css/html4.css:
     9        * html/HTMLOptionElement.h:
     10        * html/HTMLSelectElement.cpp:
     11        (WebCore::HTMLSelectElement::recalcStyle):
     12        (WebCore::HTMLSelectElement::isKeyboardFocusable):
     13        (WebCore::HTMLSelectElement::isMouseFocusable):
     14        (WebCore::HTMLSelectElement::createRenderer):
     15        (WebCore::HTMLSelectElement::setRecalcListItems):
     16        (WebCore::HTMLSelectElement::notifyOptionSelected):
     17        (WebCore::HTMLSelectElement::defaultEventHandler):
     18        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
     19        (WebCore::HTMLSelectElement::updateListBoxSelection):
     20        * html/HTMLSelectElement.h:
     21        * platform/ListBox.h: Removed.
     22        * platform/mac/FontCacheMac.mm:
     23        * platform/mac/ListBoxMac.mm: Removed.
     24        * platform/win/TemporaryLinkStubs.cpp:
     25        * rendering/DeprecatedRenderSelect.cpp: Removed.
     26        * rendering/DeprecatedRenderSelect.h: Removed.
     27
    1282006-11-03  Maciej Stachowiak  <mjs@apple.com>
    229

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

    r17582 r17585  
    15451545                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
    15461546                93F1996B08245E59001E9ABC /* TextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* TextField.h */; };
    1547                 93F1996C08245E59001E9ABC /* ListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851302DE375901EA4122 /* ListBox.h */; };
    15481547                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15491548                93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851702DE375901EA4122 /* LoaderFunctions.h */; };
    … …  
    15851584                93F19A3108245E59001E9ABC /* LoaderFunctionsMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */; };
    15861585                93F19A3A08245E59001E9ABC /* TextFieldMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* TextFieldMac.mm */; };
    1587                 93F19A3B08245E59001E9ABC /* ListBoxMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* ListBoxMac.mm */; };
    15881586                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
    15891587                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* WebCoreTextField.mm */; };
    … …  
    22772275                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; };
    22782276                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
    2279                 ABE7B5230A489F830031881C /* DeprecatedRenderSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */; };
    2280                 ABE7B5240A489F830031881C /* DeprecatedRenderSelect.h in Headers */ = {isa = PBXBuildFile; fileRef = ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */; };
    22812277                B20111070AB7740500DB0E68 /* JSSVGAElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B20111050AB7740500DB0E68 /* JSSVGAElement.cpp */; };
    22822278                B20111080AB7740500DB0E68 /* JSSVGAElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B20111060AB7740500DB0E68 /* JSSVGAElement.h */; };
    … …  
    51275123                ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMenuList.cpp; sourceTree = "<group>"; };
    51285124                ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; };
    5129                 ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedRenderSelect.cpp; sourceTree = "<group>"; };
    5130                 ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedRenderSelect.h; sourceTree = "<group>"; };
    51315125                B20111050AB7740500DB0E68 /* JSSVGAElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAElement.cpp; sourceTree = "<group>"; };
    51325126                B20111060AB7740500DB0E68 /* JSSVGAElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGAElement.h; sourceTree = "<group>"; };
    … …  
    57365730                F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoaderFunctionsMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    57375731                F587851202DE375901EA4122 /* TextFieldMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextFieldMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    5738                 F587851302DE375901EA4122 /* ListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    5739                 F587851402DE375901EA4122 /* ListBoxMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ListBoxMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    57405732                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    57415733                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    64316423                                6593923909AE435C002C531F /* KURLMac.mm */,
    64326424                                9352084409BD43B900F2038D /* Language.mm */,
    6433                                 F587851402DE375901EA4122 /* ListBoxMac.mm */,
    64346425                                06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
    64356426                                06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */,
    … …  
    85788569                                6593923609AE4346002C531F /* KURL.h */,
    85798570                                85EC9AF90A71A2C600EEEAED /* Language.h */,
    8580                                 F587851302DE375901EA4122 /* ListBox.h */,
    85818571                                935207BD09BD410A00F2038D /* LocalizedStrings.h */,
    85828572                                A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
    … …  
    88338823                                9392F1450AD1860C00691BD4 /* CounterResetNode.h */,
    88348824                                BCEA4817097D93020094C9E4 /* DataRef.h */,
    8835                                 ABE7B5210A489F830031881C /* DeprecatedRenderSelect.cpp */,
    8836                                 ABE7B5220A489F830031881C /* DeprecatedRenderSelect.h */,
    88378825                                BC92F1DB0A40AEA300AC0746 /* DeprecatedSlider.cpp */,
    88388826                                BC92F1DC0A40AEA300AC0746 /* DeprecatedSlider.h */,
    … …  
    91389126                                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
    91399127                                93F1996B08245E59001E9ABC /* TextField.h in Headers */,
    9140                                 93F1996C08245E59001E9ABC /* ListBox.h in Headers */,
    91419128                                93F1996D08245E59001E9ABC /* DeprecatedPtrListImpl.h in Headers */,
    91429129                                93F1996E08245E59001E9ABC /* LoaderFunctions.h in Headers */,
    … …  
    98089795                                85031B4F0A44EFC700F992E0 /* UIEventWithKeyState.h in Headers */,
    98099796                                85031B510A44EFC700F992E0 /* WheelEvent.h in Headers */,
    9810                                 ABE7B5240A489F830031881C /* DeprecatedRenderSelect.h in Headers */,
    98119797                                DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
    98129798                                BCCD74DC0A4C8D35005FDA6D /* HTMLViewSourceDocument.h in Headers */,
    … …  
    1057910565                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
    1058010566                        projectDirPath = "";
    10581                         projectRoot = "";
    1058210567                        targets = (
    1058310568                                93F198A508245E59001E9ABC /* WebCore */,
    … …  
    1067110656                                93F19A3108245E59001E9ABC /* LoaderFunctionsMac.mm in Sources */,
    1067210657                                93F19A3A08245E59001E9ABC /* TextFieldMac.mm in Sources */,
    10673                                 93F19A3B08245E59001E9ABC /* ListBoxMac.mm in Sources */,
    1067410658                                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
    1067510659                                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */,
    … …  
    1130111285                                85031B4D0A44EFC700F992E0 /* UIEvent.cpp in Sources */,
    1130211286                                85031B500A44EFC700F992E0 /* WheelEvent.cpp in Sources */,
    11303                                 ABE7B5230A489F830031881C /* DeprecatedRenderSelect.cpp in Sources */,
    1130411287                                51F11E150A48C2920034A24E /* SQLTransaction.cpp in Sources */,
    1130511288                                DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,

  • trunk/WebCore/css/html4.css

    r17225 r17585  
    424424select[multiple],
    425425select[size][multiple] {
    426     /* FIXME: If we need to switch back to the old listbox implementation, switch the commented style blocks here */
    427 
    428     /* Old listbox appearance */
    429     /*
    430     -webkit-appearance: none;
    431     -webkit-box-align: initial;
    432     box-sizing: initial;
    433     color: initial;
    434     border: initial;
    435     background-color: initial;
    436     */
    437 
    438     /* New listbox appearance */
    439426    -webkit-appearance: listbox;
    440427    -webkit-box-align: start;

  • trunk/WebCore/html/HTMLOptionElement.h

    r16663 r17585  
    3333class HTMLFormElement;
    3434class MappedAttribute;
    35 class DeprecatedRenderSelect;
    3635
    3736class HTMLOptionElement : public HTMLGenericFormElement
    3837{
    39     friend class DeprecatedRenderSelect;
    4038    friend class HTMLSelectElement;
    4139    friend class RenderMenuList;

  • trunk/WebCore/html/HTMLSelectElement.cpp

    r17500 r17585  
    3030#include "CSSPropertyNames.h"
    3131#include "Document.h"
    32 #include "DeprecatedRenderSelect.h"
    3332#include "Event.h"
    3433#include "EventNames.h"
    … …  
    9998        if (usesMenuList())
    10099            static_cast<RenderMenuList*>(renderer())->setOptionsChanged(true);
    101         else if (renderer() && renderer()->isListBox())
     100        else
    102101            static_cast<RenderListBox*>(renderer())->setOptionsChanged(true);
    103         else
    104             static_cast<DeprecatedRenderSelect*>(renderer())->setOptionsChanged(true);
    105102    }
    106103
    … …  
    346343bool HTMLSelectElement::isKeyboardFocusable() const
    347344{
    348     if (renderer() && (usesMenuList() || renderer()->isListBox()))
     345    if (renderer())
    349346        return isFocusable();
    350347    return HTMLGenericFormElement::isKeyboardFocusable();
    … …  
    353350bool HTMLSelectElement::isMouseFocusable() const
    354351{
    355     if (renderer() && (usesMenuList() || renderer()->isListBox()))
     352    if (renderer())
    356353        return isFocusable();
    357354    return HTMLGenericFormElement::isMouseFocusable();
    … …  
    362359    if (usesMenuList())
    363360        return new (arena) RenderMenuList(this);
    364 #if PLATFORM(MAC)
    365     // FIXME: Remove this when DeprecatedRenderSelect is no longer needed.
    366     if (style->appearance() == ListboxAppearance)
    367         return new (arena) RenderListBox(this);
    368     return new (arena) DeprecatedRenderSelect(this);
    369 #endif
    370361    return new (arena) RenderListBox(this);
    371362}
    … …  
    487478        if (usesMenuList())
    488479            static_cast<RenderMenuList*>(renderer())->setOptionsChanged(true);
    489         else if (renderer() && renderer()->isListBox())
     480        else
    490481            static_cast<RenderListBox*>(renderer())->setOptionsChanged(true);
    491         else
    492             static_cast<DeprecatedRenderSelect*>(renderer())->setOptionsChanged(true);
    493482    }
    494483    setChanged();
    … …  
    523512        deselectItems(selectedOption);
    524513
    525     if (renderer() && !usesMenuList()) {
    526         if (renderer()->isListBox())
    527             static_cast<RenderListBox*>(renderer())->setSelectionChanged(true);
    528         else
    529             static_cast<DeprecatedRenderSelect*>(renderer())->setSelectionChanged(true);
    530     }
    531  
     514    if (renderer() && !usesMenuList())
     515        static_cast<RenderListBox*>(renderer())->setSelectionChanged(true);
     516
    532517    setChanged(true);
    533518}
    … …  
    548533    if (usesMenuList())
    549534        menuListDefaultEventHandler(evt);
    550     else if (renderer() && renderer()->isListBox() && renderer()->isListBox())
     535    else
    551536        listBoxDefaultEventHandler(evt);
    552537
    … …  
    628613void HTMLSelectElement::listBoxDefaultEventHandler(Event* evt)
    629614{
     615    if (!renderer())
     616        return;
     617
    630618    if (evt->type() == mousedownEvent) {
    631619        MouseEvent* mEvt = static_cast<MouseEvent*>(evt);
    … …  
    743731void HTMLSelectElement::updateListBoxSelection(bool deselectOtherOptions)
    744732{
     733    ASSERT(renderer() && renderer()->isListBox());
     734   
    745735    unsigned start;
    746736    unsigned end;
    … …  
    763753        }
    764754    }
    765     if (renderer()->isListBox())
    766         static_cast<RenderListBox*>(renderer())->setSelectionChanged(true);
     755
     756    static_cast<RenderListBox*>(renderer())->setSelectionChanged(true);
    767757}
    768758

  • trunk/WebCore/html/HTMLSelectElement.h

    r17498 r17585  
    3535namespace WebCore {
    3636
    37 class DeprecatedRenderSelect;
    3837class HTMLOptionElement;
    3938class HTMLOptionsCollection;
    … …  
    4140
    4241class HTMLSelectElement : public HTMLGenericFormElement {
    43     friend class DeprecatedRenderSelect;
     42
    4443public:
    4544    HTMLSelectElement(Document*, HTMLFormElement* = 0);

  • trunk/WebCore/platform/mac/FontCacheMac.mm

    r16250 r17585  
    3333#import "FontData.h"
    3434#import "FontPlatformData.h"
    35 #import "ListBox.h"
    3635#import "WebCoreStringTruncator.h"
    3736#import "WebCoreSystemInterface.h"

  • trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

    r17410 r17585  
    3737#include "FileChooser.h"
    3838#include "Font.h"
    39 #include "ListBox.h"
    4039#include "IntPoint.h"
    4140#include "Widget.h"
    … …  
    124123double Slider::value() const { notImplemented(); return 0; }
    125124
    126 void ListBox::setSelected(int,bool) { notImplemented(); }
    127 IntSize ListBox::sizeForNumberOfLines(int) const { notImplemented(); return IntSize(); }
    128 bool ListBox::isSelected(int) const { notImplemented(); return 0; }
    129 void ListBox::appendItem(DeprecatedString const&,ListBoxItemType,bool) { notImplemented(); }
    130 void ListBox::doneAppendingItems() { notImplemented(); }
    131 void ListBox::setWritingDirection(TextDirection) { notImplemented(); }
    132 void ListBox::setEnabled(bool) { notImplemented(); }
    133 void ListBox::clear() { notImplemented(); }
    134 bool ListBox::checksDescendantsForFocus() const { notImplemented(); return 0; }
    135 
    136125FileChooser::FileChooser(Document*, RenderFileUploadControl*) { notImplemented(); }
    137126FileChooser::~FileChooser() { notImplemented(); }
    … …  
    143132
    144133Widget::FocusPolicy Slider::focusPolicy() const { notImplemented(); return NoFocus; }
    145 Widget::FocusPolicy ListBox::focusPolicy() const { notImplemented(); return NoFocus; }
    146134Widget::FocusPolicy TextField::focusPolicy() const { notImplemented(); return NoFocus; }
    147135
    … …  
    349337void Scrollbar::setProportion(int, int) { }
    350338
    351 ListBox::ListBox() { }
    352 ListBox::~ListBox() { }
    353 void ListBox::setSelectionMode(ListBox::SelectionMode) { }
    354 void ListBox::setFont(WebCore::Font const&) { }
    355 
    356339Color focusRingColor() { return 0xFF0000FF; }
    357340void setFocusRingColorChangeFunction(void (*)()) { }
Note: See TracChangeset for help on using the changeset viewer.