Changeset 21544 in webkit


Ignore:
Timestamp:
May 17, 2007 4:15:37 PM (17 years ago)
Author:
adele
Message:

Reviewed by Hyatt.

Update RenderMenuList PopupClient methods to consider style of inner block.

  • rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::itemStyle): (WebCore::RenderMenuList::clientStyle):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r21543 r21544  
     12007-05-17  Adele Peterson  <adele@apple.com>
     2
     3        Reviewed by Hyatt.
     4
     5        Update RenderMenuList PopupClient methods to consider style of inner block.
     6
     7        * rendering/RenderMenuList.cpp:
     8        (WebCore::RenderMenuList::itemStyle):
     9        (WebCore::RenderMenuList::clientStyle):
     10
    1112007-05-17  Maciej Stachowiak  <mjs@apple.com>
    212
  • trunk/WebCore/rendering/RenderMenuList.cpp

    r21541 r21544  
    294294    HTMLElement* element = select->listItems()[listIndex];
    295295   
    296     return element->renderStyle() ? element->renderStyle() : style();
     296    return element->renderStyle() ? element->renderStyle() : clientStyle();
    297297}
    298298
    299299RenderStyle* RenderMenuList::clientStyle() const
    300300{
    301     return style();
     301    return m_innerBlock ? m_innerBlock->style() : style();
    302302}
    303303
Note: See TracChangeset for help on using the changeset viewer.