Changeset 64462 in webkit
- Timestamp:
- Aug 2, 2010 7:53:46 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 21 deleted
- 68 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64461 r64462 1 2010-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 1 205 2010-08-02 Markus Goetz <Markus.Goetz@nokia.com> 2 206 -
trunk/WebCore/GNUmakefile.am
r64425 r64462 2466 2466 WebCore/platform/gtk/PlatformScreenGtk.cpp \ 2467 2467 WebCore/platform/gtk/PopupMenuGtk.cpp \ 2468 WebCore/platform/gtk/PopupMenuGtk.h \2469 2468 WebCore/platform/gtk/RenderThemeGtk.cpp \ 2470 2469 WebCore/platform/gtk/RenderThemeGtk.h \ … … 2475 2474 WebCore/platform/gtk/ScrollViewGtk.cpp \ 2476 2475 WebCore/platform/gtk/SearchPopupMenuGtk.cpp \ 2477 WebCore/platform/gtk/SearchPopupMenuGtk.h \2478 2476 WebCore/platform/gtk/SharedBufferGtk.cpp \ 2479 2477 WebCore/platform/gtk/SharedTimerGtk.cpp \ -
trunk/WebCore/WebCore.exp.in
r64425 r64462 251 251 __ZN7WebCore12IconDatabase5closeEv 252 252 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE 253 __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE254 253 __ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci 255 254 __ZN7WebCore12PrintContext13numberOfPagesEPNS_5FrameERKNS_9FloatSizeE … … 413 412 __ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE 414 413 __ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE 415 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE416 414 __ZN7WebCore19AnimationController16resumeAnimationsEPNS_8DocumentE 417 415 __ZN7WebCore19AnimationController17suspendAnimationsEPNS_8DocumentE -
trunk/WebCore/WebCore.gypi
r64458 r64462 2131 2131 'platform/chromium/ScrollbarThemeChromiumWin.cpp', 2132 2132 'platform/chromium/SearchPopupMenuChromium.cpp', 2133 'platform/chromium/SearchPopupMenuChromium.h',2134 2133 'platform/chromium/SharedTimerChromium.cpp', 2135 2134 'platform/chromium/SoundChromiumPosix.cpp', … … 2624 2623 'platform/mac/PlatformMouseEventMac.mm', 2625 2624 'platform/mac/PlatformScreenMac.mm', 2626 'platform/mac/PopupMenuMac.h',2627 2625 'platform/mac/PopupMenuMac.mm', 2628 2626 'platform/mac/PurgeableBufferMac.cpp', … … 2632 2630 'platform/mac/ScrollbarThemeMac.h', 2633 2631 'platform/mac/ScrollbarThemeMac.mm', 2634 'platform/mac/SearchPopupMenuMac.h',2635 2632 'platform/mac/SearchPopupMenuMac.mm', 2636 2633 'platform/mac/SharedBufferMac.mm', … … 2783 2780 'platform/qt/PlatformScreenQt.cpp', 2784 2781 'platform/qt/PopupMenuQt.cpp', 2785 'platform/qt/PopupMenuQt.h',2786 2782 'platform/qt/QWebPopup.cpp', 2787 2783 'platform/qt/QWebPopup.h', … … 2794 2790 'platform/qt/ScrollbarThemeQt.h', 2795 2791 'platform/qt/SearchPopupMenuQt.cpp', 2796 'platform/qt/SearchPopupMenuQt.h',2797 2792 'platform/qt/SharedBufferQt.cpp', 2798 2793 'platform/qt/SharedTimerQt.cpp', -
trunk/WebCore/WebCore.pro
r64461 r64462 1710 1710 platform/PlatformTouchEvent.h \ 1711 1711 platform/PlatformTouchPoint.h \ 1712 platform/PopupMenu.h \1713 1712 platform/qt/ClipboardQt.h \ 1714 1713 platform/qt/QWebPageClient.h \ … … 1720 1719 platform/ScrollbarThemeComposite.h \ 1721 1720 platform/ScrollView.h \ 1722 platform/SearchPopupMenu.h \1723 1721 platform/SharedBuffer.h \ 1724 1722 platform/sql/SQLiteDatabase.h \ … … 3299 3297 ../WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \ 3300 3298 ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \ 3301 ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \3302 ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \3303 3299 ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \ 3304 3300 ../WebKit2/WebProcess/WebPage/DrawingArea.h \ … … 3373 3369 ../WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \ 3374 3370 ../WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \ 3375 ../WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \3376 ../WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \3377 3371 ../WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp \ 3378 3372 ../WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r64458 r64462 23721 23721 </File> 23722 23722 <File 23723 RelativePath="..\platform\win\PopupMenuWin.h"23724 >23725 </File>23726 <File23727 23723 RelativePath="..\platform\win\ScrollbarThemeSafari.cpp" 23728 23724 > … … 23742 23738 <File 23743 23739 RelativePath="..\platform\win\SearchPopupMenuWin.cpp" 23744 >23745 </File>23746 <File23747 RelativePath="..\platform\win\SearchPopupMenuWin.h"23748 23740 > 23749 23741 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r64447 r64462 43 43 065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 065AD4F30B0C2EDA005A2B1D /* ContextMenuController.cpp */; }; 44 44 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 */; }; 46 46 0668E1900ADD9640004128E0 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */; }; 47 47 066C772B0AB603B700238CC4 /* FileChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = 066C772A0AB603B700238CC4 /* FileChooser.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 3597 3597 AB67D1A8097F3AE300F9392E /* RenderTextControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB67D1A6097F3AE300F9392E /* RenderTextControl.cpp */; }; 3598 3598 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 */; }; 3600 3600 AB7170A00B31193B0017123E /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB71709F0B31193B0017123E /* SearchPopupMenuMac.mm */; }; 3601 3601 ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABAF22070C03B1C700B0BCF0 /* ChromeMac.mm */; }; 3602 3602 ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */; }; 3603 3603 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 */; }; 3605 3605 ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABDDFE730A5C6E6F00A3E11D /* RenderMenuList.cpp */; }; 3606 3606 ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; }; … … 5023 5023 D23CA55F0AB0EAB6005108A5 /* JSRangeException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */; }; 5024 5024 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, ); }; };5027 5025 D8B6152F1032495100C8554A /* Cookie.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B6152E1032495100C8554A /* Cookie.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5028 5026 DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */; }; … … 10737 10735 D23CA55E0AB0EAB6005108A5 /* JSRangeException.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSRangeException.cpp; sourceTree = "<group>"; }; 10738 10736 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>"; };10741 10737 D8B6152E1032495100C8554A /* Cookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cookie.h; sourceTree = "<group>"; }; 10742 10738 DB23C2C90A508D29002489EB /* IndentOutdentCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = IndentOutdentCommand.cpp; sourceTree = "<group>"; }; … … 12309 12305 935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */, 12310 12306 BC94D1070C274F88006BC617 /* PlatformScreenMac.mm */, 12311 D39D006C11F8E308006041F2 /* PopupMenuMac.h */,12312 12307 0668E18E0ADD9640004128E0 /* PopupMenuMac.mm */, 12313 12308 E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */, 12314 12309 447D69010FA626810015CCB1 /* RuntimeApplicationChecks.h */, 12315 12310 447D69020FA626810015CCB1 /* RuntimeApplicationChecks.mm */, 12316 D39D009C11F907E6006041F2 /* SearchPopupMenuMac.h */,12317 12311 1CE24F960D7CAF0E007E04C2 /* SchedulePairMac.mm */, 12318 12312 BCAA90C20A7EBA60008B1229 /* Scrollbar.cpp */, … … 19962 19956 C572EE0F1201C736007D8F82 /* IDBIndexBackendInterface.h in Headers */, 19963 19957 C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */, 19964 D39D006D11F8E308006041F2 /* PopupMenuMac.h in Headers */,19965 D39D009D11F907E6006041F2 /* SearchPopupMenuMac.h in Headers */,19966 19958 379919971200DDF400EA041C /* WOFFFileFormat.h in Headers */, 19967 19959 ); -
trunk/WebCore/loader/EmptyClients.h
r64425 r64462 2 2 * Copyright (C) 2006 Eric Seidel (eric@webkit.org) 3 3 * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).5 4 * 6 5 * Redistribution and use in source and binary forms, with or without … … 41 40 #include "InspectorClient.h" 42 41 #include "PluginHalterClient.h" 43 #include "PopupMenu.h"44 42 #include "ResourceError.h" 45 #include "SearchPopupMenu.h"46 43 47 44 #if USE(GLES2_RENDERING) … … 64 61 namespace WebCore { 65 62 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 85 63 class EmptyChromeClient : public ChromeClient { 86 64 public: … … 134 112 virtual bool runJavaScriptPrompt(Frame*, const String&, const String&, String&) { return false; } 135 113 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()); }140 114 141 115 virtual void setStatusbarText(const String&) { } -
trunk/WebCore/page/Chrome.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2008 , 2010Nokia Corporation and/or its subsidiary(-ies)3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 4 * 5 5 * This library is free software; you can redistribute it and/or … … 483 483 } 484 484 485 bool Chrome::selectItemWritingDirectionIsNatural()486 {487 return m_client->selectItemWritingDirectionIsNatural();488 }489 490 PassRefPtr<PopupMenu> Chrome::createPopupMenu(PopupMenuClient* client) const491 {492 return m_client->createPopupMenu(client);493 }494 495 PassRefPtr<SearchPopupMenu> Chrome::createSearchPopupMenu(PopupMenuClient* client) const496 {497 return m_client->createSearchPopupMenu(client);498 }499 485 500 486 } // namespace WebCore -
trunk/WebCore/page/Chrome.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 26 25 #include "FocusDirection.h" 27 26 #include "HostWindow.h" 28 #include "PopupMenu.h"29 #include "SearchPopupMenu.h"30 27 #include <wtf/Forward.h> 31 28 #include <wtf/RefPtr.h> … … 48 45 class Node; 49 46 class Page; 50 class PopupMenuClient;51 47 class String; 52 48 #if ENABLE(NOTIFICATIONS) … … 149 145 #endif 150 146 151 bool selectItemWritingDirectionIsNatural();152 PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;153 PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;154 155 147 private: 156 148 Page* m_page; -
trunk/WebCore/page/ChromeClient.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple, Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 28 27 #include "HTMLParserQuirks.h" 29 28 #include "HostWindow.h" 30 #include "PopupMenu.h"31 #include "PopupMenuClient.h"32 29 #include "ScrollTypes.h" 33 #include "SearchPopupMenu.h"34 30 #include <wtf/Forward.h> 35 31 #include <wtf/PassOwnPtr.h> … … 59 55 class Page; 60 56 class SecurityOrigin; 61 class PopupMenuClient;62 57 class String; 63 58 class Widget; … … 268 263 #endif 269 264 270 virtual bool selectItemWritingDirectionIsNatural() = 0;271 virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0;272 virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0;273 274 265 protected: 275 266 virtual ~ChromeClient() { } -
trunk/WebCore/platform/PopupMenu.h
r64425 r64462 1 1 /* 2 * Copyright (C) 20 10 Nokia Corporation and/or its subsidiary(-ies).2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 22 22 #define PopupMenu_h 23 23 24 #include "IntRect.h" 25 #include "PopupMenuClient.h" 26 #include <wtf/PassRefPtr.h> 24 27 #include <wtf/RefCounted.h> 25 28 29 #if PLATFORM(MAC) 30 #include <wtf/RetainPtr.h> 31 #ifdef __OBJC__ 32 @class NSPopUpButtonCell; 33 #else 34 class NSPopUpButtonCell; 35 #endif 36 #elif PLATFORM(WIN) 37 #include "Scrollbar.h" 38 #include "ScrollbarClient.h" 39 #include <wtf/RefPtr.h> 40 typedef struct HWND__* HWND; 41 typedef struct HDC__* HDC; 42 typedef struct HBITMAP__* HBITMAP; 43 #elif PLATFORM(QT) 26 44 namespace WebCore { 45 class QtAbstractWebPopup; 46 } 47 #elif PLATFORM(GTK) 48 typedef struct _GtkMenu GtkMenu; 49 typedef struct _GtkMenuItem GtkMenuItem; 50 typedef 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 58 class wxMenu; 59 #include <wx/defs.h> 60 #include <wx/event.h> 61 #elif PLATFORM(CHROMIUM) 62 #include "PopupMenuPrivate.h" 63 #elif PLATFORM(HAIKU) 64 namespace WebCore { 65 class PopupMenuHaiku; 66 } 67 #endif 68 69 namespace WebCore { 27 70 28 71 class FrameView; 29 class IntRect; 30 31 class PopupMenu : public RefCounted<PopupMenu> { 72 class Scrollbar; 73 74 class PopupMenu : public RefCounted<PopupMenu> 75 #if PLATFORM(WIN) 76 , private ScrollbarClient 77 #endif 78 #if PLATFORM(WX) 79 , public wxEvtHandler 80 #endif 81 { 32 82 public: 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 138 protected: 139 PopupMenu(PopupMenuClient*); 140 141 private: 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 38 196 }; 39 197 40 198 } 41 199 42 #endif // PopupMenu_h200 #endif -
trunk/WebCore/platform/SearchPopupMenu.h
r64425 r64462 1 1 /* 2 * Copyright (C) 20 10 Nokia Corporation and/or its subsidiary(-ies).2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 3 3 * 4 4 * This library is free software; you can redistribute it and/or … … 24 24 #include "PopupMenu.h" 25 25 #include <wtf/Vector.h> 26 #include <wtf/text/WTFString.h>27 26 28 27 namespace WebCore { … … 30 29 class AtomicString; 31 30 32 class SearchPopupMenu : public RefCounted<SearchPopupMenu>{31 class SearchPopupMenu : public PopupMenu { 33 32 public: 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 40 private: 41 SearchPopupMenu(PopupMenuClient*); 39 42 }; 40 43 41 44 } 42 45 43 #endif // SearchPopupMenu_h46 #endif -
trunk/WebCore/platform/brew/PopupMenuBrew.cpp
r64425 r64462 5 5 * Copyright (C) 2009-2010 Samsung Electronics 6 6 * Copyright (C) 2010 Company 100, Inc. 7 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).8 7 * 9 8 * This library is free software; you can redistribute it and/or … … 25 24 26 25 #include "config.h" 27 #include "PopupMenu Brew.h"26 #include "PopupMenu.h" 28 27 29 28 #include "Chrome.h" … … 34 33 namespace WebCore { 35 34 36 PopupMenu Brew::PopupMenuBrew(PopupMenuClient* menuList)35 PopupMenu::PopupMenu(PopupMenuClient* menuList) 37 36 : m_popupClient(menuList) 38 37 , m_view(0) … … 40 39 } 41 40 42 PopupMenu Brew::~PopupMenuBrew()41 PopupMenu::~PopupMenu() 43 42 { 44 43 // Tell client to destroy data related to this popup since this object is … … 47 46 } 48 47 49 void PopupMenuBrew::disconnectClient() 50 { 51 m_popupClient = 0; 52 } 53 54 void PopupMenuBrew::show(const IntRect& rect, FrameView* view, int index) 48 void PopupMenu::show(const IntRect& rect, FrameView* view, int index) 55 49 { 56 50 ASSERT(m_popupClient); … … 62 56 } 63 57 64 void PopupMenu Brew::hide()58 void PopupMenu::hide() 65 59 { 66 60 ASSERT(m_view); … … 71 65 } 72 66 73 void PopupMenu Brew::updateFromElement()67 void PopupMenu::updateFromElement() 74 68 { 75 69 client()->setTextFromItem(client()->selectedIndex()); 76 70 } 77 71 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 // } 72 bool PopupMenu::itemWritingDirectionIsNatural() 73 { 74 return true; 75 } 86 76 87 77 } // namespace WebCore -
trunk/WebCore/platform/brew/SearchPopupMenuBrew.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2010 Company 100, Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 26 25 27 26 #include "config.h" 28 #include "SearchPopupMenu Brew.h"27 #include "SearchPopupMenu.h" 29 28 30 29 namespace WebCore { 31 30 32 31 // Save the past searches stored in 'searchItems' to a database associated with 'name' 33 void SearchPopupMenu Brew::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)32 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 34 33 { 35 34 } 36 35 37 36 // Load past searches associated with 'name' from the database to 'searchItems' 38 void SearchPopupMenu Brew::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)37 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 39 38 { 40 39 } 41 40 42 41 // Create a search popup menu - not sure what else we have to do here 43 SearchPopupMenu Brew::SearchPopupMenuBrew(PopupMenuClient* client)44 : m_popup(client)42 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 43 : PopupMenu(client) 45 44 { 46 45 } 47 46 48 bool SearchPopupMenu Brew::enabled()47 bool SearchPopupMenu::enabled() 49 48 { 50 49 return false; 51 50 } 52 51 53 PopupMenu* SearchPopupMenuBrew::popupMenu()54 {55 return &m_popup;56 }57 58 52 } // namespace WebCore -
trunk/WebCore/platform/chromium/PopupMenuChromium.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 50 49 #include "PlatformScreen.h" 51 50 #include "PlatformWheelEvent.h" 51 #include "PopupMenu.h" 52 52 #include "RenderTheme.h" 53 53 #include "ScrollbarTheme.h" … … 1341 1341 1342 1342 /////////////////////////////////////////////////////////////////////////////// 1343 // PopupMenu Chromiumimplementation1343 // PopupMenu implementation 1344 1344 // 1345 1345 // Note: you cannot add methods to this class, since it is defined above the … … 1347 1347 // popup widgets, use |popupWindow| above. 1348 1348 1349 PopupMenu Chromium::PopupMenuChromium(PopupMenuClient* client)1349 PopupMenu::PopupMenu(PopupMenuClient* client) 1350 1350 : m_popupClient(client) 1351 1351 { 1352 1352 } 1353 1353 1354 PopupMenu Chromium::~PopupMenuChromium()1355 { 1356 // When the PopupMenu Chromiumis destroyed, the client could already have been1354 PopupMenu::~PopupMenu() 1355 { 1356 // When the PopupMenu is destroyed, the client could already have been 1357 1357 // deleted. 1358 1358 if (p.popup) … … 1365 1365 // Windows and Linux Chromium let our WebKit port handle the display, while 1366 1366 // another process manages the popup window and input handling. 1367 void PopupMenu Chromium::show(const IntRect& r, FrameView* v, int index)1367 void PopupMenu::show(const IntRect& r, FrameView* v, int index) 1368 1368 { 1369 1369 if (!p.popup) … … 1376 1376 } 1377 1377 1378 void PopupMenu Chromium::hide()1378 void PopupMenu::hide() 1379 1379 { 1380 1380 if (p.popup) … … 1382 1382 } 1383 1383 1384 void PopupMenu Chromium::updateFromElement()1384 void PopupMenu::updateFromElement() 1385 1385 { 1386 1386 p.popup->listBox()->updateFromElement(); 1387 1387 } 1388 1388 1389 1390 void PopupMenuChromium::disconnectClient() 1391 { 1392 m_popupClient = 0; 1389 bool PopupMenu::itemWritingDirectionIsNatural() 1390 { 1391 return false; 1393 1392 } 1394 1393 -
trunk/WebCore/platform/chromium/PopupMenuChromium.h
r64425 r64462 37 37 #include "FramelessScrollView.h" 38 38 #include "IntRect.h" 39 #include "PopupMenu.h"40 #include "PopupMenuPrivate.h"41 39 42 40 namespace WebCore { … … 204 202 }; 205 203 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 223 204 } // namespace WebCore 224 205 -
trunk/WebCore/platform/chromium/SearchPopupMenuChromium.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 31 30 32 31 #include "config.h" 33 #include "SearchPopupMenu Chromium.h"32 #include "SearchPopupMenu.h" 34 33 35 34 #include "AtomicString.h" … … 38 37 namespace WebCore { 39 38 40 SearchPopupMenu Chromium::SearchPopupMenuChromium(PopupMenuClient* client)41 : m_popup(client)39 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 40 : PopupMenu(client) 42 41 { 43 42 } 44 43 45 PopupMenu* SearchPopupMenuChromium::popupMenu() 46 { 47 return &m_popup; 48 } 49 50 bool SearchPopupMenuChromium::enabled() 44 bool SearchPopupMenu::enabled() 51 45 { 52 46 return false; 53 47 } 54 48 55 void SearchPopupMenu Chromium::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)49 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 56 50 { 57 51 notImplemented(); 58 52 } 59 53 60 void SearchPopupMenu Chromium::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)54 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 61 55 { 62 56 notImplemented(); -
trunk/WebCore/platform/efl/PopupMenuEfl.cpp
r64425 r64462 4 4 * Copyright (C) 2009-2010 ProFUSION embedded systems 5 5 * Copyright (C) 2009-2010 Samsung Electronics 6 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).7 6 * 8 7 * This library is free software; you can redistribute it and/or … … 24 23 25 24 #include "config.h" 26 #include "PopupMenu Efl.h"25 #include "PopupMenu.h" 27 26 28 27 #include "Chrome.h" … … 30 29 #include "FrameView.h" 31 30 #include "NotImplemented.h" 32 #include "PopupMenuClient.h"33 31 34 32 namespace WebCore { 35 33 36 PopupMenu Efl::PopupMenuEfl(PopupMenuClient* client)34 PopupMenu::PopupMenu(PopupMenuClient* client) 37 35 : m_popupClient(client) 38 36 , m_view(0) … … 40 38 } 41 39 42 PopupMenu Efl::~PopupMenuEfl()40 PopupMenu::~PopupMenu() 43 41 { 44 42 // Tell client to destroy data related to this popup since this object is … … 47 45 } 48 46 49 void PopupMenu Efl::show(const IntRect& rect, FrameView* view, int index)47 void PopupMenu::show(const IntRect& rect, FrameView* view, int index) 50 48 { 51 49 ASSERT(m_popupClient); … … 57 55 } 58 56 59 void PopupMenu Efl::hide()57 void PopupMenu::hide() 60 58 { 61 59 ASSERT(m_view); … … 66 64 } 67 65 68 void PopupMenu Efl::updateFromElement()66 void PopupMenu::updateFromElement() 69 67 { 70 68 client()->setTextFromItem(client()->selectedIndex()); 71 69 } 72 70 73 void PopupMenuEfl::disconnectClient()71 bool PopupMenu::itemWritingDirectionIsNatural() 74 72 { 75 m_popupClient = 0;73 return true; 76 74 } 77 75 -
trunk/WebCore/platform/efl/SearchPopupMenuEfl.cpp
r64425 r64462 3 3 * Copyright (C) 2009-2010 ProFUSION embedded systems 4 4 * Copyright (C) 2009-2010 Samsung Electronics 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).6 5 * 7 6 * This library is free software; you can redistribute it and/or … … 21 20 22 21 #include "config.h" 23 #include "SearchPopupMenu Efl.h"22 #include "SearchPopupMenu.h" 24 23 25 24 #include "NotImplemented.h" … … 27 26 namespace WebCore { 28 27 29 SearchPopupMenu Efl::SearchPopupMenuEfl(PopupMenuClient* client)30 : m_popup(client)28 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 29 : PopupMenu(client) 31 30 { 32 31 notImplemented(); 33 32 } 34 33 35 PopupMenu* SearchPopupMenuEfl::popupMenu() 36 { 37 return &m_popup; 38 } 39 40 void SearchPopupMenuEfl::saveRecentSearches(const AtomicString&, const Vector<String>&) 34 void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&) 41 35 { 42 36 notImplemented(); 43 37 } 44 38 45 void SearchPopupMenu Efl::loadRecentSearches(const AtomicString&, Vector<String>&)39 void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&) 46 40 { 47 41 notImplemented(); 48 42 } 49 43 50 bool SearchPopupMenu Efl::enabled()44 bool SearchPopupMenu::enabled() 51 45 { 52 46 notImplemented(); -
trunk/WebCore/platform/gtk/PopupMenuGtk.cpp
r64425 r64462 5 5 * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 6 6 * Copyright (C) 2008 Collabora Ltd. 7 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).8 7 * 9 8 * This library is free software; you can redistribute it and/or … … 25 24 26 25 #include "config.h" 27 #include "PopupMenu Gtk.h"26 #include "PopupMenu.h" 28 27 29 28 #include "FrameView.h" … … 36 35 namespace WebCore { 37 36 38 PopupMenu Gtk::PopupMenuGtk(PopupMenuClient* client)37 PopupMenu::PopupMenu(PopupMenuClient* client) 39 38 : m_popupClient(client) 40 39 { 41 40 } 42 41 43 PopupMenu Gtk::~PopupMenuGtk()42 PopupMenu::~PopupMenu() 44 43 { 45 44 if (m_popup) { … … 49 48 } 50 49 51 void PopupMenu Gtk::show(const IntRect& rect, FrameView* view, int index)50 void PopupMenu::show(const IntRect& rect, FrameView* view, int index) 52 51 { 53 52 ASSERT(client()); … … 112 111 } 113 112 114 void PopupMenu Gtk::hide()113 void PopupMenu::hide() 115 114 { 116 115 ASSERT(m_popup); … … 118 117 } 119 118 120 void PopupMenu Gtk::updateFromElement()119 void PopupMenu::updateFromElement() 121 120 { 122 121 client()->setTextFromItem(client()->selectedIndex()); 123 122 } 124 123 125 void PopupMenuGtk::disconnectClient()124 bool PopupMenu::itemWritingDirectionIsNatural() 126 125 { 127 m_popupClient = 0;126 return true; 128 127 } 129 128 130 void PopupMenu Gtk::menuItemActivated(GtkMenuItem* item, PopupMenuGtk* that)129 void PopupMenu::menuItemActivated(GtkMenuItem* item, PopupMenu* that) 131 130 { 132 131 ASSERT(that->client()); … … 135 134 } 136 135 137 void PopupMenu Gtk::menuUnmapped(GtkWidget*, PopupMenuGtk* that)136 void PopupMenu::menuUnmapped(GtkWidget*, PopupMenu* that) 138 137 { 139 138 ASSERT(that->client()); … … 141 140 } 142 141 143 void PopupMenu Gtk::menuPositionFunction(GtkMenu*, gint* x, gint* y, gboolean* pushIn, PopupMenuGtk* that)142 void PopupMenu::menuPositionFunction(GtkMenu*, gint* x, gint* y, gboolean* pushIn, PopupMenu* that) 144 143 { 145 144 *x = that->m_menuPosition.x(); … … 148 147 } 149 148 150 void PopupMenu Gtk::menuRemoveItem(GtkWidget* widget, PopupMenuGtk* that)149 void PopupMenu::menuRemoveItem(GtkWidget* widget, PopupMenu* that) 151 150 { 152 151 ASSERT(that->m_popup); -
trunk/WebCore/platform/gtk/SearchPopupMenuGtk.cpp
r64425 r64462 1 1 /* 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).3 *4 2 * This library is free software; you can redistribute it and/or 5 3 * modify it under the terms of the GNU Lesser General Public … … 18 16 19 17 #include "config.h" 20 #include "SearchPopupMenu Gtk.h"18 #include "SearchPopupMenu.h" 21 19 22 20 #include "NotImplemented.h" … … 24 22 namespace WebCore { 25 23 26 SearchPopupMenu Gtk::SearchPopupMenuGtk(PopupMenuClient* client)27 : m_popup(client)24 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 25 : PopupMenu(client) 28 26 { 29 27 notImplemented(); 30 28 } 31 29 32 PopupMenu* SearchPopupMenuGtk::popupMenu() 33 { 34 return &m_popup; 35 } 36 37 void SearchPopupMenuGtk::saveRecentSearches(const AtomicString&, const Vector<String>&) 30 void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&) 38 31 { 39 32 notImplemented(); 40 33 } 41 34 42 void SearchPopupMenu Gtk::loadRecentSearches(const AtomicString&, Vector<String>&)35 void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&) 43 36 { 44 37 notImplemented(); 45 38 } 46 39 47 bool SearchPopupMenu Gtk::enabled()40 bool SearchPopupMenu::enabled() 48 41 { 49 42 notImplemented(); -
trunk/WebCore/platform/haiku/PopupMenuHaiku.cpp
r64425 r64462 3 3 * 4 4 * Copyright (C) 2010 Stephan Aßmus <superstippi@gmx.de> 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).6 5 * 7 6 * This library is free software; you can redistribute it and/or … … 23 22 24 23 #include "config.h" 25 #include "PopupMenu Haiku.h"24 #include "PopupMenu.h" 26 25 27 26 #include "FrameView.h" … … 74 73 }; 75 74 76 class HaikuPopup: public BPopUpMenu {75 class PopupMenuHaiku : public BPopUpMenu { 77 76 public: 78 HaikuPopup(PopupMenuClient* popupClient)77 PopupMenuHaiku(PopupMenuClient* popupClient) 79 78 : BPopUpMenu("WebCore Popup", true, false) 80 79 , m_popupClient(popupClient) … … 88 87 } 89 88 90 virtual ~ HaikuPopup()89 virtual ~PopupMenuHaiku() 91 90 { 92 91 if (be_app->Lock()) { … … 155 154 }; 156 155 157 PopupMenu Haiku::PopupMenuHaiku(PopupMenuClient* client)156 PopupMenu::PopupMenu(PopupMenuClient* client) 158 157 : m_popupClient(client) 159 , m_menu(new HaikuPopup(client))158 , m_menu(new PopupMenuHaiku(client)) 160 159 { 161 160 // We don't need additional references to the client, since we completely … … 163 162 } 164 163 165 PopupMenu Haiku::~PopupMenuHaiku()164 PopupMenu::~PopupMenu() 166 165 { 167 166 delete m_menu; 168 167 } 169 168 170 void PopupMenuHaiku::disconnectClient() 171 { 172 m_popupClient = 0; 173 } 174 175 void PopupMenuHaiku::show(const IntRect& rect, FrameView* view, int index) 169 void PopupMenu::show(const IntRect& rect, FrameView* view, int index) 176 170 { 177 171 // The menu will update itself from the PopupMenuClient before showing. … … 179 173 } 180 174 181 void PopupMenu Haiku::hide()175 void PopupMenu::hide() 182 176 { 183 177 m_menu->hide(); 184 178 } 185 179 186 void PopupMenu Haiku::updateFromElement()180 void PopupMenu::updateFromElement() 187 181 { 188 182 client()->setTextFromItem(m_popupClient->selectedIndex()); 189 183 } 190 184 185 bool PopupMenu::itemWritingDirectionIsNatural() 186 { 187 return false; 188 } 189 191 190 } // namespace WebCore 192 191 -
trunk/WebCore/platform/haiku/SearchPopupMenuHaiku.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 20 19 21 20 #include "config.h" 22 #include "SearchPopupMenu Haiku.h"21 #include "SearchPopupMenu.h" 23 22 24 23 #include "AtomicString.h" … … 28 27 namespace WebCore { 29 28 30 SearchPopupMenu Haiku::SearchPopupMenuHaiku(PopupMenuClient* client)31 : m_popup(client)29 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 30 : PopupMenu(client) 32 31 { 33 32 } 34 33 35 void SearchPopupMenu Haiku::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)34 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 36 35 { 37 36 notImplemented(); 38 37 } 39 38 40 void SearchPopupMenu Haiku::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)39 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 41 40 { 42 41 notImplemented(); 43 42 } 44 43 45 bool SearchPopupMenu Haiku::enabled()44 bool SearchPopupMenu::enabled() 46 45 { 47 46 notImplemented(); … … 49 48 } 50 49 51 PopupMenu* SearchPopupMenuHaiku::popupMenu()52 {53 return m_popup;54 }55 56 50 } // namespace WebCore 57 51 -
trunk/WebCore/platform/mac/PopupMenuMac.mm
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 20 19 21 20 #import "config.h" 22 #import "PopupMenu Mac.h"21 #import "PopupMenu.h" 23 22 24 23 #import "AXObjectCache.h" … … 33 32 #import "HTMLSelectElement.h" 34 33 #import "Page.h" 35 #import "PopupMenuClient.h"36 34 #import "SimpleFontData.h" 37 35 #import "WebCoreSystemInterface.h" … … 41 39 using namespace HTMLNames; 42 40 43 PopupMenu Mac::PopupMenuMac(PopupMenuClient* client)41 PopupMenu::PopupMenu(PopupMenuClient* client) 44 42 : m_popupClient(client) 45 43 { 46 44 } 47 45 48 PopupMenu Mac::~PopupMenuMac()46 PopupMenu::~PopupMenu() 49 47 { 50 48 if (m_popup) … … 52 50 } 53 51 54 void PopupMenu Mac::clear()52 void PopupMenu::clear() 55 53 { 56 54 if (m_popup) … … 58 56 } 59 57 60 void PopupMenu Mac::populate()58 void PopupMenu::populate() 61 59 { 62 60 if (m_popup) … … 117 115 } 118 116 119 void PopupMenu Mac::show(const IntRect& r, FrameView* v, int index)117 void PopupMenu::show(const IntRect& r, FrameView* v, int index) 120 118 { 121 119 populate(); … … 165 163 NSEvent* event = [frame->eventHandler()->currentNSEvent() retain]; 166 164 167 RefPtr<PopupMenu Mac> protector(this);165 RefPtr<PopupMenu> protector(this); 168 166 169 167 RetainPtr<NSView> dummyView(AdoptNS, [[NSView alloc] initWithFrame:r]); … … 197 195 } 198 196 199 void PopupMenu Mac::hide()197 void PopupMenu::hide() 200 198 { 201 199 [m_popup.get() dismissPopUp]; 202 200 } 203 201 204 void PopupMenu Mac::updateFromElement()205 { 206 } 207 208 void PopupMenuMac::disconnectClient()209 { 210 m_popupClient = 0;211 } 212 213 } 202 void PopupMenu::updateFromElement() 203 { 204 } 205 206 bool PopupMenu::itemWritingDirectionIsNatural() 207 { 208 return true; 209 } 210 211 } -
trunk/WebCore/platform/mac/SearchPopupMenuMac.mm
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 20 19 21 20 #import "config.h" 22 #import "SearchPopupMenu Mac.h"21 #import "SearchPopupMenu.h" 23 22 24 23 #import "AtomicString.h" … … 26 25 namespace WebCore { 27 26 28 SearchPopupMenu Mac::SearchPopupMenuMac(PopupMenuClient* client)29 : m_popup(client)27 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 28 : PopupMenu(client) 30 29 { 31 30 } … … 36 35 } 37 36 38 PopupMenu* SearchPopupMenuMac::popupMenu() 39 { 40 return &m_popup; 41 } 42 43 bool SearchPopupMenuMac::enabled() 37 bool SearchPopupMenu::enabled() 44 38 { 45 39 return true; 46 40 } 47 41 48 void SearchPopupMenu Mac::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)42 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 49 43 { 50 44 if (name.isEmpty()) … … 63 57 } 64 58 65 void SearchPopupMenu Mac::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)59 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 66 60 { 67 61 if (name.isEmpty()) -
trunk/WebCore/platform/qt/PopupMenuQt.cpp
r64425 r64462 25 25 26 26 #include "config.h" 27 #include "PopupMenu Qt.h"27 #include "PopupMenu.h" 28 28 29 29 #include "Chrome.h" … … 36 36 namespace WebCore { 37 37 38 PopupMenu Qt::PopupMenuQt(PopupMenuClient* client)38 PopupMenu::PopupMenu(PopupMenuClient* client) 39 39 : m_popupClient(client) 40 40 , m_popup(0) … … 42 42 } 43 43 44 PopupMenu Qt::~PopupMenuQt()44 PopupMenu::~PopupMenu() 45 45 { 46 46 delete m_popup; 47 47 } 48 48 49 50 void PopupMenuQt::disconnectClient() 51 { 52 m_popupClient = 0; 53 } 54 55 void PopupMenuQt::show(const IntRect& rect, FrameView* view, int index) 49 void PopupMenu::show(const IntRect& rect, FrameView* view, int index) 56 50 { 57 51 ChromeClientQt* chromeClient = static_cast<ChromeClientQt*>( … … 74 68 } 75 69 76 void PopupMenu Qt::hide()70 void PopupMenu::hide() 77 71 { 78 72 m_popup->hide(); 79 73 } 80 74 81 void PopupMenu Qt::updateFromElement()75 void PopupMenu::updateFromElement() 82 76 { 83 m_popupClient->setTextFromItem(m_popupClient->selectedIndex()); 77 client()->setTextFromItem(m_popupClient->selectedIndex()); 78 } 79 80 bool PopupMenu::itemWritingDirectionIsNatural() 81 { 82 return false; 84 83 } 85 84 -
trunk/WebCore/platform/qt/QtAbstractWebPopup.h
r64425 r64462 64 64 65 65 private: 66 friend class PopupMenu Qt;66 friend class PopupMenu; 67 67 PopupMenuClient* m_popupClient; 68 68 QWebPageClient* m_pageClient; -
trunk/WebCore/platform/qt/SearchPopupMenuQt.cpp
r64425 r64462 1 1 /* 2 2 * Copyright C 2006 Zack Rusin <zack@kde.org> 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 20 19 21 20 #include "config.h" 22 #include "SearchPopupMenuQt.h" 21 #include "SearchPopupMenu.h" 22 23 #include "AtomicString.h" 23 24 24 25 namespace WebCore { 25 26 26 SearchPopupMenu Qt::SearchPopupMenuQt(PopupMenuClient* client)27 : m_popup(client)27 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 28 : PopupMenu(client) 28 29 { 29 30 } 30 31 31 PopupMenu* SearchPopupMenuQt::popupMenu() 32 { 33 return &m_popup; 34 } 35 36 void SearchPopupMenuQt::saveRecentSearches(const AtomicString&, const Vector<String>&) 32 void SearchPopupMenu::saveRecentSearches(const AtomicString&, const Vector<String>&) 37 33 { 38 34 } 39 35 40 void SearchPopupMenu Qt::loadRecentSearches(const AtomicString&, Vector<String>&)36 void SearchPopupMenu::loadRecentSearches(const AtomicString&, Vector<String>&) 41 37 { 42 38 } 43 39 44 bool SearchPopupMenu Qt::enabled()40 bool SearchPopupMenu::enabled() 45 41 { 46 42 return true; -
trunk/WebCore/platform/win/PopupMenuWin.cpp
r64427 r64462 2 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2007-2009 Torch Mobile Inc. 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).5 4 * 6 5 * This library is free software; you can redistribute it and/or … … 22 21 23 22 #include "config.h" 24 #include "PopupMenu Win.h"23 #include "PopupMenu.h" 25 24 26 25 #include "BitmapInfo.h" … … 88 87 } 89 88 90 PopupMenu Win::PopupMenuWin(PopupMenuClient* client)89 PopupMenu::PopupMenu(PopupMenuClient* client) 91 90 : m_popupClient(client) 92 91 , m_scrollbar(0) … … 104 103 } 105 104 106 PopupMenu Win::~PopupMenuWin()105 PopupMenu::~PopupMenu() 107 106 { 108 107 if (m_bmp) … … 116 115 } 117 116 118 void PopupMenuWin::disconnectClient() 119 { 120 m_popupClient = 0; 121 } 122 123 LPCTSTR PopupMenuWin::popupClassName() 117 LPCTSTR PopupMenu::popupClassName() 124 118 { 125 119 return kPopupWindowClassName; 126 120 } 127 121 128 void PopupMenu Win::show(const IntRect& r, FrameView* view, int index)122 void PopupMenu::show(const IntRect& r, FrameView* view, int index) 129 123 { 130 124 calculatePositionAndSize(r, view); … … 274 268 } 275 269 276 void PopupMenu Win::hide()270 void PopupMenu::hide() 277 271 { 278 272 if (!m_showPopup) … … 290 284 } 291 285 292 void PopupMenu Win::calculatePositionAndSize(const IntRect& r, FrameView* v)286 void PopupMenu::calculatePositionAndSize(const IntRect& r, FrameView* v) 293 287 { 294 288 // r is in absolute document coordinates, but we want to be in screen coordinates … … 380 374 } 381 375 382 bool PopupMenu Win::setFocusedIndex(int i, bool hotTracking)376 bool PopupMenu::setFocusedIndex(int i, bool hotTracking) 383 377 { 384 378 if (i < 0 || i >= client()->listSize() || i == focusedIndex()) … … 402 396 } 403 397 404 int PopupMenu Win::visibleItems() const398 int PopupMenu::visibleItems() const 405 399 { 406 400 return clientRect().height() / m_itemHeight; 407 401 } 408 402 409 int PopupMenu Win::listIndexAtPoint(const IntPoint& point) const403 int PopupMenu::listIndexAtPoint(const IntPoint& point) const 410 404 { 411 405 return m_scrollOffset + point.y() / m_itemHeight; 412 406 } 413 407 414 int PopupMenu Win::focusedIndex() const408 int PopupMenu::focusedIndex() const 415 409 { 416 410 return m_focusedIndex; 417 411 } 418 412 419 void PopupMenu Win::focusFirst()413 void PopupMenu::focusFirst() 420 414 { 421 415 if (!client()) … … 431 425 } 432 426 433 void PopupMenu Win::focusLast()427 void PopupMenu::focusLast() 434 428 { 435 429 if (!client()) … … 445 439 } 446 440 447 bool PopupMenu Win::down(unsigned lines)441 bool PopupMenu::down(unsigned lines) 448 442 { 449 443 if (!client()) … … 464 458 } 465 459 466 bool PopupMenu Win::up(unsigned lines)460 bool PopupMenu::up(unsigned lines) 467 461 { 468 462 if (!client()) … … 483 477 } 484 478 485 void PopupMenu Win::invalidateItem(int index)479 void PopupMenu::invalidateItem(int index) 486 480 { 487 481 if (!m_popup) … … 498 492 } 499 493 500 IntRect PopupMenu Win::clientRect() const494 IntRect PopupMenu::clientRect() const 501 495 { 502 496 IntRect clientRect = m_windowRect; … … 506 500 } 507 501 508 void PopupMenu Win::incrementWheelDelta(int delta)502 void PopupMenu::incrementWheelDelta(int delta) 509 503 { 510 504 m_wheelDelta += delta; 511 505 } 512 506 513 void PopupMenu Win::reduceWheelDelta(int delta)507 void PopupMenu::reduceWheelDelta(int delta) 514 508 { 515 509 ASSERT(delta >= 0); … … 524 518 } 525 519 526 bool PopupMenu Win::scrollToRevealSelection()520 bool PopupMenu::scrollToRevealSelection() 527 521 { 528 522 if (!m_scrollbar) … … 544 538 } 545 539 546 void PopupMenu Win::updateFromElement()540 void PopupMenu::updateFromElement() 547 541 { 548 542 if (!m_popup) … … 556 550 } 557 551 552 bool PopupMenu::itemWritingDirectionIsNatural() 553 { 554 return true; 555 } 556 558 557 const int separatorPadding = 4; 559 558 const int separatorHeight = 1; 560 void PopupMenu Win::paint(const IntRect& damageRect, HDC hdc)559 void PopupMenu::paint(const IntRect& damageRect, HDC hdc) 561 560 { 562 561 if (!m_popup) … … 665 664 } 666 665 667 void PopupMenu Win::valueChanged(Scrollbar* scrollBar)666 void PopupMenu::valueChanged(Scrollbar* scrollBar) 668 667 { 669 668 ASSERT(m_scrollbar); … … 701 700 } 702 701 703 void PopupMenu Win::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)702 void PopupMenu::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect) 704 703 { 705 704 IntRect scrollRect = rect; … … 709 708 } 710 709 711 void PopupMenu Win::registerClass()710 void PopupMenu::registerClass() 712 711 { 713 712 static bool haveRegisteredWindowClass = false; … … 745 744 746 745 747 LRESULT CALLBACK PopupMenu Win::PopupMenuWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)746 LRESULT CALLBACK PopupMenu::PopupMenuWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 748 747 { 749 748 #if OS(WINCE) … … 753 752 #endif 754 753 755 if (PopupMenu Win* popup = reinterpret_cast<PopupMenuWin*>(longPtr))754 if (PopupMenu* popup = reinterpret_cast<PopupMenu*>(longPtr)) 756 755 return popup->wndProc(hWnd, message, wParam, lParam); 757 756 … … 773 772 const int smoothScrollAnimationDuration = 5000; 774 773 775 LRESULT PopupMenu Win::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)774 LRESULT PopupMenu::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 776 775 { 777 776 LRESULT lResult = 0; -
trunk/WebCore/platform/win/SearchPopupMenuWin.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007 Apple Inc. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 20 19 21 20 #include "config.h" 22 #include "SearchPopupMenu Win.h"21 #include "SearchPopupMenu.h" 23 22 24 23 #include "AtomicString.h" … … 27 26 namespace WebCore { 28 27 29 SearchPopupMenu Win::SearchPopupMenuWin(PopupMenuClient* client)30 : m_popup(client)28 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 29 : PopupMenu(client) 31 30 { 32 31 } 33 32 34 PopupMenu* SearchPopupMenuWin::popupMenu() 35 { 36 return &m_popup; 37 } 38 39 bool SearchPopupMenuWin::enabled() 33 bool SearchPopupMenu::enabled() 40 34 { 41 35 return true; … … 48 42 } 49 43 50 void SearchPopupMenu Win::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)44 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 51 45 { 52 46 if (name.isEmpty()) … … 68 62 } 69 63 70 void SearchPopupMenu Win::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)64 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 71 65 { 72 66 if (name.isEmpty()) -
trunk/WebCore/platform/wx/PopupMenuWx.cpp
r64425 r64462 3 3 * 4 4 * Copyright (C) 2008 Apple Computer, Inc. 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).6 5 * 7 6 * This library is free software; you can redistribute it and/or … … 23 22 24 23 #include "config.h" 25 #include "PopupMenu Wx.h"24 #include "PopupMenu.h" 26 25 27 26 #include "Frame.h" … … 43 42 namespace WebCore { 44 43 45 PopupMenu Wx::PopupMenuWx(PopupMenuClient* client)44 PopupMenu::PopupMenu(PopupMenuClient* client) 46 45 : m_popupClient(client) 47 46 , m_menu(NULL) … … 49 48 } 50 49 51 PopupMenu Wx::~PopupMenuWx()50 PopupMenu::~PopupMenu() 52 51 { 53 52 delete m_menu; 54 53 } 55 54 56 void PopupMenuWx::disconnectClient() 57 { 58 m_popupClient = 0; 59 } 60 61 void PopupMenuWx::show(const IntRect& r, FrameView* v, int index) 55 void PopupMenu::show(const IntRect& r, FrameView* v, int index) 62 56 { 63 57 // just delete and recreate … … 85 79 } 86 80 } 87 nativeWin->Connect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu Wx::OnMenuItemSelected), 0, this);81 nativeWin->Connect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this); 88 82 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(PopupMenu Wx::OnMenuItemSelected), 0, this);83 nativeWin->Disconnect(s_menuStartId, s_menuStartId + (size-1), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(PopupMenu::OnMenuItemSelected), NULL, this); 90 84 } 91 85 } 92 86 93 void PopupMenu Wx::OnMenuItemSelected(wxCommandEvent& event)87 void PopupMenu::OnMenuItemSelected(wxCommandEvent& event) 94 88 { 95 89 if (client()) { … … 100 94 } 101 95 102 void PopupMenu Wx::hide()96 void PopupMenu::hide() 103 97 { 104 98 // we don't need to do anything here, the native control only exists during the time … … 106 100 } 107 101 108 void PopupMenu Wx::updateFromElement()102 void PopupMenu::updateFromElement() 109 103 { 110 104 client()->setTextFromItem(m_popupClient->selectedIndex()); 111 105 } 112 106 107 bool PopupMenu::itemWritingDirectionIsNatural() 108 { 109 return false; 113 110 } 111 112 } -
trunk/WebCore/platform/wx/SearchPopupMenuWx.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2009 Apple Inc. All Rights Reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 26 25 27 26 #include "config.h" 28 #include "SearchPopupMenu Wx.h"27 #include "SearchPopupMenu.h" 29 28 30 29 #include "NotImplemented.h" … … 32 31 namespace WebCore { 33 32 34 SearchPopupMenu Wx::SearchPopupMenuWx(PopupMenuClient* client)35 : m_popup(client)33 SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) 34 : PopupMenu(client) 36 35 { 37 36 notImplemented(); 38 37 } 39 38 40 void SearchPopupMenu Wx::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems)39 void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) 41 40 { 42 41 notImplemented(); 43 42 } 44 43 45 void SearchPopupMenu Wx::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems)44 void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) 46 45 { 47 46 notImplemented(); 48 47 } 49 48 50 bool SearchPopupMenu Wx::enabled()49 bool SearchPopupMenu::enabled() 51 50 { 52 51 return true; 53 52 } 54 53 55 PopupMenu* SearchPopupMenuWx::popupMenu()56 {57 return &m_popup;58 54 } 59 55 60 }61 -
trunk/WebCore/rendering/RenderMenuList.cpp
r64425 r64462 27 27 28 28 #include "AXObjectCache.h" 29 #include "Chrome.h"30 29 #include "CSSStyleSelector.h" 31 30 #include "Frame.h" … … 90 89 m_innerBlock->style()->setPaddingTop(Length(theme()->popupInternalPaddingTop(style()), Fixed)); 91 90 m_innerBlock->style()->setPaddingBottom(Length(theme()->popupInternalPaddingBottom(style()), Fixed)); 92 93 if ( document()->page()->chrome()->selectItemWritingDirectionIsNatural()) {91 92 if (PopupMenu::itemWritingDirectionIsNatural()) { 94 93 // Items in the popup will not respect the CSS text-align and direction properties, 95 94 // so we must adjust our own style to match. … … 280 279 createInnerBlock(); 281 280 if (!m_popup) 282 m_popup = document()->page()->chrome()->createPopupMenu(this);281 m_popup = PopupMenu::create(this); 283 282 SelectElement* select = toSelectElement(static_cast<Element*>(node())); 284 283 m_popupIsVisible = true; -
trunk/WebCore/rendering/RenderMenuList.h
r64425 r64462 25 25 #define RenderMenuList_h 26 26 27 #include "PopupMenu.h"28 27 #include "PopupMenuClient.h" 29 28 #include "RenderFlexibleBox.h" … … 37 36 namespace WebCore { 38 37 38 class PopupMenu; 39 39 class RenderText; 40 40 -
trunk/WebCore/rendering/RenderTextControlSingleLine.cpp
r64425 r64462 3 3 * (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 4 4 * Copyright (C) 2010 Google Inc. All rights reserved. 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).6 5 * 7 6 * This library is free software; you can redistribute it and/or … … 25 24 #include "RenderTextControlSingleLine.h" 26 25 27 #include "Chrome.h"28 26 #include "CSSStyleSelector.h" 29 27 #include "Event.h" … … 41 39 #include "RenderScrollbar.h" 42 40 #include "RenderTheme.h" 41 #include "SearchPopupMenu.h" 43 42 #include "SelectionController.h" 44 43 #include "Settings.h" … … 64 63 { 65 64 if (m_searchPopup) { 66 m_searchPopup-> popupMenu()->disconnectClient();65 m_searchPopup->disconnectClient(); 67 66 m_searchPopup = 0; 68 67 } … … 109 108 const AtomicString& name = autosaveName(); 110 109 if (!m_searchPopup) 111 m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);110 m_searchPopup = SearchPopupMenu::create(this); 112 111 113 112 m_searchPopup->saveRecentSearches(name, m_recentSearches); … … 127 126 128 127 if (!m_searchPopup) 129 m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);128 m_searchPopup = SearchPopupMenu::create(this); 130 129 131 130 if (!m_searchPopup->enabled()) … … 147 146 } 148 147 149 m_searchPopup-> popupMenu()->show(absoluteBoundingBoxRect(true), document()->view(), -1);148 m_searchPopup->show(absoluteBoundingBoxRect(true), document()->view(), -1); 150 149 } 151 150 … … 154 153 ASSERT(node()->isHTMLElement()); 155 154 if (m_searchPopup) 156 m_searchPopup-> popupMenu()->hide();155 m_searchPopup->hide(); 157 156 } 158 157 … … 687 686 688 687 if (m_searchPopupIsVisible) 689 m_searchPopup-> popupMenu()->updateFromElement();688 m_searchPopup->updateFromElement(); 690 689 } 691 690 … … 885 884 if (!name.isEmpty()) { 886 885 if (!m_searchPopup) 887 m_searchPopup = document()->page()->chrome()->createSearchPopupMenu(this);886 m_searchPopup = SearchPopupMenu::create(this); 888 887 m_searchPopup->saveRecentSearches(name, m_recentSearches); 889 888 } -
trunk/WebCore/rendering/RenderTextControlSingleLine.h
r64425 r64462 2 2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/) 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).5 4 * 6 5 * This library is free software; you can redistribute it and/or … … 26 25 #include "PopupMenuClient.h" 27 26 #include "RenderTextControl.h" 28 #include "SearchPopupMenu.h"29 27 #include "Timer.h" 30 28 … … 35 33 class SearchFieldCancelButtonElement; 36 34 class SearchFieldResultsButtonElement; 35 class SearchPopupMenu; 37 36 class SpinButtonElement; 38 37 class TextControlInnerElement; -
trunk/WebKit/chromium/ChangeLog
r64425 r64462 1 2010-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 1 11 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 12 -
trunk/WebKit/chromium/src/ChromeClientImpl.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 57 56 #include "Page.h" 58 57 #include "PopupMenuChromium.h" 59 #include "SearchPopupMenuChromium.h"60 58 #include "ScriptController.h" 61 59 #include "SecurityOrigin.h" … … 776 774 } 777 775 778 bool ChromeClientImpl::selectItemWritingDirectionIsNatural()779 {780 return false;781 }782 783 PassRefPtr<PopupMenu> ChromeClientImpl::createPopupMenu(PopupMenuClient* client) const784 {785 return adoptRef(new PopupMenuChromium(client));786 }787 788 PassRefPtr<SearchPopupMenu> ChromeClientImpl::createSearchPopupMenu(PopupMenuClient* client) const789 {790 return adoptRef(new SearchPopupMenuChromium(client));791 }792 793 776 } // namespace WebKit -
trunk/WebKit/chromium/src/ChromeClientImpl.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 34 33 35 34 #include "ChromeClientChromium.h" 36 #include "PopupMenu.h"37 #include "SearchPopupMenu.h"38 35 39 36 namespace WebCore { … … 42 39 class HTMLParserQuirks; 43 40 class PopupContainer; 44 class PopupMenuClient;45 41 class SecurityOrigin; 46 42 struct WindowFeatures; … … 173 169 void setCursorForPlugin(const WebCursorInfo& cursor); 174 170 175 virtual bool selectItemWritingDirectionIsNatural();176 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;177 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;178 179 171 private: 180 172 void getPopupMenuInfo(WebCore::PopupContainer*, WebPopupMenuInfo*); -
trunk/WebKit/chromium/tests/PopupMenuTest.cpp
r64425 r64462 181 181 m_webView = static_cast<WebViewImpl*>(WebView::create(&m_webviewClient, 0)); 182 182 m_webView->initializeMainFrame(&m_webFrameClient); 183 m_popupMenu = new PopupMenuChromium(&m_popupMenuClient);183 m_popupMenu = PopupMenu::create(&m_popupMenuClient); 184 184 } 185 185 -
trunk/WebKit/efl/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
r64425 r64462 6 6 * Copyright (C) 2009-2010 ProFUSION embedded systems 7 7 * Copyright (C) 2009-2010 Samsung Electronics 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).9 8 * 10 9 * All rights reserved. … … 50 49 #include "PlatformString.h" 51 50 #include "SecurityOrigin.h" 52 #include "PopupMenuEfl.h"53 #include "SearchPopupMenuEfl.h"54 51 #include "ViewportArguments.h" 55 52 #include "WindowFeatures.h" … … 523 520 } 524 521 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 4 4 * Copyright (C) 2009-2010 ProFUSION embedded systems 5 5 * Copyright (C) 2009-2010 Samsung Electronics 6 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).7 6 * 8 7 * This library is free software; you can redistribute it and/or … … 140 139 virtual void didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const; 141 140 142 virtual bool selectItemWritingDirectionIsNatural();143 virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;144 virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;145 146 141 Evas_Object* m_view; 147 142 KURL m_hoveredLinkURL; -
trunk/WebKit/gtk/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
r64425 r64462 5 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 6 6 * Copyright (C) 2008 Gustavo Noronha Silva <gns@gnome.org> 7 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).8 7 * 9 8 * This library is free software; you can redistribute it and/or … … 36 35 #include "KURL.h" 37 36 #include "PlatformString.h" 38 #include "PopupMenuClient.h"39 #include "PopupMenuGtk.h"40 #include "SearchPopupMenuGtk.h"41 37 #include "SecurityOrigin.h" 42 38 #include "webkitgeolocationpolicydecision.h" … … 627 623 } 628 624 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 1 1 /* 2 2 * Copyright (C) 2007 Holger Hans Peter Freyther 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * This library is free software; you can redistribute it and/or … … 24 23 #include "ChromeClient.h" 25 24 #include "KURL.h" 26 #include "PopupMenu.h"27 #include "SearchPopupMenu.h"28 25 29 26 typedef struct _WebKitWebView WebKitWebView; 30 31 namespace WebCore {32 class PopupMenuClient;33 }34 27 35 28 namespace WebKit { … … 131 124 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*); 132 125 133 virtual bool selectItemWritingDirectionIsNatural();134 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;135 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;136 137 126 private: 138 127 WebKitWebView* m_webView; -
trunk/WebKit/haiku/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
r64425 r64462 3 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 4 4 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved. 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).6 5 * 7 6 * … … 38 37 #include "PlatformString.h" 39 38 #include "SecurityOrigin.h" 40 #include "PopupMenuHaiku.h"41 #include "SearchPopupMenuHaiku.h"42 39 43 40 #include <Alert.h> … … 390 387 } 391 388 392 bool ChromeClientHaiku::selectItemWritingDirectionIsNatural()393 {394 return false;395 }396 397 PassRefPtr<PopupMenu> ChromeClientHaiku::createPopupMenu(PopupMenuClient* client) const398 {399 return adoptRef(new PopupMenuHaiku(client));400 }401 402 PassRefPtr<SearchPopupMenu> ChromeClientHaiku::createSearchPopupMenu(PopupMenuClient* client) const403 {404 return adoptRef(new SearchPopupMenuHaiku(client));405 }406 407 389 } // namespace WebCore 408 390 -
trunk/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
r64425 r64462 2 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org> 3 3 * Copyright (C) 2007 Ryan Leavengood <leavengood@gmail.com> All rights reserved. 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).5 4 * 6 5 * … … 130 129 void exceededDatabaseQuota(Frame*, const String& databaseName); 131 130 132 virtual bool selectItemWritingDirectionIsNatural();133 virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;134 virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;135 136 131 #if ENABLE(OFFLINE_WEB_APPLICATIONS) 137 132 virtual void reachedMaxAppCacheSize(int64_t spaceNeeded); -
trunk/WebKit/mac/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/mac/WebCoreSupport/WebChromeClient.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2008 , 2010Nokia Corporation and/or its subsidiary(-ies)3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 4 * 5 5 * Redistribution and use in source and binary forms, with or without … … 169 169 virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*) { } 170 170 171 virtual bool selectItemWritingDirectionIsNatural();172 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;173 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;174 175 171 private: 176 172 WebView *m_webView; -
trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2008 , 2010Nokia Corporation and/or its subsidiary(-ies)3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 4 * 5 5 * Redistribution and use in source and binary forms, with or without … … 65 65 #import <WebCore/PlatformScreen.h> 66 66 #import <WebCore/PlatformString.h> 67 #import <WebCore/PopupMenuMac.h>68 67 #import <WebCore/ResourceRequest.h> 69 #import <WebCore/SearchPopupMenuMac.h>70 68 #import <WebCore/Widget.h> 71 69 #import <WebCore/WindowFeatures.h> 72 70 #import <wtf/PassRefPtr.h> 73 71 #import <wtf/Vector.h> 74 75 76 72 77 73 #if USE(ACCELERATED_COMPOSITING) … … 742 738 } 743 739 744 bool WebChromeClient::selectItemWritingDirectionIsNatural()745 {746 return true;747 }748 749 PassRefPtr<WebCore::PopupMenu> WebChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const750 {751 return adoptRef(new PopupMenuMac(client));752 }753 754 PassRefPtr<WebCore::SearchPopupMenu> WebChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const755 {756 return adoptRef(new SearchPopupMenuMac(client));757 }758 759 740 #if USE(ACCELERATED_COMPOSITING) 760 741 -
trunk/WebKit/qt/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r64425 r64462 2 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org> 3 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).5 4 * 6 5 * All rights reserved. … … 47 46 #include "NotificationPresenterClientQt.h" 48 47 #include "PageClientQt.h" 49 #include "PopupMenuQt.h"50 48 #if defined(Q_WS_MAEMO_5) 51 49 #include "QtMaemoWebPopup.h" … … 55 53 #include "QWebPageClient.h" 56 54 #include "ScrollbarTheme.h" 57 #include "SearchPopupMenuQt.h"58 55 #include "SecurityOrigin.h" 59 56 #include "ViewportArguments.h" … … 626 623 } 627 624 628 bool ChromeClientQt::selectItemWritingDirectionIsNatural()629 {630 return false;631 }632 633 PassRefPtr<PopupMenu> ChromeClientQt::createPopupMenu(PopupMenuClient* client) const634 {635 return adoptRef(new PopupMenuQt(client));636 }637 638 PassRefPtr<SearchPopupMenu> ChromeClientQt::createSearchPopupMenu(PopupMenuClient* client) const639 {640 return adoptRef(new SearchPopupMenuQt(client));641 }642 643 625 } // namespace WebCore -
trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org> 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * All rights reserved. … … 171 170 virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { } 172 171 173 virtual bool selectItemWritingDirectionIsNatural();174 virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;175 virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;176 177 172 QtAbstractWebPopup* createSelectPopup(); 178 173 -
trunk/WebKit/win/ChangeLog
r64429 r64462 1 2010-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 1 11 2010-07-31 Luiz Agostini <luiz.agostini@openbossa.org> 2 12 -
trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 58 57 #include <WebCore/Page.h> 59 58 #include <WebCore/SecurityOrigin.h> 60 #include <WebCore/PopupMenuWin.h>61 #include <WebCore/SearchPopupMenuWin.h>62 59 #include <WebCore/WindowFeatures.h> 63 60 #pragma warning(pop) … … 878 875 #endif 879 876 880 bool WebChromeClient::selectItemWritingDirectionIsNatural()881 {882 return true;883 }884 885 PassRefPtr<PopupMenu> WebChromeClient::createPopupMenu(PopupMenuClient* client) const886 {887 return adoptRef(new PopupMenuWin(client));888 }889 890 PassRefPtr<SearchPopupMenu> WebChromeClient::createSearchPopupMenu(PopupMenuClient* client) const891 {892 return adoptRef(new SearchPopupMenuWin(client));893 }894 -
trunk/WebKit/win/WebCoreSupport/WebChromeClient.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 168 167 #endif 169 168 170 virtual bool selectItemWritingDirectionIsNatural();171 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;172 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;173 174 169 private: 175 170 COMPtr<IWebUIDelegate> uiDelegate(); -
trunk/WebKit/win/WebView.cpp
r64429 r64462 111 111 #include <WebCore/PluginView.h> 112 112 #include <WebCore/PopupMenu.h> 113 #include <WebCore/PopupMenuWin.h>114 113 #include <WebCore/ProgressTracker.h> 115 114 #include <WebCore/RenderLayer.h> … … 1615 1614 1616 1615 // Make sure truncation won't affect the comparison. 1617 ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenu Win::popupClassName()));1618 1619 if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenu Win::popupClassName())) {1616 ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenu::popupClassName())); 1617 1618 if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenu::popupClassName())) { 1620 1619 // We don't let the WebView scroll here for two reasons - 1) To match Firefox behavior, 2) If we do scroll, we lose the 1621 1620 // focus ring around the select menu. -
trunk/WebKit/wx/ChangeLog
r64425 r64462 1 2010-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 1 9 2010-07-27 Luiz Agostini <luiz.agostini@openbossa.org> 2 10 -
trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * All rights reserved. … … 41 40 #include "PlatformString.h" 42 41 #include "SecurityOrigin.h" 43 #include "PopupMenuWx.h"44 #include "SearchPopupMenuWx.h"45 42 #include "WindowFeatures.h" 46 43 … … 468 465 } 469 466 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 1 1 /* 2 2 * Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com> 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * All rights reserved. … … 144 143 virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) { } 145 144 146 virtual bool selectItemWritingDirectionIsNatural();147 virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const;148 virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;149 150 145 private: 151 146 wxWebView* m_webView; -
trunk/WebKit2/ChangeLog
r64460 r64462 1 2010-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 1 15 2010-08-02 Balazs Kelemen <kb@inf.u-szeged.hu> 2 16 -
trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj
r64425 r64462 267 267 BCF69FA91176D1CB00471A52 /* WKNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA71176D1CB00471A52 /* WKNavigationData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 268 268 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 */; };273 269 E1EE53E311F8CFC000CCBEE4 /* InjectedBundlePageEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */; }; 274 270 E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */; }; … … 571 567 BCF69FA71176D1CB00471A52 /* WKNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationData.h; sourceTree = "<group>"; }; 572 568 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>"; };577 569 E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; }; 578 570 E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; }; … … 869 861 1A3E736011CC2659007BD539 /* WebPlatformStrategies.cpp */, 870 862 1A3E735F11CC2659007BD539 /* WebPlatformStrategies.h */, 871 D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */,872 D3B9484311FF4B6500032B39 /* WebPopupMenu.h */,873 D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */,874 D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */,875 863 ); 876 864 path = WebCoreSupport; … … 1338 1326 BCB28CC0120233D9007D99BC /* InjectedBundleMessageKinds.h in Headers */, 1339 1327 BCCB75C61203A1CE00222D1B /* WebContextMessageKinds.h in Headers */, 1340 D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */,1341 D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,1342 1328 ); 1343 1329 runOnlyForDeploymentPostprocessing = 0; … … 1541 1527 1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */, 1542 1528 BCDB85831200EC57007254BE /* WKType.cpp in Sources */, 1543 D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */,1544 D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */,1545 1529 ); 1546 1530 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 36 35 #include "WebPage.h" 37 36 #include "WebPageProxyMessageKinds.h" 38 #include "WebPopupMenu.h"39 37 #include "WebPreferencesStore.h" 40 38 #include "WebProcess.h" 41 39 #include "WebProcessProxyMessageKinds.h" 42 #include "WebSearchPopupMenu.h"43 40 #include <WebCore/FileChooser.h> 44 41 #include <WebCore/Frame.h> … … 479 476 } 480 477 481 bool WebChromeClient::selectItemWritingDirectionIsNatural()482 {483 return true;484 }485 486 PassRefPtr<WebCore::PopupMenu> WebChromeClient::createPopupMenu(WebCore::PopupMenuClient* client) const487 {488 return adoptRef(new WebPopupMenu(client));489 }490 491 PassRefPtr<WebCore::SearchPopupMenu> WebChromeClient::createSearchPopupMenu(WebCore::PopupMenuClient* client) const492 {493 return adoptRef(new WebSearchPopupMenu(client));494 }495 496 478 PassOwnPtr<HTMLParserQuirks> WebChromeClient::createHTMLParserQuirks() 497 479 { -
trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r64425 r64462 1 1 /* 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).4 3 * 5 4 * Redistribution and use in source and binary forms, with or without … … 165 164 virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks(); 166 165 167 virtual bool selectItemWritingDirectionIsNatural();168 virtual PassRefPtr<WebCore::PopupMenu> createPopupMenu(WebCore::PopupMenuClient*) const;169 virtual PassRefPtr<WebCore::SearchPopupMenu> createSearchPopupMenu(WebCore::PopupMenuClient*) const;170 171 166 #if USE(ACCELERATED_COMPOSITING) 172 167 virtual void attachRootGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*); -
trunk/WebKit2/win/WebKit2.vcproj
r64425 r64462 584 584 > 585 585 </File> 586 <File587 RelativePath="..\WebProcess\WebCoreSupport\WebPopupMenu.cpp"588 >589 </File>590 <File591 RelativePath="..\WebProcess\WebCoreSupport\WebPopupMenu.h"592 >593 </File>594 <File595 RelativePath="..\WebProcess\WebCoreSupport\WebSearchPopupMenu.cpp"596 >597 </File>598 <File599 RelativePath="..\WebProcess\WebCoreSupport\WebSearchPopupMenu.h"600 >601 </File>602 586 <Filter 603 587 Name="win"
Note: See TracChangeset
for help on using the changeset viewer.