Changeset 64462 in webkit


Ignore:
Timestamp:
Aug 2, 2010 7:53:46 AM (14 years ago)
Author:
jorlow@chromium.org
Message:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • GNUmakefile.am:
  • WebCore.exp.in:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • loader/EmptyClients.h:
  • page/Chrome.cpp:
  • page/Chrome.h:
  • page/ChromeClient.h:
  • platform/PopupMenu.h: (WebCore::PopupMenu::create): (WebCore::PopupMenu::disconnectClient): (WebCore::PopupMenu::client): (WebCore::PopupMenu::scrollbar): (WebCore::PopupMenu::itemHeight): (WebCore::PopupMenu::windowRect): (WebCore::PopupMenu::popupHandle): (WebCore::PopupMenu::setWasClicked): (WebCore::PopupMenu::wasClicked): (WebCore::PopupMenu::setScrollOffset): (WebCore::PopupMenu::scrollOffset): (WebCore::PopupMenu::wheelDelta): (WebCore::PopupMenu::scrollbarCapturingMouse): (WebCore::PopupMenu::setScrollbarCapturingMouse): (WebCore::PopupMenu::isActive): (WebCore::PopupMenu::scrollbarCornerPresent):
  • platform/SearchPopupMenu.h: (WebCore::SearchPopupMenu::create):
  • platform/brew/PopupMenuBrew.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/brew/PopupMenuBrew.h: Removed.
  • platform/brew/SearchPopupMenuBrew.cpp: (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::enabled):
  • platform/brew/SearchPopupMenuBrew.h: Removed.
  • platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/chromium/PopupMenuChromium.h:
  • platform/chromium/SearchPopupMenuChromium.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::enabled): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches):
  • platform/chromium/SearchPopupMenuChromium.h: Removed.
  • platform/efl/PopupMenuEfl.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/efl/PopupMenuEfl.h: Removed.
  • platform/efl/SearchPopupMenuEfl.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::enabled):
  • platform/efl/SearchPopupMenuEfl.h: Removed.
  • platform/gtk/PopupMenuGtk.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural): (WebCore::PopupMenu::menuItemActivated): (WebCore::PopupMenu::menuUnmapped): (WebCore::PopupMenu::menuPositionFunction): (WebCore::PopupMenu::menuRemoveItem):
  • platform/gtk/PopupMenuGtk.h: Removed.
  • platform/gtk/SearchPopupMenuGtk.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::enabled):
  • platform/gtk/SearchPopupMenuGtk.h: Removed.
  • platform/haiku/PopupMenuHaiku.cpp: (WebCore::PopupMenuHaiku::PopupMenuHaiku): (WebCore::PopupMenuHaiku::~PopupMenuHaiku): (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/haiku/PopupMenuHaiku.h: Removed.
  • platform/haiku/SearchPopupMenuHaiku.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::enabled):
  • platform/haiku/SearchPopupMenuHaiku.h: Removed.
  • platform/mac/PopupMenuMac.h: Removed.
  • platform/mac/PopupMenuMac.mm: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::clear): (WebCore::PopupMenu::populate): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/mac/SearchPopupMenuMac.h: Removed.
  • platform/mac/SearchPopupMenuMac.mm: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::enabled): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches):
  • platform/qt/PopupMenuQt.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/qt/PopupMenuQt.h: Removed.
  • platform/qt/QtAbstractWebPopup.h:
  • platform/qt/SearchPopupMenuQt.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::enabled):
  • platform/qt/SearchPopupMenuQt.h: Removed.
  • platform/win/PopupMenuWin.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::popupClassName): (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::calculatePositionAndSize): (WebCore::PopupMenu::setFocusedIndex): (WebCore::PopupMenu::visibleItems): (WebCore::PopupMenu::listIndexAtPoint): (WebCore::PopupMenu::focusedIndex): (WebCore::PopupMenu::focusFirst): (WebCore::PopupMenu::focusLast): (WebCore::PopupMenu::down): (WebCore::PopupMenu::up): (WebCore::PopupMenu::invalidateItem): (WebCore::PopupMenu::clientRect): (WebCore::PopupMenu::incrementWheelDelta): (WebCore::PopupMenu::reduceWheelDelta): (WebCore::PopupMenu::scrollToRevealSelection): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural): (WebCore::PopupMenu::paint): (WebCore::PopupMenu::valueChanged): (WebCore::PopupMenu::invalidateScrollbarRect): (WebCore::PopupMenu::registerClass): (WebCore::PopupMenu::PopupMenuWndProc): (WebCore::PopupMenu::wndProc):
  • platform/win/PopupMenuWin.h: Removed.
  • platform/win/SearchPopupMenuWin.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::enabled): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches):
  • platform/win/SearchPopupMenuWin.h: Removed.
  • platform/wx/PopupMenuWx.cpp: (WebCore::PopupMenu::PopupMenu): (WebCore::PopupMenu::~PopupMenu): (WebCore::PopupMenu::show): (WebCore::PopupMenu::OnMenuItemSelected): (WebCore::PopupMenu::hide): (WebCore::PopupMenu::updateFromElement): (WebCore::PopupMenu::itemWritingDirectionIsNatural):
  • platform/wx/PopupMenuWx.h: Removed.
  • platform/wx/SearchPopupMenuWx.cpp: (WebCore::SearchPopupMenu::SearchPopupMenu): (WebCore::SearchPopupMenu::saveRecentSearches): (WebCore::SearchPopupMenu::loadRecentSearches): (WebCore::SearchPopupMenu::enabled):
  • platform/wx/SearchPopupMenuWx.h: Removed.
  • rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::adjustInnerStyle): (WebCore::RenderMenuList::showPopup):
  • rendering/RenderMenuList.h:
  • rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::~RenderTextControlSingleLine): (WebCore::RenderTextControlSingleLine::addSearchResult): (WebCore::RenderTextControlSingleLine::showPopup): (WebCore::RenderTextControlSingleLine::hidePopup): (WebCore::RenderTextControlSingleLine::updateFromElement): (WebCore::RenderTextControlSingleLine::valueChanged):
  • rendering/RenderTextControlSingleLine.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • src/ChromeClientImpl.cpp:
  • src/ChromeClientImpl.h:
  • tests/PopupMenuTest.cpp: (WebKit::SelectPopupMenuTest::SetUp):

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/ChromeClientEfl.cpp:
  • WebCoreSupport/ChromeClientEfl.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/ChromeClientGtk.cpp:
  • WebCoreSupport/ChromeClientGtk.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/ChromeClientHaiku.cpp:
  • WebCoreSupport/ChromeClientHaiku.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/WebChromeClient.h:
  • WebCoreSupport/WebChromeClient.mm:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/ChromeClientQt.cpp:
  • WebCoreSupport/ChromeClientQt.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebCoreSupport/WebChromeClient.cpp:
  • WebCoreSupport/WebChromeClient.h:
  • WebView.cpp: (WebView::mouseWheel):

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebKitSupport/ChromeClientWx.cpp:
  • WebKitSupport/ChromeClientWx.h:

2010-08-02 Jeremy Orlow <jorlow@chromium.org>

Speculative revert of 64425 due to Chromium instability
https://bugs.webkit.org/show_bug.cgi?id=43347

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/WebChromeClient.cpp:
  • WebProcess/WebCoreSupport/WebChromeClient.h:
  • WebProcess/WebCoreSupport/WebPopupMenu.cpp: Removed.
  • WebProcess/WebCoreSupport/WebPopupMenu.h: Removed.
  • WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp: Removed.
  • WebProcess/WebCoreSupport/WebSearchPopupMenu.h: Removed.
  • win/WebKit2.vcproj:
