Changeset 57724 in webkit
- Timestamp:
- Apr 16, 2010 10:18:12 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57721 r57724 1 2010-04-16 Jay Civelli <jcivelli@chromium.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 [chromium] Select popups would assert when destroyed. 6 https://bugs.webkit.org/show_bug.cgi?id=37436 7 8 9 * platform/chromium/PopupMenuChromium.cpp: 10 (WebCore::PopupContainer::PopupContainer): 11 (WebCore::PopupContainer::showPopup): 12 (WebCore::PopupContainer::notifyPopupHidden): 13 * platform/chromium/PopupMenuChromium.h: 14 1 15 2010-04-16 Antonio Gomes <tonikitoo@webkit.org> 2 16 -
trunk/WebCore/platform/chromium/PopupMenuChromium.cpp
r57606 r57724 314 314 : m_listBox(PopupListBox::create(client, settings)) 315 315 , m_settings(settings) 316 , m_popupType(popupType) 316 , m_popupType(popupType) 317 , m_popupOpen(false) 317 318 { 318 319 setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff); … … 368 369 } 369 370 chromeClient->popupOpened(this, widgetRect, false); 371 m_popupOpen = true; 370 372 } 371 373 … … 417 419 void PopupContainer::notifyPopupHidden() 418 420 { 419 chromeClientChromium()->popupClosed(this); 421 if (!m_popupOpen) 422 return; 423 m_popupOpen = false; 424 chromeClientChromium()->popupClosed(this); 420 425 } 421 426 -
trunk/WebCore/platform/chromium/PopupMenuChromium.h
r57606 r57724 149 149 void show(const IntRect&, FrameView*, int index); 150 150 151 // Hide the popup.151 // Hides the popup. 152 152 void hidePopup(); 153 153 … … 178 178 PopupType popupType() const { return m_popupType; } 179 179 180 // Whether the popup is currently open. 181 bool m_popupOpen; 182 180 183 private: 181 184 friend class WTF::RefCounted<PopupContainer>; -
trunk/WebKit/chromium/ChangeLog
r57720 r57724 1 2010-04-16 Jay Civelli <jcivelli@chromium.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 [chromium] Select popups would assert when destroyed. 6 Also adding unit-tests for the select popup code. 7 https://bugs.webkit.org/show_bug.cgi?id=37436 8 9 * WebKit.gyp: 10 * src/WebViewImpl.h: 11 (WebKit::WebViewImpl::selectPopup): 12 * tests/PopupMenuTest.cpp: Added. 13 1 14 2010-04-16 Tony Chang <tony@chromium.org> 2 15 -
trunk/WebKit/chromium/WebKit.gyp
r57606 r57724 508 508 ['OS=="win"', { 509 509 'sources': [ 510 # FIXME: Port PopupMenuTest to Linux and Mac. 511 'tests/PopupMenuTest.cpp', 510 512 'tests/TransparencyWinTest.cpp', 511 513 'tests/UniscribeHelperTest.cpp', -
trunk/WebKit/chromium/src/WebViewImpl.h
r57699 r57724 313 313 #endif 314 314 315 WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); } 316 315 317 private: 316 318 friend class WebView; // So WebView::Create can call our constructor
Note: See TracChangeset
for help on using the changeset viewer.