Changeset 57599 in webkit
- Timestamp:
- Apr 14, 2010 1:21:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57595 r57599 1 2010-04-14 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 * platform/chromium/PopupMenuChromium.cpp: 9 (WebCore::PopupContainer::PopupContainer): 10 (WebCore::PopupContainer::showPopup): 11 (WebCore::PopupContainer::notifyPopupHidden): 12 * platform/chromium/PopupMenuChromium.h: 13 14 1 15 2010-04-14 Dumitru Daniliuc <dumi@chromium.org> 2 16 -
trunk/WebCore/platform/chromium/PopupMenuChromium.cpp
r57519 r57599 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
r57321 r57599 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
r57574 r57599 1 2010-04-14 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-14 Zhenyao Mo <zmo@google.com> 2 15 -
trunk/WebKit/chromium/WebKit.gyp
r57014 r57599 503 503 'tests/KeyboardTest.cpp', 504 504 'tests/KURLTest.cpp', 505 'tests/PopupMenuTest.cpp', 505 506 'tests/RunAllTests.cpp', 506 507 ], -
trunk/WebKit/chromium/src/WebViewImpl.h
r57436 r57599 312 312 #endif 313 313 314 WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); } 315 314 316 private: 315 317 friend class WebView; // So WebView::Create can call our constructor
Note: See TracChangeset
for help on using the changeset viewer.