Location:
trunk
Files:
21 deleted
68 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r64461 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * GNUmakefile.am:
     7        * WebCore.exp.in:
     8        * WebCore.gypi:
     9        * WebCore.pro:
     10        * WebCore.vcproj/WebCore.vcproj:
     11        * WebCore.xcodeproj/project.pbxproj:
     12        * loader/EmptyClients.h:
     13        * page/Chrome.cpp:
     14        * page/Chrome.h:
     15        * page/ChromeClient.h:
     16        * platform/PopupMenu.h:
     17        (WebCore::PopupMenu::create):
     18        (WebCore::PopupMenu::disconnectClient):
     19        (WebCore::PopupMenu::client):
     20        (WebCore::PopupMenu::scrollbar):
     21        (WebCore::PopupMenu::itemHeight):
     22        (WebCore::PopupMenu::windowRect):
     23        (WebCore::PopupMenu::popupHandle):
     24        (WebCore::PopupMenu::setWasClicked):
     25        (WebCore::PopupMenu::wasClicked):
     26        (WebCore::PopupMenu::setScrollOffset):
     27        (WebCore::PopupMenu::scrollOffset):
     28        (WebCore::PopupMenu::wheelDelta):
     29        (WebCore::PopupMenu::scrollbarCapturingMouse):
     30        (WebCore::PopupMenu::setScrollbarCapturingMouse):
     31        (WebCore::PopupMenu::isActive):
     32        (WebCore::PopupMenu::scrollbarCornerPresent):
     33        * platform/SearchPopupMenu.h:
     34        (WebCore::SearchPopupMenu::create):
     35        * platform/brew/PopupMenuBrew.cpp:
     36        (WebCore::PopupMenu::PopupMenu):
     37        (WebCore::PopupMenu::~PopupMenu):
     38        (WebCore::PopupMenu::show):
     39        (WebCore::PopupMenu::hide):
     40        (WebCore::PopupMenu::updateFromElement):
     41        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     42        * platform/brew/PopupMenuBrew.h: Removed.
     43        * platform/brew/SearchPopupMenuBrew.cpp:
     44        (WebCore::SearchPopupMenu::saveRecentSearches):
     45        (WebCore::SearchPopupMenu::loadRecentSearches):
     46        (WebCore::SearchPopupMenu::SearchPopupMenu):
     47        (WebCore::SearchPopupMenu::enabled):
     48        * platform/brew/SearchPopupMenuBrew.h: Removed.
     49        * platform/chromium/PopupMenuChromium.cpp:
     50        (WebCore::PopupMenu::PopupMenu):
     51        (WebCore::PopupMenu::~PopupMenu):
     52        (WebCore::PopupMenu::show):
     53        (WebCore::PopupMenu::hide):
     54        (WebCore::PopupMenu::updateFromElement):
     55        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     56        * platform/chromium/PopupMenuChromium.h:
     57        * platform/chromium/SearchPopupMenuChromium.cpp:
     58        (WebCore::SearchPopupMenu::SearchPopupMenu):
     59        (WebCore::SearchPopupMenu::enabled):
     60        (WebCore::SearchPopupMenu::saveRecentSearches):
     61        (WebCore::SearchPopupMenu::loadRecentSearches):
     62        * platform/chromium/SearchPopupMenuChromium.h: Removed.
     63        * platform/efl/PopupMenuEfl.cpp:
     64        (WebCore::PopupMenu::PopupMenu):
     65        (WebCore::PopupMenu::~PopupMenu):
     66        (WebCore::PopupMenu::show):
     67        (WebCore::PopupMenu::hide):
     68        (WebCore::PopupMenu::updateFromElement):
     69        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     70        * platform/efl/PopupMenuEfl.h: Removed.
     71        * platform/efl/SearchPopupMenuEfl.cpp:
     72        (WebCore::SearchPopupMenu::SearchPopupMenu):
     73        (WebCore::SearchPopupMenu::saveRecentSearches):
     74        (WebCore::SearchPopupMenu::loadRecentSearches):
     75        (WebCore::SearchPopupMenu::enabled):
     76        * platform/efl/SearchPopupMenuEfl.h: Removed.
     77        * platform/gtk/PopupMenuGtk.cpp:
     78        (WebCore::PopupMenu::PopupMenu):
     79        (WebCore::PopupMenu::~PopupMenu):
     80        (WebCore::PopupMenu::show):
     81        (WebCore::PopupMenu::hide):
     82        (WebCore::PopupMenu::updateFromElement):
     83        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     84        (WebCore::PopupMenu::menuItemActivated):
     85        (WebCore::PopupMenu::menuUnmapped):
     86        (WebCore::PopupMenu::menuPositionFunction):
     87        (WebCore::PopupMenu::menuRemoveItem):
     88        * platform/gtk/PopupMenuGtk.h: Removed.
     89        * platform/gtk/SearchPopupMenuGtk.cpp:
     90        (WebCore::SearchPopupMenu::SearchPopupMenu):
     91        (WebCore::SearchPopupMenu::saveRecentSearches):
     92        (WebCore::SearchPopupMenu::loadRecentSearches):
     93        (WebCore::SearchPopupMenu::enabled):
     94        * platform/gtk/SearchPopupMenuGtk.h: Removed.
     95        * platform/haiku/PopupMenuHaiku.cpp:
     96        (WebCore::PopupMenuHaiku::PopupMenuHaiku):
     97        (WebCore::PopupMenuHaiku::~PopupMenuHaiku):
     98        (WebCore::PopupMenu::PopupMenu):
     99        (WebCore::PopupMenu::~PopupMenu):
     100        (WebCore::PopupMenu::show):
     101        (WebCore::PopupMenu::hide):
     102        (WebCore::PopupMenu::updateFromElement):
     103        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     104        * platform/haiku/PopupMenuHaiku.h: Removed.
     105        * platform/haiku/SearchPopupMenuHaiku.cpp:
     106        (WebCore::SearchPopupMenu::SearchPopupMenu):
     107        (WebCore::SearchPopupMenu::saveRecentSearches):
     108        (WebCore::SearchPopupMenu::loadRecentSearches):
     109        (WebCore::SearchPopupMenu::enabled):
     110        * platform/haiku/SearchPopupMenuHaiku.h: Removed.
     111        * platform/mac/PopupMenuMac.h: Removed.
     112        * platform/mac/PopupMenuMac.mm:
     113        (WebCore::PopupMenu::PopupMenu):
     114        (WebCore::PopupMenu::~PopupMenu):
     115        (WebCore::PopupMenu::clear):
     116        (WebCore::PopupMenu::populate):
     117        (WebCore::PopupMenu::show):
     118        (WebCore::PopupMenu::hide):
     119        (WebCore::PopupMenu::updateFromElement):
     120        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     121        * platform/mac/SearchPopupMenuMac.h: Removed.
     122        * platform/mac/SearchPopupMenuMac.mm:
     123        (WebCore::SearchPopupMenu::SearchPopupMenu):
     124        (WebCore::SearchPopupMenu::enabled):
     125        (WebCore::SearchPopupMenu::saveRecentSearches):
     126        (WebCore::SearchPopupMenu::loadRecentSearches):
     127        * platform/qt/PopupMenuQt.cpp:
     128        (WebCore::PopupMenu::PopupMenu):
     129        (WebCore::PopupMenu::~PopupMenu):
     130        (WebCore::PopupMenu::show):
     131        (WebCore::PopupMenu::hide):
     132        (WebCore::PopupMenu::updateFromElement):
     133        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     134        * platform/qt/PopupMenuQt.h: Removed.
     135        * platform/qt/QtAbstractWebPopup.h:
     136        * platform/qt/SearchPopupMenuQt.cpp:
     137        (WebCore::SearchPopupMenu::SearchPopupMenu):
     138        (WebCore::SearchPopupMenu::saveRecentSearches):
     139        (WebCore::SearchPopupMenu::loadRecentSearches):
     140        (WebCore::SearchPopupMenu::enabled):
     141        * platform/qt/SearchPopupMenuQt.h: Removed.
     142        * platform/win/PopupMenuWin.cpp:
     143        (WebCore::PopupMenu::PopupMenu):
     144        (WebCore::PopupMenu::~PopupMenu):
     145        (WebCore::PopupMenu::popupClassName):
     146        (WebCore::PopupMenu::show):
     147        (WebCore::PopupMenu::hide):
     148        (WebCore::PopupMenu::calculatePositionAndSize):
     149        (WebCore::PopupMenu::setFocusedIndex):
     150        (WebCore::PopupMenu::visibleItems):
     151        (WebCore::PopupMenu::listIndexAtPoint):
     152        (WebCore::PopupMenu::focusedIndex):
     153        (WebCore::PopupMenu::focusFirst):
     154        (WebCore::PopupMenu::focusLast):
     155        (WebCore::PopupMenu::down):
     156        (WebCore::PopupMenu::up):
     157        (WebCore::PopupMenu::invalidateItem):
     158        (WebCore::PopupMenu::clientRect):
     159        (WebCore::PopupMenu::incrementWheelDelta):
     160        (WebCore::PopupMenu::reduceWheelDelta):
     161        (WebCore::PopupMenu::scrollToRevealSelection):
     162        (WebCore::PopupMenu::updateFromElement):
     163        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     164        (WebCore::PopupMenu::paint):
     165        (WebCore::PopupMenu::valueChanged):
     166        (WebCore::PopupMenu::invalidateScrollbarRect):
     167        (WebCore::PopupMenu::registerClass):
     168        (WebCore::PopupMenu::PopupMenuWndProc):
     169        (WebCore::PopupMenu::wndProc):
     170        * platform/win/PopupMenuWin.h: Removed.
     171        * platform/win/SearchPopupMenuWin.cpp:
     172        (WebCore::SearchPopupMenu::SearchPopupMenu):
     173        (WebCore::SearchPopupMenu::enabled):
     174        (WebCore::SearchPopupMenu::saveRecentSearches):
     175        (WebCore::SearchPopupMenu::loadRecentSearches):
     176        * platform/win/SearchPopupMenuWin.h: Removed.
     177        * platform/wx/PopupMenuWx.cpp:
     178        (WebCore::PopupMenu::PopupMenu):
     179        (WebCore::PopupMenu::~PopupMenu):
     180        (WebCore::PopupMenu::show):
     181        (WebCore::PopupMenu::OnMenuItemSelected):
     182        (WebCore::PopupMenu::hide):
     183        (WebCore::PopupMenu::updateFromElement):
     184        (WebCore::PopupMenu::itemWritingDirectionIsNatural):
     185        * platform/wx/PopupMenuWx.h: Removed.
     186        * platform/wx/SearchPopupMenuWx.cpp:
     187        (WebCore::SearchPopupMenu::SearchPopupMenu):
     188        (WebCore::SearchPopupMenu::saveRecentSearches):
     189        (WebCore::SearchPopupMenu::loadRecentSearches):
     190        (WebCore::SearchPopupMenu::enabled):
     191        * platform/wx/SearchPopupMenuWx.h: Removed.
     192        * rendering/RenderMenuList.cpp:
     193        (WebCore::RenderMenuList::adjustInnerStyle):
     194        (WebCore::RenderMenuList::showPopup):
     195        * rendering/RenderMenuList.h:
     196        * rendering/RenderTextControlSingleLine.cpp:
     197        (WebCore::RenderTextControlSingleLine::~RenderTextControlSingleLine):
     198        (WebCore::RenderTextControlSingleLine::addSearchResult):
     199        (WebCore::RenderTextControlSingleLine::showPopup):
     200        (WebCore::RenderTextControlSingleLine::hidePopup):
     201        (WebCore::RenderTextControlSingleLine::updateFromElement):
     202        (WebCore::RenderTextControlSingleLine::valueChanged):
     203        * rendering/RenderTextControlSingleLine.h:
     204
    12052010-08-02  Markus Goetz  <Markus.Goetz@nokia.com>
    2206
  • trunk/WebCore/GNUmakefile.am

    r64425 r64462  
    24662466        WebCore/platform/gtk/PlatformScreenGtk.cpp \
    24672467        WebCore/platform/gtk/PopupMenuGtk.cpp \
    2468         WebCore/platform/gtk/PopupMenuGtk.h \
    24692468        WebCore/platform/gtk/RenderThemeGtk.cpp \
    24702469        WebCore/platform/gtk/RenderThemeGtk.h \
     
    24752474        WebCore/platform/gtk/ScrollViewGtk.cpp \
    24762475        WebCore/platform/gtk/SearchPopupMenuGtk.cpp \
    2477         WebCore/platform/gtk/SearchPopupMenuGtk.h \
    24782476        WebCore/platform/gtk/SharedBufferGtk.cpp \
    24792477        WebCore/platform/gtk/SharedTimerGtk.cpp \
  • trunk/WebCore/WebCore.exp.in

    r64425 r64462  
    251251__ZN7WebCore12IconDatabase5closeEv
    252252__ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
    253 __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
    254253__ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci
    255254__ZN7WebCore12PrintContext13numberOfPagesEPNS_5FrameERKNS_9FloatSizeE
     
    413412__ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
    414413__ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE
    415 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
    416414__ZN7WebCore19AnimationController16resumeAnimationsEPNS_8DocumentE
    417415__ZN7WebCore19AnimationController17suspendAnimationsEPNS_8DocumentE
  • trunk/WebCore/WebCore.gypi

    r64458 r64462  
    21312131            'platform/chromium/ScrollbarThemeChromiumWin.cpp',
    21322132            'platform/chromium/SearchPopupMenuChromium.cpp',
    2133             'platform/chromium/SearchPopupMenuChromium.h',
    21342133            'platform/chromium/SharedTimerChromium.cpp',
    21352134            'platform/chromium/SoundChromiumPosix.cpp',
     
    26242623            'platform/mac/PlatformMouseEventMac.mm',
    26252624            'platform/mac/PlatformScreenMac.mm',
    2626             'platform/mac/PopupMenuMac.h',
    26272625            'platform/mac/PopupMenuMac.mm',
    26282626            'platform/mac/PurgeableBufferMac.cpp',
     
    26322630            'platform/mac/ScrollbarThemeMac.h',
    26332631            'platform/mac/ScrollbarThemeMac.mm',
    2634             'platform/mac/SearchPopupMenuMac.h',
    26352632            'platform/mac/SearchPopupMenuMac.mm',
    26362633            'platform/mac/SharedBufferMac.mm',
     
    27832780            'platform/qt/PlatformScreenQt.cpp',
    27842781            'platform/qt/PopupMenuQt.cpp',
    2785             'platform/qt/PopupMenuQt.h',
    27862782            'platform/qt/QWebPopup.cpp',
    27872783            'platform/qt/QWebPopup.h',
     
    27942790            'platform/qt/ScrollbarThemeQt.h',
    27952791            'platform/qt/SearchPopupMenuQt.cpp',
    2796             'platform/qt/SearchPopupMenuQt.h',
    27972792            'platform/qt/SharedBufferQt.cpp',
    27982793            'platform/qt/SharedTimerQt.cpp',
  • trunk/WebCore/WebCore.pro

    r64461 r64462  
    17101710    platform/PlatformTouchEvent.h \
    17111711    platform/PlatformTouchPoint.h \
    1712     platform/PopupMenu.h \
    17131712    platform/qt/ClipboardQt.h \
    17141713    platform/qt/QWebPageClient.h \
     
    17201719    platform/ScrollbarThemeComposite.h \
    17211720    platform/ScrollView.h \
    1722     platform/SearchPopupMenu.h \
    17231721    platform/SharedBuffer.h \
    17241722    platform/sql/SQLiteDatabase.h \
     
    32993297    ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
    33003298    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
    3301     ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
    3302     ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
    33033299    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
    33043300    ../WebKit2/WebProcess/WebPage/DrawingArea.h \
     
    33733369    ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
    33743370    ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
    3375     ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
    3376     ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
    33773371    ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \
    33783372    ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r64458 r64462  
    2372123721                                </File>
    2372223722                                <File
    23723                                         RelativePath="..\platform\win\PopupMenuWin.h"
    23724                                         >
    23725                                 </File>
    23726                                 <File
    2372723723                                        RelativePath="..\platform\win\ScrollbarThemeSafari.cpp"
    2372823724                                        >
     
    2374223738                                <File
    2374323739                                        RelativePath="..\platform\win\SearchPopupMenuWin.cpp"
    23744                                         >
    23745                                 </File>
    23746                                 <File
    23747                                         RelativePath="..\platform\win\SearchPopupMenuWin.h"
    2374823740                                        >
    2374923741                                </File>
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r64447 r64462  
    4343                065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */; };
    4444                065AD4F70B0C2EDA005A2B1D /* ContextMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 065AD4F40B0C2EDA005A2B1D /* ContextMenuController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    45                 0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 0668E1890ADD9624004128E0 /* PopupMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
     45                0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 0668E1890ADD9624004128E0 /* PopupMenu.h */; };
    4646                0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */; };
    4747                066C772B0AB603B700238CC4 /* FileChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772A0AB603B700238CC4 /* FileChooser.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    35973597                AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; };
    35983598                AB67D1A9097F3AE300F9392E /* RenderTextControl.h in Headers */ = {isa = PBXBuildFile; fileRef = AB67D1A7097F3AE300F9392E /* RenderTextControl.h */; };
    3599                 AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AB7170880B3118080017123E /* SearchPopupMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3599                AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AB7170880B3118080017123E /* SearchPopupMenu.h */; };
    36003600                AB7170A00B31193B0017123E /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */; };
    36013601                ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */; };
    36023602                ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */; };
    36033603                ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB5419D0ACDDFE4002820EB /* RenderListBox.h */; };
    3604                 ABC128770B33AA6D00C693D5 /* PopupMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3604                ABC128770B33AA6D00C693D5 /* PopupMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */; };
    36053605                ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; };
    36063606                ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
     
    50235023                D23CA55F0AB0EAB6005108A5 /* JSRangeException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */; };
    50245024                D23CA56C0AB0EB8D005108A5 /* RangeException.h in Headers */ = {isa = PBXBuildFile; fileRef = D23CA56B0AB0EB8D005108A5 /* RangeException.h */; };
    5025                 D39D006D11F8E308006041F2 /* PopupMenuMac.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D006C11F8E308006041F2 /* PopupMenuMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5026                 D39D009D11F907E6006041F2 /* SearchPopupMenuMac.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D009C11F907E6006041F2 /* SearchPopupMenuMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50275025                D8B6152F1032495100C8554A /* Cookie.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6152E1032495100C8554A /* Cookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
    50285026                DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */; };
     
    1073710735                D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRangeException.cpp; sourceTree = "<group>"; };
    1073810736                D23CA56B0AB0EB8D005108A5 /* RangeException.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RangeException.h; sourceTree = "<group>"; };
    10739                 D39D006C11F8E308006041F2 /* PopupMenuMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopupMenuMac.h; sourceTree = "<group>"; };
    10740                 D39D009C11F907E6006041F2 /* SearchPopupMenuMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchPopupMenuMac.h; sourceTree = "<group>"; };
    1074110737                D8B6152E1032495100C8554A /* Cookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cookie.h; sourceTree = "<group>"; };
    1074210738                DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IndentOutdentCommand.cpp; sourceTree = "<group>"; };
     
    1230912305                                935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */,
    1231012306                                BC94D1070C274F88006BC617 /* PlatformScreenMac.mm */,
    12311                                 D39D006C11F8E308006041F2 /* PopupMenuMac.h */,
    1231212307                                0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */,
    1231312308                                E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */,
    1231412309                                447D69010FA626810015CCB1 /* RuntimeApplicationChecks.h */,
    1231512310                                447D69020FA626810015CCB1 /* RuntimeApplicationChecks.mm */,
    12316                                 D39D009C11F907E6006041F2 /* SearchPopupMenuMac.h */,
    1231712311                                1CE24F960D7CAF0E007E04C2 /* SchedulePairMac.mm */,
    1231812312                                BCAA90C20A7EBA60008B1229 /* Scrollbar.cpp */,
     
    1996219956                                C572EE0F1201C736007D8F82 /* IDBIndexBackendInterface.h in Headers */,
    1996319957                                C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */,
    19964                                 D39D006D11F8E308006041F2 /* PopupMenuMac.h in Headers */,
    19965                                 D39D009D11F907E6006041F2 /* SearchPopupMenuMac.h in Headers */,
    1996619958                                379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */,
    1996719959                        );
  • trunk/WebCore/loader/EmptyClients.h

    r64425 r64462  
    22 * Copyright (C) 2006 Eric Seidel (eric@webkit.org)
    33 * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
    4  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    54 *
    65 * Redistribution and use in source and binary forms, with or without
     
    4140#include "InspectorClient.h"
    4241#include "PluginHalterClient.h"
    43 #include "PopupMenu.h"
    4442#include "ResourceError.h"
    45 #include "SearchPopupMenu.h"
    4643
    4744#if USE(GLES2_RENDERING)
     
    6461namespace WebCore {
    6562
    66 class EmptyPopupMenu : public PopupMenu {
    67 public:
    68     virtual void show(const IntRect&, FrameView*, int) {}
    69     virtual void hide() {}
    70     virtual void updateFromElement() {}
    71     virtual void disconnectClient() {}
    72 };
    73 
    74 class EmptySearchPopupMenu : public SearchPopupMenu {
    75 public:
    76     virtual PopupMenu* popupMenu() { return &m_popup; }
    77     virtual void saveRecentSearches(const AtomicString&, const Vector<String>&) {}
    78     virtual void loadRecentSearches(const AtomicString&, Vector<String>&) {}
    79     virtual bool enabled() { return false; }
    80 
    81 private:
    82     EmptyPopupMenu m_popup;
    83 };
    84 
    8563class EmptyChromeClient : public ChromeClient {
    8664public:
     
    134112    virtual bool runJavaScriptPrompt(Frame*, const String&, const String&, String&) { return false; }
    135113    virtual bool shouldInterruptJavaScript() { return false; }
    136 
    137     virtual bool selectItemWritingDirectionIsNatural() { return false; }
    138     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptyPopupMenu()); }
    139     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const { return adoptRef(new EmptySearchPopupMenu()); }
    140114
    141115    virtual void setStatusbarText(const String&) { }
  • trunk/WebCore/page/Chrome.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
     3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 *
    55 * This library is free software; you can redistribute it and/or
     
    483483}
    484484
    485 bool Chrome::selectItemWritingDirectionIsNatural()
    486 {
    487     return m_client->selectItemWritingDirectionIsNatural();
    488 }
    489 
    490 PassRefPtr<PopupMenu> Chrome::createPopupMenu(PopupMenuClient* client) const
    491 {
    492     return m_client->createPopupMenu(client);
    493 }
    494 
    495 PassRefPtr<SearchPopupMenu> Chrome::createSearchPopupMenu(PopupMenuClient* client) const
    496 {
    497     return m_client->createSearchPopupMenu(client);
    498 }
    499485
    500486} // namespace WebCore
  • trunk/WebCore/page/Chrome.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2625#include "FocusDirection.h"
    2726#include "HostWindow.h"
    28 #include "PopupMenu.h"
    29 #include "SearchPopupMenu.h"
    3027#include <wtf/Forward.h>
    3128#include <wtf/RefPtr.h>
     
    4845    class Node;
    4946    class Page;
    50     class PopupMenuClient;
    5147    class String;
    5248#if ENABLE(NOTIFICATIONS)
     
    149145#endif
    150146
    151         bool selectItemWritingDirectionIsNatural();
    152         PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    153         PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    154 
    155147    private:
    156148        Page* m_page;
  • trunk/WebCore/page/ChromeClient.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008, 2009 Apple, Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2827#include "HTMLParserQuirks.h"
    2928#include "HostWindow.h"
    30 #include "PopupMenu.h"
    31 #include "PopupMenuClient.h"
    3229#include "ScrollTypes.h"
    33 #include "SearchPopupMenu.h"
    3430#include <wtf/Forward.h>
    3531#include <wtf/PassOwnPtr.h>
     
    5955    class Page;
    6056    class SecurityOrigin;
    61     class PopupMenuClient;
    6257    class String;
    6358    class Widget;
     
    268263#endif
    269264
    270         virtual bool selectItemWritingDirectionIsNatural() = 0;
    271         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0;
    272         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0;
    273 
    274265    protected:
    275266        virtual ~ChromeClient() { }
  • trunk/WebCore/platform/PopupMenu.h

    r64425 r64462  
    11/*
    2  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
     
    2222#define PopupMenu_h
    2323
     24#include "IntRect.h"
     25#include "PopupMenuClient.h"
     26#include <wtf/PassRefPtr.h>
    2427#include <wtf/RefCounted.h>
    2528
     29#if PLATFORM(MAC)
     30#include <wtf/RetainPtr.h>
     31#ifdef __OBJC__
     32@class NSPopUpButtonCell;
     33#else
     34class NSPopUpButtonCell;
     35#endif
     36#elif PLATFORM(WIN)
     37#include "Scrollbar.h"
     38#include "ScrollbarClient.h"
     39#include <wtf/RefPtr.h>
     40typedef struct HWND__* HWND;
     41typedef struct HDC__* HDC;
     42typedef struct HBITMAP__* HBITMAP;
     43#elif PLATFORM(QT)
    2644namespace WebCore {
     45class QtAbstractWebPopup;
     46}
     47#elif PLATFORM(GTK)
     48typedef struct _GtkMenu GtkMenu;
     49typedef struct _GtkMenuItem GtkMenuItem;
     50typedef struct _GtkWidget GtkWidget;
     51#include "GRefPtrGtk.h"
     52#include <wtf/HashMap.h>
     53#include <glib.h>
     54#elif PLATFORM(WX)
     55#ifdef __WXMSW__
     56#include <wx/msw/winundef.h>
     57#endif
     58class wxMenu;
     59#include <wx/defs.h>
     60#include <wx/event.h>
     61#elif PLATFORM(CHROMIUM)
     62#include "PopupMenuPrivate.h"
     63#elif PLATFORM(HAIKU)
     64namespace WebCore {
     65class PopupMenuHaiku;
     66}
     67#endif
     68
     69namespace WebCore {
    2770
    2871class FrameView;
    29 class IntRect;
    30 
    31 class PopupMenu : public RefCounted<PopupMenu> {
     72class Scrollbar;
     73
     74class PopupMenu : public RefCounted<PopupMenu>
     75#if PLATFORM(WIN)
     76                , private ScrollbarClient
     77#endif
     78#if PLATFORM(WX)
     79                , public wxEvtHandler
     80#endif
     81{
    3282public:
    33     virtual ~PopupMenu() {}
    34     virtual void show(const IntRect&, FrameView*, int index) = 0;
    35     virtual void hide() = 0;
    36     virtual void updateFromElement() = 0;
    37     virtual void disconnectClient() = 0;
     83    static PassRefPtr<PopupMenu> create(PopupMenuClient* client) { return adoptRef(new PopupMenu(client)); }
     84    ~PopupMenu();
     85   
     86    void disconnectClient() { m_popupClient = 0; }
     87
     88    void show(const IntRect&, FrameView*, int index);
     89    void hide();
     90
     91    void updateFromElement();
     92   
     93    PopupMenuClient* client() const { return m_popupClient; }
     94
     95    static bool itemWritingDirectionIsNatural();
     96
     97#if PLATFORM(WIN)
     98    Scrollbar* scrollbar() const { return m_scrollbar.get(); }
     99
     100    static LPCTSTR popupClassName();
     101
     102    bool up(unsigned lines = 1);
     103    bool down(unsigned lines = 1);
     104
     105    int itemHeight() const { return m_itemHeight; }
     106    const IntRect& windowRect() const { return m_windowRect; }
     107    IntRect clientRect() const;
     108
     109    int visibleItems() const;
     110
     111    int listIndexAtPoint(const IntPoint&) const;
     112
     113    bool setFocusedIndex(int index, bool hotTracking = false);
     114    int focusedIndex() const;
     115    void focusFirst();
     116    void focusLast();
     117
     118    void paint(const IntRect& damageRect, HDC = 0);
     119
     120    HWND popupHandle() const { return m_popup; }
     121
     122    void setWasClicked(bool b = true) { m_wasClicked = b; }
     123    bool wasClicked() const { return m_wasClicked; }
     124
     125    void setScrollOffset(int offset) { m_scrollOffset = offset; }
     126    int scrollOffset() const { return m_scrollOffset; }
     127
     128    bool scrollToRevealSelection();
     129
     130    void incrementWheelDelta(int delta);
     131    void reduceWheelDelta(int delta);
     132    int wheelDelta() const { return m_wheelDelta; }
     133
     134    bool scrollbarCapturingMouse() const { return m_scrollbarCapturingMouse; }
     135    void setScrollbarCapturingMouse(bool b) { m_scrollbarCapturingMouse = b; }
     136#endif
     137
     138protected:
     139    PopupMenu(PopupMenuClient*);
     140   
     141private:
     142    PopupMenuClient* m_popupClient;
     143   
     144#if PLATFORM(MAC)
     145    void clear();
     146    void populate();
     147
     148    RetainPtr<NSPopUpButtonCell> m_popup;
     149#elif PLATFORM(QT)
     150    QtAbstractWebPopup* m_popup;
     151#elif PLATFORM(WIN)
     152    // ScrollBarClient
     153    virtual void valueChanged(Scrollbar*);
     154    virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&);
     155    virtual bool isActive() const { return true; }
     156    virtual bool scrollbarCornerPresent() const { return false; }
     157
     158    void calculatePositionAndSize(const IntRect&, FrameView*);
     159    void invalidateItem(int index);
     160
     161    static LRESULT CALLBACK PopupMenuWndProc(HWND, UINT, WPARAM, LPARAM);
     162    LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
     163    static void registerClass();
     164
     165    RefPtr<Scrollbar> m_scrollbar;
     166    HWND m_popup;
     167    HDC m_DC;
     168    HBITMAP m_bmp;
     169    bool m_wasClicked;
     170    IntRect m_windowRect;
     171    int m_itemHeight;
     172    int m_scrollOffset;
     173    int m_wheelDelta;
     174    int m_focusedIndex;
     175    bool m_scrollbarCapturingMouse;
     176    bool m_showPopup;
     177#elif PLATFORM(GTK)
     178    IntPoint m_menuPosition;
     179    GRefPtr<GtkMenu> m_popup;
     180    HashMap<GtkWidget*, int> m_indexMap;
     181    static void menuItemActivated(GtkMenuItem* item, PopupMenu*);
     182    static void menuUnmapped(GtkWidget*, PopupMenu*);
     183    static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, PopupMenu*);
     184    static void menuRemoveItem(GtkWidget*, PopupMenu*);
     185#elif PLATFORM(EFL) || PLATFORM(BREWMP)
     186    FrameView* m_view;
     187#elif PLATFORM(WX)
     188    wxMenu* m_menu;
     189    void OnMenuItemSelected(wxCommandEvent&);
     190#elif PLATFORM(CHROMIUM)
     191    PopupMenuPrivate p;
     192#elif PLATFORM(HAIKU)
     193    PopupMenuHaiku* m_menu;
     194#endif
     195
    38196};
    39197
    40198}
    41199
    42 #endif // PopupMenu_h
     200#endif
  • trunk/WebCore/platform/SearchPopupMenu.h

    r64425 r64462  
    11/*
    2  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
     
    2424#include "PopupMenu.h"
    2525#include <wtf/Vector.h>
    26 #include <wtf/text/WTFString.h>
    2726
    2827namespace WebCore {
     
    3029class AtomicString;
    3130
    32 class SearchPopupMenu : public RefCounted<SearchPopupMenu> {
     31class SearchPopupMenu : public PopupMenu {
    3332public:
    34     virtual ~SearchPopupMenu() {}
    35     virtual PopupMenu* popupMenu() = 0;
    36     virtual void saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) = 0;
    37     virtual void loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) = 0;
    38     virtual bool enabled() = 0;
     33    static PassRefPtr<SearchPopupMenu> create(PopupMenuClient* client) { return adoptRef(new SearchPopupMenu(client)); }
     34
     35    void saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems);
     36    void loadRecentSearches(const AtomicString& name, Vector<String>& searchItems);
     37
     38    bool enabled();
     39   
     40private:
     41    SearchPopupMenu(PopupMenuClient*);
    3942};
    4043
    4144}
    4245
    43 #endif // SearchPopupMenu_h
     46#endif
  • trunk/WebCore/platform/brew/PopupMenuBrew.cpp

    r64425 r64462  
    55 * Copyright (C) 2009-2010 Samsung Electronics
    66 * Copyright (C) 2010 Company 100, Inc.
    7  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    87 *
    98 * This library is free software; you can redistribute it and/or
     
    2524
    2625#include "config.h"
    27 #include "PopupMenuBrew.h"
     26#include "PopupMenu.h"
    2827
    2928#include "Chrome.h"
     
    3433namespace WebCore {
    3534
    36 PopupMenuBrew::PopupMenuBrew(PopupMenuClient* menuList)
     35PopupMenu::PopupMenu(PopupMenuClient* menuList)
    3736    : m_popupClient(menuList)
    3837    , m_view(0)
     
    4039}
    4140
    42 PopupMenuBrew::~PopupMenuBrew()
     41PopupMenu::~PopupMenu()
    4342{
    4443    // Tell client to destroy data related to this popup since this object is
     
    4746}
    4847
    49 void PopupMenuBrew::disconnectClient()
    50 {
    51     m_popupClient = 0;
    52 }
    53 
    54 void PopupMenuBrew::show(const IntRect& rect, FrameView* view, int index)
     48void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
    5549{
    5650    ASSERT(m_popupClient);
     
    6256}
    6357
    64 void PopupMenuBrew::hide()
     58void PopupMenu::hide()
    6559{
    6660    ASSERT(m_view);
     
    7165}
    7266
    73 void PopupMenuBrew::updateFromElement()
     67void PopupMenu::updateFromElement()
    7468{
    7569    client()->setTextFromItem(client()->selectedIndex());
    7670}
    7771
    78 // This code must be moved to the concrete brew ChromeClient that is not in repository.
    79 // I kept this code commented out here to prevent loosing the information of what
    80 // must be the return value for brew.
    81 
    82 // bool PopupMenuBrew::itemWritingDirectionIsNatural()
    83 // {
    84 //     return true;
    85 // }
     72bool PopupMenu::itemWritingDirectionIsNatural()
     73{
     74    return true;
     75}
    8676
    8777} // namespace WebCore
  • trunk/WebCore/platform/brew/SearchPopupMenuBrew.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2010 Company 100, Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2625
    2726#include "config.h"
    28 #include "SearchPopupMenuBrew.h"
     27#include "SearchPopupMenu.h"
    2928
    3029namespace WebCore {
    3130
    3231// Save the past searches stored in 'searchItems' to a database associated with 'name'
    33 void SearchPopupMenuBrew::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     32void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    3433{
    3534}
    3635
    3736// Load past searches associated with 'name' from the database to 'searchItems'
    38 void SearchPopupMenuBrew::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     37void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    3938{
    4039}
    4140
    4241// Create a search popup menu - not sure what else we have to do here
    43 SearchPopupMenuBrew::SearchPopupMenuBrew(PopupMenuClient* client)
    44     : m_popup(client)
     42SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     43    : PopupMenu(client)
    4544{
    4645}
    4746
    48 bool SearchPopupMenuBrew::enabled()
     47bool SearchPopupMenu::enabled()
    4948{
    5049    return false;
    5150}
    5251
    53 PopupMenu* SearchPopupMenuBrew::popupMenu()
    54 {
    55     return &m_popup;
    56 }
    57 
    5852} // namespace WebCore
  • trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

    r64425 r64462  
    11/*
    22 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    5049#include "PlatformScreen.h"
    5150#include "PlatformWheelEvent.h"
     51#include "PopupMenu.h"
    5252#include "RenderTheme.h"
    5353#include "ScrollbarTheme.h"
     
    13411341
    13421342///////////////////////////////////////////////////////////////////////////////
    1343 // PopupMenuChromium implementation
     1343// PopupMenu implementation
    13441344//
    13451345// Note: you cannot add methods to this class, since it is defined above the
     
    13471347//       popup widgets, use |popupWindow| above.
    13481348
    1349 PopupMenuChromium::PopupMenuChromium(PopupMenuClient* client)
     1349PopupMenu::PopupMenu(PopupMenuClient* client)
    13501350    : m_popupClient(client)
    13511351{
    13521352}
    13531353
    1354 PopupMenuChromium::~PopupMenuChromium()
    1355 {
    1356     // When the PopupMenuChromium is destroyed, the client could already have been
     1354PopupMenu::~PopupMenu()
     1355{
     1356    // When the PopupMenu is destroyed, the client could already have been
    13571357    // deleted.
    13581358    if (p.popup)
     
    13651365// Windows and Linux Chromium let our WebKit port handle the display, while
    13661366// another process manages the popup window and input handling.
    1367 void PopupMenuChromium::show(const IntRect& r, FrameView* v, int index)
     1367void PopupMenu::show(const IntRect& r, FrameView* v, int index)
    13681368{
    13691369    if (!p.popup)
     
    13761376}
    13771377
    1378 void PopupMenuChromium::hide()
     1378void PopupMenu::hide()
    13791379{
    13801380    if (p.popup)
     
    13821382}
    13831383
    1384 void PopupMenuChromium::updateFromElement()
     1384void PopupMenu::updateFromElement()
    13851385{
    13861386    p.popup->listBox()->updateFromElement();
    13871387}
    13881388
    1389 
    1390 void PopupMenuChromium::disconnectClient()
    1391 {
    1392     m_popupClient = 0;
     1389bool PopupMenu::itemWritingDirectionIsNatural()
     1390{
     1391    return false;
    13931392}
    13941393
  • trunk/WebCore/platform/chromium/PopupMenuChromium.h

    r64425 r64462  
    3737#include "FramelessScrollView.h"
    3838#include "IntRect.h"
    39 #include "PopupMenu.h"
    40 #include "PopupMenuPrivate.h"
    4139
    4240namespace WebCore {
     
    204202};
    205203
    206 class PopupMenuChromium : public PopupMenu {
    207 public:
    208     PopupMenuChromium(PopupMenuClient*);
    209     ~PopupMenuChromium();
    210 
    211     virtual void show(const IntRect&, FrameView*, int index);
    212     virtual void hide();
    213     virtual void updateFromElement();
    214     virtual void disconnectClient();
    215 
    216 private:
    217     PopupMenuClient* client() const { return m_popupClient; }
    218 
    219     PopupMenuClient* m_popupClient;
    220     PopupMenuPrivate p;
    221 };
    222 
    223204} // namespace WebCore
    224205
  • trunk/WebCore/platform/chromium/SearchPopupMenuChromium.cpp

    r64425 r64462  
    11/*
    22 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    3130
    3231#include "config.h"
    33 #include "SearchPopupMenuChromium.h"
     32#include "SearchPopupMenu.h"
    3433
    3534#include "AtomicString.h"
     
    3837namespace WebCore {
    3938
    40 SearchPopupMenuChromium::SearchPopupMenuChromium(PopupMenuClient* client)
    41     : m_popup(client)
     39SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     40    : PopupMenu(client)
    4241{
    4342}
    4443
    45 PopupMenu* SearchPopupMenuChromium::popupMenu()
    46 {
    47     return &m_popup;
    48 }
    49 
    50 bool SearchPopupMenuChromium::enabled()
     44bool SearchPopupMenu::enabled()
    5145{
    5246    return false;
    5347}
    5448
    55 void SearchPopupMenuChromium::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     49void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    5650{
    5751    notImplemented();
    5852}
    5953
    60 void SearchPopupMenuChromium::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     54void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    6155{
    6256    notImplemented();
  • trunk/WebCore/platform/efl/PopupMenuEfl.cpp

    r64425 r64462  
    44 * Copyright (C) 2009-2010 ProFUSION embedded systems
    55 * Copyright (C) 2009-2010 Samsung Electronics
    6  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    76 *
    87 * This library is free software; you can redistribute it and/or
     
    2423
    2524#include "config.h"
    26 #include "PopupMenuEfl.h"
     25#include "PopupMenu.h"
    2726
    2827#include "Chrome.h"
     
    3029#include "FrameView.h"
    3130#include "NotImplemented.h"
    32 #include "PopupMenuClient.h"
    3331
    3432namespace WebCore {
    3533
    36 PopupMenuEfl::PopupMenuEfl(PopupMenuClient* client)
     34PopupMenu::PopupMenu(PopupMenuClient* client)
    3735    : m_popupClient(client)
    3836    , m_view(0)
     
    4038}
    4139
    42 PopupMenuEfl::~PopupMenuEfl()
     40PopupMenu::~PopupMenu()
    4341{
    4442    // Tell client to destroy data related to this popup since this object is
     
    4745}
    4846
    49 void PopupMenuEfl::show(const IntRect& rect, FrameView* view, int index)
     47void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
    5048{
    5149    ASSERT(m_popupClient);
     
    5755}
    5856
    59 void PopupMenuEfl::hide()
     57void PopupMenu::hide()
    6058{
    6159    ASSERT(m_view);
     
    6664}
    6765
    68 void PopupMenuEfl::updateFromElement()
     66void PopupMenu::updateFromElement()
    6967{
    7068    client()->setTextFromItem(client()->selectedIndex());
    7169}
    7270
    73 void PopupMenuEfl::disconnectClient()
     71bool PopupMenu::itemWritingDirectionIsNatural()
    7472{
    75     m_popupClient = 0;
     73    return true;
    7674}
    7775
  • trunk/WebCore/platform/efl/SearchPopupMenuEfl.cpp

    r64425 r64462  
    33 *  Copyright (C) 2009-2010 ProFUSION embedded systems
    44 *  Copyright (C) 2009-2010 Samsung Electronics
    5  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    65 *
    76 *  This library is free software; you can redistribute it and/or
     
    2120
    2221#include "config.h"
    23 #include "SearchPopupMenuEfl.h"
     22#include "SearchPopupMenu.h"
    2423
    2524#include "NotImplemented.h"
     
    2726namespace WebCore {
    2827
    29 SearchPopupMenuEfl::SearchPopupMenuEfl(PopupMenuClient* client)
    30     : m_popup(client)
     28SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     29    : PopupMenu(client)
    3130{
    3231    notImplemented();
    3332}
    3433
    35 PopupMenu* SearchPopupMenuEfl::popupMenu()
    36 {
    37     return &m_popup;
    38 }
    39 
    40 void SearchPopupMenuEfl::saveRecentSearches(const AtomicString&, const Vector<String>&)
     34void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&)
    4135{
    4236    notImplemented();
    4337}
    4438
    45 void SearchPopupMenuEfl::loadRecentSearches(const AtomicString&, Vector<String>&)
     39void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&)
    4640{
    4741    notImplemented();
    4842}
    4943
    50 bool SearchPopupMenuEfl::enabled()
     44bool SearchPopupMenu::enabled()
    5145{
    5246    notImplemented();
  • trunk/WebCore/platform/gtk/PopupMenuGtk.cpp

    r64425 r64462  
    55 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
    66 * Copyright (C) 2008 Collabora Ltd.
    7  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    87 *
    98 * This library is free software; you can redistribute it and/or
     
    2524
    2625#include "config.h"
    27 #include "PopupMenuGtk.h"
     26#include "PopupMenu.h"
    2827
    2928#include "FrameView.h"
     
    3635namespace WebCore {
    3736
    38 PopupMenuGtk::PopupMenuGtk(PopupMenuClient* client)
     37PopupMenu::PopupMenu(PopupMenuClient* client)
    3938    : m_popupClient(client)
    4039{
    4140}
    4241
    43 PopupMenuGtk::~PopupMenuGtk()
     42PopupMenu::~PopupMenu()
    4443{
    4544    if (m_popup) {
     
    4948}
    5049
    51 void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
     50void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
    5251{
    5352    ASSERT(client());
     
    112111}
    113112
    114 void PopupMenuGtk::hide()
     113void PopupMenu::hide()
    115114{
    116115    ASSERT(m_popup);
     
    118117}
    119118
    120 void PopupMenuGtk::updateFromElement()
     119void PopupMenu::updateFromElement()
    121120{
    122121    client()->setTextFromItem(client()->selectedIndex());
    123122}
    124123
    125 void PopupMenuGtk::disconnectClient()
     124bool PopupMenu::itemWritingDirectionIsNatural()
    126125{
    127     m_popupClient = 0;
     126    return true;
    128127}
    129128
    130 void PopupMenuGtk::menuItemActivated(GtkMenuItem* item, PopupMenuGtk* that)
     129void PopupMenu::menuItemActivated(GtkMenuItem* item, PopupMenu* that)
    131130{
    132131    ASSERT(that->client());
     
    135134}
    136135
    137 void PopupMenuGtk::menuUnmapped(GtkWidget*, PopupMenuGtk* that)
     136void PopupMenu::menuUnmapped(GtkWidget*, PopupMenu* that)
    138137{
    139138    ASSERT(that->client());
     
    141140}
    142141
    143 void PopupMenuGtk::menuPositionFunction(GtkMenu*, gint* x, gint* y, gboolean* pushIn, PopupMenuGtk* that)
     142void PopupMenu::menuPositionFunction(GtkMenu*, gint* x, gint* y, gboolean* pushIn, PopupMenu* that)
    144143{
    145144    *x = that->m_menuPosition.x();
     
    148147}
    149148
    150 void PopupMenuGtk::menuRemoveItem(GtkWidget* widget, PopupMenuGtk* that)
     149void PopupMenu::menuRemoveItem(GtkWidget* widget, PopupMenu* that)
    151150{
    152151    ASSERT(that->m_popup);
  • trunk/WebCore/platform/gtk/SearchPopupMenuGtk.cpp

    r64425 r64462  
    11/*
    2  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    3  *
    42 *  This library is free software; you can redistribute it and/or
    53 *  modify it under the terms of the GNU Lesser General Public
     
    1816
    1917#include "config.h"
    20 #include "SearchPopupMenuGtk.h"
     18#include "SearchPopupMenu.h"
    2119
    2220#include "NotImplemented.h"
     
    2422namespace WebCore {
    2523
    26 SearchPopupMenuGtk::SearchPopupMenuGtk(PopupMenuClient* client)
    27     : m_popup(client)
     24SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     25    : PopupMenu(client)
    2826{
    2927    notImplemented();
    3028}
    3129
    32 PopupMenu* SearchPopupMenuGtk::popupMenu()
    33 {
    34     return &m_popup;
    35 }
    36 
    37 void SearchPopupMenuGtk::saveRecentSearches(const AtomicString&, const Vector<String>&)
     30void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&)
    3831{
    3932    notImplemented();
    4033}
    4134
    42 void SearchPopupMenuGtk::loadRecentSearches(const AtomicString&, Vector<String>&)
     35void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&)
    4336{
    4437    notImplemented();
    4538}
    4639
    47 bool SearchPopupMenuGtk::enabled()
     40bool SearchPopupMenu::enabled()
    4841{
    4942    notImplemented();
  • trunk/WebCore/platform/haiku/PopupMenuHaiku.cpp

    r64425 r64462  
    33 *
    44 * Copyright (C) 2010 Stephan Aßmus <superstippi@gmx.de>
    5  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    65 *
    76 * This library is free software; you can redistribute it and/or
     
    2322
    2423#include "config.h"
    25 #include "PopupMenuHaiku.h"
     24#include "PopupMenu.h"
    2625
    2726#include "FrameView.h"
     
    7473};
    7574
    76 class HaikuPopup : public BPopUpMenu {
     75class PopupMenuHaiku : public BPopUpMenu {
    7776public:
    78     HaikuPopup(PopupMenuClient* popupClient)
     77    PopupMenuHaiku(PopupMenuClient* popupClient)
    7978        : BPopUpMenu("WebCore Popup", true, false)
    8079        , m_popupClient(popupClient)
     
    8887    }
    8988
    90     virtual ~HaikuPopup()
     89    virtual ~PopupMenuHaiku()
    9190    {
    9291        if (be_app->Lock()) {
     
    155154};
    156155
    157 PopupMenuHaiku::PopupMenuHaiku(PopupMenuClient* client)
     156PopupMenu::PopupMenu(PopupMenuClient* client)
    158157    : m_popupClient(client)
    159     , m_menu(new HaikuPopup(client))
     158    , m_menu(new PopupMenuHaiku(client))
    160159{
    161160    // We don't need additional references to the client, since we completely
     
    163162}
    164163
    165 PopupMenuHaiku::~PopupMenuHaiku()
     164PopupMenu::~PopupMenu()
    166165{
    167166    delete m_menu;
    168167}
    169168
    170 void PopupMenuHaiku::disconnectClient()
    171 {
    172     m_popupClient = 0;
    173 }
    174 
    175 void PopupMenuHaiku::show(const IntRect& rect, FrameView* view, int index)
     169void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
    176170{
    177171    // The menu will update itself from the PopupMenuClient before showing.
     
    179173}
    180174
    181 void PopupMenuHaiku::hide()
     175void PopupMenu::hide()
    182176{
    183177    m_menu->hide();
    184178}
    185179
    186 void PopupMenuHaiku::updateFromElement()
     180void PopupMenu::updateFromElement()
    187181{
    188182    client()->setTextFromItem(m_popupClient->selectedIndex());
    189183}
    190184
     185bool PopupMenu::itemWritingDirectionIsNatural()
     186{
     187    return false;
     188}
     189
    191190} // namespace WebCore
    192191
  • trunk/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com>
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2019
    2120#include "config.h"
    22 #include "SearchPopupMenuHaiku.h"
     21#include "SearchPopupMenu.h"
    2322
    2423#include "AtomicString.h"
     
    2827namespace WebCore {
    2928
    30 SearchPopupMenuHaiku::SearchPopupMenuHaiku(PopupMenuClient* client)
    31     : m_popup(client)
     29SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     30    : PopupMenu(client)
    3231{
    3332}
    3433
    35 void SearchPopupMenuHaiku::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     34void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    3635{
    3736    notImplemented();
    3837}
    3938
    40 void SearchPopupMenuHaiku::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     39void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    4140{
    4241    notImplemented();
    4342}
    4443
    45 bool SearchPopupMenuHaiku::enabled()
     44bool SearchPopupMenu::enabled()
    4645{
    4746    notImplemented();
     
    4948}
    5049
    51 PopupMenu* SearchPopupMenuHaiku::popupMenu()
    52 {
    53     return m_popup;
    54 }
    55 
    5650} // namespace WebCore
    5751
  • trunk/WebCore/platform/mac/PopupMenuMac.mm

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2019
    2120#import "config.h"
    22 #import "PopupMenuMac.h"
     21#import "PopupMenu.h"
    2322
    2423#import "AXObjectCache.h"
     
    3332#import "HTMLSelectElement.h"
    3433#import "Page.h"
    35 #import "PopupMenuClient.h"
    3634#import "SimpleFontData.h"
    3735#import "WebCoreSystemInterface.h"
     
    4139using namespace HTMLNames;
    4240
    43 PopupMenuMac::PopupMenuMac(PopupMenuClient* client)
     41PopupMenu::PopupMenu(PopupMenuClient* client)
    4442    : m_popupClient(client)
    4543{
    4644}
    4745
    48 PopupMenuMac::~PopupMenuMac()
     46PopupMenu::~PopupMenu()
    4947{
    5048    if (m_popup)
     
    5250}
    5351
    54 void PopupMenuMac::clear()
     52void PopupMenu::clear()
    5553{
    5654    if (m_popup)
     
    5856}
    5957
    60 void PopupMenuMac::populate()
     58void PopupMenu::populate()
    6159{
    6260    if (m_popup)
     
    117115}
    118116
    119 void PopupMenuMac::show(const IntRect& r, FrameView* v, int index)
     117void PopupMenu::show(const IntRect& r, FrameView* v, int index)
    120118{
    121119    populate();
     
    165163    NSEvent* event = [frame->eventHandler()->currentNSEvent() retain];
    166164   
    167     RefPtr<PopupMenuMac> protector(this);
     165    RefPtr<PopupMenu> protector(this);
    168166
    169167    RetainPtr<NSView> dummyView(AdoptNS, [[NSView alloc] initWithFrame:r]);
     
    197195}
    198196
    199 void PopupMenuMac::hide()
     197void PopupMenu::hide()
    200198{
    201199    [m_popup.get() dismissPopUp];
    202200}
    203201   
    204 void PopupMenuMac::updateFromElement()
    205 {
    206 }
    207 
    208 void PopupMenuMac::disconnectClient()
    209 {
    210     m_popupClient = 0;
    211 }
    212 
    213 }
     202void PopupMenu::updateFromElement()
     203{
     204}
     205
     206bool PopupMenu::itemWritingDirectionIsNatural()
     207{
     208    return true;
     209}
     210
     211}
  • trunk/WebCore/platform/mac/SearchPopupMenuMac.mm

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006 Apple Computer, Inc.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2019
    2120#import "config.h"
    22 #import "SearchPopupMenuMac.h"
     21#import "SearchPopupMenu.h"
    2322
    2423#import "AtomicString.h"
     
    2625namespace WebCore {
    2726
    28 SearchPopupMenuMac::SearchPopupMenuMac(PopupMenuClient* client)
    29     : m_popup(client)
     27SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     28    : PopupMenu(client)
    3029{
    3130}
     
    3635}
    3736
    38 PopupMenu* SearchPopupMenuMac::popupMenu()
    39 {
    40     return &m_popup;
    41 }
    42 
    43 bool SearchPopupMenuMac::enabled()
     37bool SearchPopupMenu::enabled()
    4438{
    4539    return true;
    4640}
    4741
    48 void SearchPopupMenuMac::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     42void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    4943{
    5044    if (name.isEmpty())
     
    6357}
    6458
    65 void SearchPopupMenuMac::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     59void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    6660{
    6761    if (name.isEmpty())
  • trunk/WebCore/platform/qt/PopupMenuQt.cpp

    r64425 r64462  
    2525
    2626#include "config.h"
    27 #include "PopupMenuQt.h"
     27#include "PopupMenu.h"
    2828
    2929#include "Chrome.h"
     
    3636namespace WebCore {
    3737
    38 PopupMenuQt::PopupMenuQt(PopupMenuClient* client)
     38PopupMenu::PopupMenu(PopupMenuClient* client)
    3939    : m_popupClient(client)
    4040    , m_popup(0)
     
    4242}
    4343
    44 PopupMenuQt::~PopupMenuQt()
     44PopupMenu::~PopupMenu()
    4545{
    4646    delete m_popup;
    4747}
    4848
    49 
    50 void PopupMenuQt::disconnectClient()
    51 {
    52     m_popupClient = 0;
    53 }
    54 
    55 void PopupMenuQt::show(const IntRect& rect, FrameView* view, int index)
     49void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
    5650{
    5751    ChromeClientQt* chromeClient = static_cast<ChromeClientQt*>(
     
    7468}
    7569
    76 void PopupMenuQt::hide()
     70void PopupMenu::hide()
    7771{
    7872    m_popup->hide();
    7973}
    8074
    81 void PopupMenuQt::updateFromElement()
     75void PopupMenu::updateFromElement()
    8276{
    83     m_popupClient->setTextFromItem(m_popupClient->selectedIndex());
     77    client()->setTextFromItem(m_popupClient->selectedIndex());
     78}
     79
     80bool PopupMenu::itemWritingDirectionIsNatural()
     81{
     82    return false;
    8483}
    8584
  • trunk/WebCore/platform/qt/QtAbstractWebPopup.h

    r64425 r64462  
    6464
    6565private:
    66     friend class PopupMenuQt;
     66    friend class PopupMenu;
    6767    PopupMenuClient* m_popupClient;
    6868    QWebPageClient* m_pageClient;
  • trunk/WebCore/platform/qt/SearchPopupMenuQt.cpp

    r64425 r64462  
    11/*
    22 * Copyright C 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2019
    2120#include "config.h"
    22 #include "SearchPopupMenuQt.h"
     21#include "SearchPopupMenu.h"
     22
     23#include "AtomicString.h"
    2324
    2425namespace WebCore {
    2526
    26 SearchPopupMenuQt::SearchPopupMenuQt(PopupMenuClient* client)
    27     : m_popup(client)
     27SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     28    : PopupMenu(client)
    2829{
    2930}
    3031
    31 PopupMenu* SearchPopupMenuQt::popupMenu()
    32 {
    33     return &m_popup;
    34 }
    35 
    36 void SearchPopupMenuQt::saveRecentSearches(const AtomicString&, const Vector<String>&)
     32void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&)
    3733{
    3834}
    3935
    40 void SearchPopupMenuQt::loadRecentSearches(const AtomicString&, Vector<String>&)
     36void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&)
    4137{
    4238}
    4339
    44 bool SearchPopupMenuQt::enabled()
     40bool SearchPopupMenu::enabled()
    4541{
    4642    return true;
  • trunk/WebCore/platform/win/PopupMenuWin.cpp

    r64427 r64462  
    22 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
    33 * Copyright (C) 2007-2009 Torch Mobile Inc.
    4  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    54 *
    65 * This library is free software; you can redistribute it and/or
     
    2221
    2322#include "config.h"
    24 #include "PopupMenuWin.h"
     23#include "PopupMenu.h"
    2524
    2625#include "BitmapInfo.h"
     
    8887}
    8988
    90 PopupMenuWin::PopupMenuWin(PopupMenuClient* client)
     89PopupMenu::PopupMenu(PopupMenuClient* client)
    9190    : m_popupClient(client)
    9291    , m_scrollbar(0)
     
    104103}
    105104
    106 PopupMenuWin::~PopupMenuWin()
     105PopupMenu::~PopupMenu()
    107106{
    108107    if (m_bmp)
     
    116115}
    117116
    118 void PopupMenuWin::disconnectClient()
    119 {
    120     m_popupClient = 0;
    121 }
    122 
    123 LPCTSTR PopupMenuWin::popupClassName()
     117LPCTSTR PopupMenu::popupClassName()
    124118{
    125119    return kPopupWindowClassName;
    126120}
    127121
    128 void PopupMenuWin::show(const IntRect& r, FrameView* view, int index)
     122void PopupMenu::show(const IntRect& r, FrameView* view, int index)
    129123{
    130124    calculatePositionAndSize(r, view);
     
    274268}
    275269
    276 void PopupMenuWin::hide()
     270void PopupMenu::hide()
    277271{
    278272    if (!m_showPopup)
     
    290284}
    291285
    292 void PopupMenuWin::calculatePositionAndSize(const IntRect& r, FrameView* v)
     286void PopupMenu::calculatePositionAndSize(const IntRect& r, FrameView* v)
    293287{
    294288    // r is in absolute document coordinates, but we want to be in screen coordinates
     
    380374}
    381375
    382 bool PopupMenuWin::setFocusedIndex(int i, bool hotTracking)
     376bool PopupMenu::setFocusedIndex(int i, bool hotTracking)
    383377{
    384378    if (i < 0 || i >= client()->listSize() || i == focusedIndex())
     
    402396}
    403397
    404 int PopupMenuWin::visibleItems() const
     398int PopupMenu::visibleItems() const
    405399{
    406400    return clientRect().height() / m_itemHeight;
    407401}
    408402
    409 int PopupMenuWin::listIndexAtPoint(const IntPoint& point) const
     403int PopupMenu::listIndexAtPoint(const IntPoint& point) const
    410404{
    411405    return m_scrollOffset + point.y() / m_itemHeight;
    412406}
    413407
    414 int PopupMenuWin::focusedIndex() const
     408int PopupMenu::focusedIndex() const
    415409{
    416410    return m_focusedIndex;
    417411}
    418412
    419 void PopupMenuWin::focusFirst()
     413void PopupMenu::focusFirst()
    420414{
    421415    if (!client())
     
    431425}
    432426
    433 void PopupMenuWin::focusLast()
     427void PopupMenu::focusLast()
    434428{
    435429    if (!client())
     
    445439}
    446440
    447 bool PopupMenuWin::down(unsigned lines)
     441bool PopupMenu::down(unsigned lines)
    448442{
    449443    if (!client())
     
    464458}
    465459
    466 bool PopupMenuWin::up(unsigned lines)
     460bool PopupMenu::up(unsigned lines)
    467461{
    468462    if (!client())
     
    483477}
    484478
    485 void PopupMenuWin::invalidateItem(int index)
     479void PopupMenu::invalidateItem(int index)
    486480{
    487481    if (!m_popup)
     
    498492}
    499493
    500 IntRect PopupMenuWin::clientRect() const
     494IntRect PopupMenu::clientRect() const
    501495{
    502496    IntRect clientRect = m_windowRect;
     
    506500}
    507501
    508 void PopupMenuWin::incrementWheelDelta(int delta)
     502void PopupMenu::incrementWheelDelta(int delta)
    509503{
    510504    m_wheelDelta += delta;
    511505}
    512506
    513 void PopupMenuWin::reduceWheelDelta(int delta)
     507void PopupMenu::reduceWheelDelta(int delta)
    514508{
    515509    ASSERT(delta >= 0);
     
    524518}
    525519
    526 bool PopupMenuWin::scrollToRevealSelection()
     520bool PopupMenu::scrollToRevealSelection()
    527521{
    528522    if (!m_scrollbar)
     
    544538}
    545539
    546 void PopupMenuWin::updateFromElement()
     540void PopupMenu::updateFromElement()
    547541{
    548542    if (!m_popup)
     
    556550}
    557551
     552bool PopupMenu::itemWritingDirectionIsNatural()
     553{
     554    return true;
     555}
     556
    558557const int separatorPadding = 4;
    559558const int separatorHeight = 1;
    560 void PopupMenuWin::paint(const IntRect& damageRect, HDC hdc)
     559void PopupMenu::paint(const IntRect& damageRect, HDC hdc)
    561560{
    562561    if (!m_popup)
     
    665664}
    666665
    667 void PopupMenuWin::valueChanged(Scrollbar* scrollBar)
     666void PopupMenu::valueChanged(Scrollbar* scrollBar)
    668667{
    669668    ASSERT(m_scrollbar);
     
    701700}
    702701
    703 void PopupMenuWin::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
     702void PopupMenu::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
    704703{
    705704    IntRect scrollRect = rect;
     
    709708}
    710709
    711 void PopupMenuWin::registerClass()
     710void PopupMenu::registerClass()
    712711{
    713712    static bool haveRegisteredWindowClass = false;
     
    745744
    746745
    747 LRESULT CALLBACK PopupMenuWin::PopupMenuWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     746LRESULT CALLBACK PopupMenu::PopupMenuWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
    748747{
    749748#if OS(WINCE)
     
    753752#endif
    754753   
    755     if (PopupMenuWin* popup = reinterpret_cast<PopupMenuWin*>(longPtr))
     754    if (PopupMenu* popup = reinterpret_cast<PopupMenu*>(longPtr))
    756755        return popup->wndProc(hWnd, message, wParam, lParam);
    757756   
     
    773772const int smoothScrollAnimationDuration = 5000;
    774773
    775 LRESULT PopupMenuWin::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     774LRESULT PopupMenu::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
    776775{
    777776    LRESULT lResult = 0;
  • trunk/WebCore/platform/win/SearchPopupMenuWin.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007 Apple Inc.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2019
    2120#include "config.h"
    22 #include "SearchPopupMenuWin.h"
     21#include "SearchPopupMenu.h"
    2322
    2423#include "AtomicString.h"
     
    2726namespace WebCore {
    2827
    29 SearchPopupMenuWin::SearchPopupMenuWin(PopupMenuClient* client)
    30     : m_popup(client)
     28SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     29    : PopupMenu(client)
    3130{
    3231}
    3332
    34 PopupMenu* SearchPopupMenuWin::popupMenu()
    35 {
    36     return &m_popup;
    37 }
    38 
    39 bool SearchPopupMenuWin::enabled()
     33bool SearchPopupMenu::enabled()
    4034{
    4135    return true;
     
    4842}
    4943
    50 void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     44void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    5145{
    5246    if (name.isEmpty())
     
    6862}
    6963
    70 void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     64void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    7165{
    7266    if (name.isEmpty())
  • trunk/WebCore/platform/wx/PopupMenuWx.cpp

    r64425 r64462  
    33 *
    44 * Copyright (C) 2008 Apple Computer, Inc.
    5  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    65 *
    76 * This library is free software; you can redistribute it and/or
     
    2322
    2423#include "config.h"
    25 #include "PopupMenuWx.h"
     24#include "PopupMenu.h"
    2625
    2726#include "Frame.h"
     
    4342namespace WebCore {
    4443
    45 PopupMenuWx::PopupMenuWx(PopupMenuClient* client)
     44PopupMenu::PopupMenu(PopupMenuClient* client)
    4645    : m_popupClient(client)
    4746    , m_menu(NULL)
     
    4948}
    5049
    51 PopupMenuWx::~PopupMenuWx()
     50PopupMenu::~PopupMenu()
    5251{
    5352    delete m_menu;
    5453}
    5554
    56 void PopupMenuWx::disconnectClient()
    57 {
    58     m_popupClient = 0;
    59 }
    60 
    61 void PopupMenuWx::show(const IntRect& r, FrameView* v, int index)
     55void PopupMenu::show(const IntRect& r, FrameView* v, int index)
    6256{
    6357    // just delete and recreate
     
    8579            }
    8680        }
    87         nativeWin->Connect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenuWx::OnMenuItemSelected), 0, this);
     81        nativeWin->Connect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this);
    8882        nativeWin->PopupMenu(m_menu, r.x() - v->scrollX(), r.y() - v->scrollY());
    89         nativeWin->Disconnect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenuWx::OnMenuItemSelected), 0, this);
     83        nativeWin->Disconnect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this);
    9084    }
    9185}
    9286
    93 void PopupMenuWx::OnMenuItemSelected(wxCommandEvent& event)
     87void PopupMenu::OnMenuItemSelected(wxCommandEvent& event)
    9488{
    9589    if (client()) {
     
    10094}
    10195
    102 void PopupMenuWx::hide()
     96void PopupMenu::hide()
    10397{
    10498    // we don't need to do anything here, the native control only exists during the time
     
    106100}
    107101
    108 void PopupMenuWx::updateFromElement()
     102void PopupMenu::updateFromElement()
    109103{
    110104    client()->setTextFromItem(m_popupClient->selectedIndex());
    111105}
    112106
     107bool PopupMenu::itemWritingDirectionIsNatural()
     108{
     109    return false;
    113110}
     111
     112}
  • trunk/WebCore/platform/wx/SearchPopupMenuWx.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2009 Apple Inc. All Rights Reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2625
    2726#include "config.h"
    28 #include "SearchPopupMenuWx.h"
     27#include "SearchPopupMenu.h"
    2928
    3029#include "NotImplemented.h"
     
    3231namespace WebCore {
    3332
    34 SearchPopupMenuWx::SearchPopupMenuWx(PopupMenuClient* client)
    35     : m_popup(client)
     33SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client)
     34    : PopupMenu(client)
    3635{
    3736    notImplemented();
    3837}
    3938
    40 void SearchPopupMenuWx::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
     39void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)
    4140{
    4241    notImplemented();
    4342}
    4443
    45 void SearchPopupMenuWx::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
     44void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)
    4645{
    4746    notImplemented();
    4847}
    4948
    50 bool SearchPopupMenuWx::enabled()
     49bool SearchPopupMenu::enabled()
    5150{
    5251    return true;
    5352}
    5453
    55 PopupMenu* SearchPopupMenuWx::popupMenu()
    56 {
    57     return &m_popup;
    5854}
    5955
    60 }
    61 
  • trunk/WebCore/rendering/RenderMenuList.cpp

    r64425 r64462  
    2727
    2828#include "AXObjectCache.h"
    29 #include "Chrome.h"
    3029#include "CSSStyleSelector.h"
    3130#include "Frame.h"
     
    9089    m_innerBlock->style()->setPaddingTop(Length(theme()->popupInternalPaddingTop(style()), Fixed));
    9190    m_innerBlock->style()->setPaddingBottom(Length(theme()->popupInternalPaddingBottom(style()), Fixed));
    92 
    93     if (document()->page()->chrome()->selectItemWritingDirectionIsNatural()) {
     91       
     92    if (PopupMenu::itemWritingDirectionIsNatural()) {
    9493        // Items in the popup will not respect the CSS text-align and direction properties,
    9594        // so we must adjust our own style to match.
     
    280279    createInnerBlock();
    281280    if (!m_popup)
    282         m_popup = document()->page()->chrome()->createPopupMenu(this);
     281        m_popup = PopupMenu::create(this);
    283282    SelectElement* select = toSelectElement(static_cast<Element*>(node()));
    284283    m_popupIsVisible = true;
  • trunk/WebCore/rendering/RenderMenuList.h

    r64425 r64462  
    2525#define RenderMenuList_h
    2626
    27 #include "PopupMenu.h"
    2827#include "PopupMenuClient.h"
    2928#include "RenderFlexibleBox.h"
     
    3736namespace WebCore {
    3837
     38class PopupMenu;
    3939class RenderText;
    4040
  • trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

    r64425 r64462  
    33 *           (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    44 * Copyright (C) 2010 Google Inc. All rights reserved.
    5  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    65 *
    76 * This library is free software; you can redistribute it and/or
     
    2524#include "RenderTextControlSingleLine.h"
    2625
    27 #include "Chrome.h"
    2826#include "CSSStyleSelector.h"
    2927#include "Event.h"
     
    4139#include "RenderScrollbar.h"
    4240#include "RenderTheme.h"
     41#include "SearchPopupMenu.h"
    4342#include "SelectionController.h"
    4443#include "Settings.h"
     
    6463{
    6564    if (m_searchPopup) {
    66         m_searchPopup->popupMenu()->disconnectClient();
     65        m_searchPopup->disconnectClient();
    6766        m_searchPopup = 0;
    6867    }
     
    109108    const AtomicString& name = autosaveName();
    110109    if (!m_searchPopup)
    111         m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
     110        m_searchPopup = SearchPopupMenu::create(this);
    112111
    113112    m_searchPopup->saveRecentSearches(name, m_recentSearches);
     
    127126
    128127    if (!m_searchPopup)
    129         m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
     128        m_searchPopup = SearchPopupMenu::create(this);
    130129
    131130    if (!m_searchPopup->enabled())
     
    147146    }
    148147
    149     m_searchPopup->popupMenu()->show(absoluteBoundingBoxRect(true), document()->view(), -1);
     148    m_searchPopup->show(absoluteBoundingBoxRect(true), document()->view(), -1);
    150149}
    151150
     
    154153    ASSERT(node()->isHTMLElement());
    155154    if (m_searchPopup)
    156         m_searchPopup->popupMenu()->hide();
     155        m_searchPopup->hide();
    157156}
    158157
     
    687686
    688687    if (m_searchPopupIsVisible)
    689         m_searchPopup->popupMenu()->updateFromElement();
     688        m_searchPopup->updateFromElement();
    690689}
    691690
     
    885884            if (!name.isEmpty()) {
    886885                if (!m_searchPopup)
    887                     m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);
     886                    m_searchPopup = SearchPopupMenu::create(this);
    888887                m_searchPopup->saveRecentSearches(name, m_recentSearches);
    889888            }
  • trunk/WebCore/rendering/RenderTextControlSingleLine.h

    r64425 r64462  
    22 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    4  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    54 *
    65 * This library is free software; you can redistribute it and/or
     
    2625#include "PopupMenuClient.h"
    2726#include "RenderTextControl.h"
    28 #include "SearchPopupMenu.h"
    2927#include "Timer.h"
    3028
     
    3533class SearchFieldCancelButtonElement;
    3634class SearchFieldResultsButtonElement;
     35class SearchPopupMenu;
    3736class SpinButtonElement;
    3837class TextControlInnerElement;
  • trunk/WebKit/chromium/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * src/ChromeClientImpl.cpp:
     7        * src/ChromeClientImpl.h:
     8        * tests/PopupMenuTest.cpp:
     9        (WebKit::SelectPopupMenuTest::SetUp):
     10
    1112010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    212
  • trunk/WebKit/chromium/src/ChromeClientImpl.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2009 Google Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    5756#include "Page.h"
    5857#include "PopupMenuChromium.h"
    59 #include "SearchPopupMenuChromium.h"
    6058#include "ScriptController.h"
    6159#include "SecurityOrigin.h"
     
    776774}
    777775
    778 bool ChromeClientImpl::selectItemWritingDirectionIsNatural()
    779 {
    780     return false;
    781 }
    782 
    783 PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(PopupMenuClient* client) const
    784 {
    785     return adoptRef(new PopupMenuChromium(client));
    786 }
    787 
    788 PassRefPtr<SearchPopupMenu> ChromeClientImpl::createSearchPopupMenu(PopupMenuClient* client) const
    789 {
    790     return adoptRef(new SearchPopupMenuChromium(client));
    791 }
    792 
    793776} // namespace WebKit
  • trunk/WebKit/chromium/src/ChromeClientImpl.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2009 Google Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    3433
    3534#include "ChromeClientChromium.h"
    36 #include "PopupMenu.h"
    37 #include "SearchPopupMenu.h"
    3835
    3936namespace WebCore {
     
    4239class HTMLParserQuirks;
    4340class PopupContainer;
    44 class PopupMenuClient;
    4541class SecurityOrigin;
    4642struct WindowFeatures;
     
    173169    void setCursorForPlugin(const WebCursorInfo& cursor);
    174170
    175     virtual bool selectItemWritingDirectionIsNatural();
    176     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    177     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
    178 
    179171private:
    180172    void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*);
  • trunk/WebKit/chromium/tests/PopupMenuTest.cpp

    r64425 r64462  
    181181        m_webView = static_cast<WebViewImpl*>(WebView::create(&m_webviewClient, 0));
    182182        m_webView->initializeMainFrame(&m_webFrameClient);
    183         m_popupMenu = new PopupMenuChromium(&m_popupMenuClient);
     183        m_popupMenu = PopupMenu::create(&m_popupMenuClient);
    184184    }
    185185
  • trunk/WebKit/efl/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/ChromeClientEfl.cpp:
     7        * WebCoreSupport/ChromeClientEfl.h:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

    r64425 r64462  
    66 * Copyright (C) 2009-2010 ProFUSION embedded systems
    77 * Copyright (C) 2009-2010 Samsung Electronics
    8  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    98 *
    109 * All rights reserved.
     
    5049#include "PlatformString.h"
    5150#include "SecurityOrigin.h"
    52 #include "PopupMenuEfl.h"
    53 #include "SearchPopupMenuEfl.h"
    5451#include "ViewportArguments.h"
    5552#include "WindowFeatures.h"
     
    523520}
    524521
    525 bool ChromeClientEfl::selectItemWritingDirectionIsNatural()
    526 {
    527     return true;
    528 }
    529 
    530 PassRefPtr<PopupMenu> ChromeClientEfl::createPopupMenu(PopupMenuClient* client) const
    531 {
    532     return adoptRef(new PopupMenuEfl(client));
    533 }
    534 
    535 PassRefPtr<SearchPopupMenu> ChromeClientEfl::createSearchPopupMenu(PopupMenuClient* client) const
    536 {
    537     return adoptRef(new SearchPopupMenuEfl(client));
    538 }
    539 
    540 }
     522}
  • trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.h

    r64425 r64462  
    44 * Copyright (C) 2009-2010 ProFUSION embedded systems
    55 * Copyright (C) 2009-2010 Samsung Electronics
    6  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    76 *
    87 * This library is free software; you can redistribute it and/or
     
    140139    virtual void didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const;
    141140
    142     virtual bool selectItemWritingDirectionIsNatural();
    143     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    144     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    145 
    146141    Evas_Object* m_view;
    147142    KURL m_hoveredLinkURL;
  • trunk/WebKit/gtk/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/ChromeClientGtk.cpp:
     7        * WebCoreSupport/ChromeClientGtk.h:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r64425 r64462  
    55 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
    66 * Copyright (C) 2008 Gustavo Noronha Silva <gns@gnome.org>
    7  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    87 *
    98 *  This library is free software; you can redistribute it and/or
     
    3635#include "KURL.h"
    3736#include "PlatformString.h"
    38 #include "PopupMenuClient.h"
    39 #include "PopupMenuGtk.h"
    40 #include "SearchPopupMenuGtk.h"
    4137#include "SecurityOrigin.h"
    4238#include "webkitgeolocationpolicydecision.h"
     
    627623}
    628624
    629 bool ChromeClient::selectItemWritingDirectionIsNatural()
    630 {
    631     return true;
    632 }
    633 
    634 PassRefPtr<WebCore::PopupMenu> ChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const
    635 {
    636     return adoptRef(new PopupMenuGtk(client));
    637 }
    638 
    639 PassRefPtr<WebCore::SearchPopupMenu> ChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const
    640 {
    641     return adoptRef(new SearchPopupMenuGtk(client));
    642 }
    643 
    644 }
     625}
  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2007 Holger Hans Peter Freyther
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * This library is free software; you can redistribute it and/or
     
    2423#include "ChromeClient.h"
    2524#include "KURL.h"
    26 #include "PopupMenu.h"
    27 #include "SearchPopupMenu.h"
    2825
    2926typedef struct _WebKitWebView WebKitWebView;
    30 
    31 namespace WebCore {
    32 class PopupMenuClient;
    33 }
    3427
    3528namespace WebKit {
     
    131124        virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
    132125
    133         virtual bool selectItemWritingDirectionIsNatural();
    134         virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    135         virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
    136 
    137126    private:
    138127        WebKitWebView* m_webView;
  • trunk/WebKit/haiku/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/ChromeClientHaiku.cpp:
     7        * WebCoreSupport/ChromeClientHaiku.h:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp

    r64425 r64462  
    33 * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
    44 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved.
    5  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    65 *
    76 *
     
    3837#include "PlatformString.h"
    3938#include "SecurityOrigin.h"
    40 #include "PopupMenuHaiku.h"
    41 #include "SearchPopupMenuHaiku.h"
    4239
    4340#include <Alert.h>
     
    390387}
    391388
    392 bool ChromeClientHaiku::selectItemWritingDirectionIsNatural()
    393 {
    394     return false;
    395 }
    396 
    397 PassRefPtr<PopupMenu> ChromeClientHaiku::createPopupMenu(PopupMenuClient* client) const
    398 {
    399     return adoptRef(new PopupMenuHaiku(client));
    400 }
    401 
    402 PassRefPtr<SearchPopupMenu> ChromeClientHaiku::createSearchPopupMenu(PopupMenuClient* client) const
    403 {
    404     return adoptRef(new SearchPopupMenuHaiku(client));
    405 }
    406 
    407389} // namespace WebCore
    408390
  • trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h

    r64425 r64462  
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    33 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved.
    4  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    54 *
    65 *
     
    130129        void exceededDatabaseQuota(Frame*, const String& databaseName);
    131130
    132         virtual bool selectItemWritingDirectionIsNatural();
    133         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    134         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    135 
    136131#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    137132        virtual void reachedMaxAppCacheSize(int64_t spaceNeeded);
  • trunk/WebKit/mac/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/WebChromeClient.h:
     7        * WebCoreSupport/WebChromeClient.mm:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
     3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    169169    virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { }
    170170
    171     virtual bool selectItemWritingDirectionIsNatural();
    172     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    173     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
    174 
    175171private:
    176172    WebView *m_webView;
  • trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
     3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    6565#import <WebCore/PlatformScreen.h>
    6666#import <WebCore/PlatformString.h>
    67 #import <WebCore/PopupMenuMac.h>
    6867#import <WebCore/ResourceRequest.h>
    69 #import <WebCore/SearchPopupMenuMac.h>
    7068#import <WebCore/Widget.h>
    7169#import <WebCore/WindowFeatures.h>
    7270#import <wtf/PassRefPtr.h>
    7371#import <wtf/Vector.h>
    74 
    75 
    7672
    7773#if USE(ACCELERATED_COMPOSITING)
     
    742738}
    743739
    744 bool WebChromeClient::selectItemWritingDirectionIsNatural()
    745 {
    746     return true;
    747 }
    748 
    749 PassRefPtr<WebCore::PopupMenu> WebChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const
    750 {
    751     return adoptRef(new PopupMenuMac(client));
    752 }
    753 
    754 PassRefPtr<WebCore::SearchPopupMenu> WebChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const
    755 {
    756     return adoptRef(new SearchPopupMenuMac(client));
    757 }
    758 
    759740#if USE(ACCELERATED_COMPOSITING)
    760741
  • trunk/WebKit/qt/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/ChromeClientQt.cpp:
     7        * WebCoreSupport/ChromeClientQt.h:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r64425 r64462  
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    33 * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
    4  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    54 *
    65 * All rights reserved.
     
    4746#include "NotificationPresenterClientQt.h"
    4847#include "PageClientQt.h"
    49 #include "PopupMenuQt.h"
    5048#if defined(Q_WS_MAEMO_5)
    5149#include "QtMaemoWebPopup.h"
     
    5553#include "QWebPageClient.h"
    5654#include "ScrollbarTheme.h"
    57 #include "SearchPopupMenuQt.h"
    5855#include "SecurityOrigin.h"
    5956#include "ViewportArguments.h"
     
    626623}
    627624
    628 bool ChromeClientQt::selectItemWritingDirectionIsNatural()
    629 {
    630     return false;
    631 }
    632 
    633 PassRefPtr<PopupMenu> ChromeClientQt::createPopupMenu(PopupMenuClient* client) const
    634 {
    635     return adoptRef(new PopupMenuQt(client));
    636 }
    637 
    638 PassRefPtr<SearchPopupMenu> ChromeClientQt::createSearchPopupMenu(PopupMenuClient* client) const
    639 {
    640     return adoptRef(new SearchPopupMenuQt(client));
    641 }
    642 
    643625} // namespace WebCore
  • trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * All rights reserved.
     
    171170        virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    172171
    173         virtual bool selectItemWritingDirectionIsNatural();
    174         virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    175         virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    176 
    177172        QtAbstractWebPopup* createSelectPopup();
    178173
  • trunk/WebKit/win/ChangeLog

    r64429 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebCoreSupport/WebChromeClient.cpp:
     7        * WebCoreSupport/WebChromeClient.h:
     8        * WebView.cpp:
     9        (WebView::mouseWheel):
     10
    1112010-07-31  Luiz Agostini  <luiz.agostini@openbossa.org>
    212
  • trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    5857#include <WebCore/Page.h>
    5958#include <WebCore/SecurityOrigin.h>
    60 #include <WebCore/PopupMenuWin.h>
    61 #include <WebCore/SearchPopupMenuWin.h>
    6259#include <WebCore/WindowFeatures.h>
    6360#pragma warning(pop)
     
    878875#endif
    879876
    880 bool WebChromeClient::selectItemWritingDirectionIsNatural()
    881 {
    882     return true;
    883 }
    884 
    885 PassRefPtr<PopupMenu> WebChromeClient::createPopupMenu(PopupMenuClient* client) const
    886 {
    887     return adoptRef(new PopupMenuWin(client));
    888 }
    889 
    890 PassRefPtr<SearchPopupMenu> WebChromeClient::createSearchPopupMenu(PopupMenuClient* client) const
    891 {
    892     return adoptRef(new SearchPopupMenuWin(client));
    893 }
    894 
  • trunk/WebKit/win/WebCoreSupport/WebChromeClient.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    168167#endif
    169168
    170     virtual bool selectItemWritingDirectionIsNatural();
    171     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    172     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
    173 
    174169private:
    175170    COMPtr<IWebUIDelegate> uiDelegate();
  • trunk/WebKit/win/WebView.cpp

    r64429 r64462  
    111111#include <WebCore/PluginView.h>
    112112#include <WebCore/PopupMenu.h>
    113 #include <WebCore/PopupMenuWin.h>
    114113#include <WebCore/ProgressTracker.h>
    115114#include <WebCore/RenderLayer.h>
     
    16151614
    16161615        // Make sure truncation won't affect the comparison.
    1617         ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenuWin::popupClassName()));
    1618 
    1619         if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenuWin::popupClassName())) {
     1616        ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenu::popupClassName()));
     1617
     1618        if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenu::popupClassName())) {
    16201619            // We don't let the WebView scroll here for two reasons - 1) To match Firefox behavior, 2) If we do scroll, we lose the
    16211620            // focus ring around the select menu.
  • trunk/WebKit/wx/ChangeLog

    r64425 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebKitSupport/ChromeClientWx.cpp:
     7        * WebKitSupport/ChromeClientWx.h:
     8
    192010-07-27  Luiz Agostini  <luiz.agostini@openbossa.org>
    210
  • trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * All rights reserved.
     
    4140#include "PlatformString.h"
    4241#include "SecurityOrigin.h"
    43 #include "PopupMenuWx.h"
    44 #include "SearchPopupMenuWx.h"
    4542#include "WindowFeatures.h"
    4643
     
    468465}
    469466
    470 bool ChromeClientWx::selectItemWritingDirectionIsNatural()
    471 {
    472     return false;
    473 }
    474 
    475 PassRefPtr<PopupMenu> ChromeClientWx::createPopupMenu(PopupMenuClient* client) const
    476 {
    477     return adoptRef(new PopupMenuWx(client));
    478 }
    479 
    480 PassRefPtr<SearchPopupMenu> ChromeClientWx::createSearchPopupMenu(PopupMenuClient* client) const
    481 {
    482     return adoptRef(new SearchPopupMenuWx(client));
    483 }
    484 
    485 }
     467}
  • trunk/WebKit/wx/WebKitSupport/ChromeClientWx.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * All rights reserved.
     
    144143    virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { }
    145144
    146     virtual bool selectItemWritingDirectionIsNatural();
    147     virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;
    148     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
    149 
    150145private:
    151146    wxWebView* m_webView;
  • trunk/WebKit2/ChangeLog

    r64460 r64462  
     12010-08-02  Jeremy Orlow  <jorlow@chromium.org>
     2
     3        Speculative revert of 64425 due to Chromium instability
     4        https://bugs.webkit.org/show_bug.cgi?id=43347
     5
     6        * WebKit2.xcodeproj/project.pbxproj:
     7        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     8        * WebProcess/WebCoreSupport/WebChromeClient.h:
     9        * WebProcess/WebCoreSupport/WebPopupMenu.cpp: Removed.
     10        * WebProcess/WebCoreSupport/WebPopupMenu.h: Removed.
     11        * WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp: Removed.
     12        * WebProcess/WebCoreSupport/WebSearchPopupMenu.h: Removed.
     13        * win/WebKit2.vcproj:
     14
    1152010-08-02  Balazs Kelemen  <kb@inf.u-szeged.hu>
    216
  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r64425 r64462  
    267267                BCF69FA91176D1CB00471A52 /* WKNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA71176D1CB00471A52 /* WKNavigationData.h */; settings = {ATTRIBUTES = (Public, ); }; };
    268268                BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */; };
    269                 D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */; };
    270                 D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
    271                 D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */; };
    272                 D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
    273269                E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; };
    274270                E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; };
     
    571567                BCF69FA71176D1CB00471A52 /* WKNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationData.h; sourceTree = "<group>"; };
    572568                BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNavigationData.cpp; sourceTree = "<group>"; };
    573                 D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
    574                 D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
    575                 D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
    576                 D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = "<group>"; };
    577569                E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
    578570                E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
     
    869861                                1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */,
    870862                                1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */,
    871                                 D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */,
    872                                 D3B9484311FF4B6500032B39 /* WebPopupMenu.h */,
    873                                 D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */,
    874                                 D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */,
    875863                        );
    876864                        path = WebCoreSupport;
     
    13381326                                BCB28CC0120233D9007D99BC /* InjectedBundleMessageKinds.h in Headers */,
    13391327                                BCCB75C61203A1CE00222D1B /* WebContextMessageKinds.h in Headers */,
    1340                                 D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,
    1341                                 D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
    13421328                        );
    13431329                        runOnlyForDeploymentPostprocessing = 0;
     
    15411527                                1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
    15421528                                BCDB85831200EC57007254BE /* WKType.cpp in Sources */,
    1543                                 D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,
    1544                                 D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,
    15451529                        );
    15461530                        runOnlyForDeploymentPostprocessing = 0;
  • trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r64425 r64462  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    3635#include "WebPage.h"
    3736#include "WebPageProxyMessageKinds.h"
    38 #include "WebPopupMenu.h"
    3937#include "WebPreferencesStore.h"
    4038#include "WebProcess.h"
    4139#include "WebProcessProxyMessageKinds.h"
    42 #include "WebSearchPopupMenu.h"
    4340#include <WebCore/FileChooser.h>
    4441#include <WebCore/Frame.h>
     
    479476}
    480477
    481 bool WebChromeClient::selectItemWritingDirectionIsNatural()
    482 {
    483     return true;
    484 }
    485 
    486 PassRefPtr<WebCore::PopupMenu> WebChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const
    487 {
    488     return adoptRef(new WebPopupMenu(client));
    489 }
    490 
    491 PassRefPtr<WebCore::SearchPopupMenu> WebChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const
    492 {
    493     return adoptRef(new WebSearchPopupMenu(client));
    494 }
    495 
    496478PassOwnPtr<HTMLParserQuirks> WebChromeClient::createHTMLParserQuirks()
    497479{
  • trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r64425 r64462  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    3  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    165164    virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks();
    166165
    167     virtual bool selectItemWritingDirectionIsNatural();
    168     virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;
    169     virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;
    170 
    171166#if USE(ACCELERATED_COMPOSITING)
    172167    virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*);
  • trunk/WebKit2/win/WebKit2.vcproj

    r64425 r64462  
    584584                                        >
    585585                                </File>
    586                                 <File
    587                                         RelativePath="..\WebProcess\WebCoreSupport\WebPopupMenu.cpp"
    588                                         >
    589                                 </File>
    590                                 <File
    591                                         RelativePath="..\WebProcess\WebCoreSupport\WebPopupMenu.h"
    592                                         >
    593                                 </File>
    594                                 <File
    595                                         RelativePath="..\WebProcess\WebCoreSupport\WebSearchPopupMenu.cpp"
    596                                         >
    597                                 </File>
    598                                 <File
    599                                         RelativePath="..\WebProcess\WebCoreSupport\WebSearchPopupMenu.h"
    600                                         >
    601                                 </File>
    602586                                <Filter
    603587                                        Name="win"
Note: See TracChangeset for help on using the changeset viewer.