Changeset 57606 in webkit


Ignore:
Timestamp:
Apr 14, 2010 2:10:14 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-14 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r57599.
​http://trac.webkit.org/changeset/57599
​https://bugs.webkit.org/show_bug.cgi?id=37605

"Broke Chromium build" (Requested by dglazkov on #webkit).

  • platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::PopupContainer): (WebCore::PopupContainer::showPopup): (WebCore::PopupContainer::notifyPopupHidden):
  • platform/chromium/PopupMenuChromium.h:

2010-04-14 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r57599.
​http://trac.webkit.org/changeset/57599
​https://bugs.webkit.org/show_bug.cgi?id=37605

"Broke Chromium build" (Requested by dglazkov on #webkit).

  • WebKit.gyp:
  • src/WebViewImpl.h:
  • tests/PopupMenuTest.cpp: Removed.
Location:
trunk
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r57604 r57606  
     12010-04-14  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r57599.
     4        http://trac.webkit.org/changeset/57599
     5        https://bugs.webkit.org/show_bug.cgi?id=37605
     6
     7        "Broke Chromium build" (Requested by dglazkov on #webkit).
     8
     9        * platform/chromium/PopupMenuChromium.cpp:
     10        (WebCore::PopupContainer::PopupContainer):
     11        (WebCore::PopupContainer::showPopup):
     12        (WebCore::PopupContainer::notifyPopupHidden):
     13        * platform/chromium/PopupMenuChromium.h:
     14
    1152010-04-14  Aaron Boodman  <aa@chromium.org>
    216

  • trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

    r57599 r57606  
    314314    : m_listBox(PopupListBox::create(client, settings))
    315315    , m_settings(settings)
    316     , m_popupType(popupType)
    317     , m_popupOpen(false)
     316    , m_popupType(popupType) 
    318317{
    319318    setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
    … …  
    369368        }
    370369        chromeClient->popupOpened(this, widgetRect, false);
    371         m_popupOpen = true;
    372370    }
    373371
    … …  
    419417void PopupContainer::notifyPopupHidden()
    420418{
    421     if (!m_popupOpen)
    422         return;
    423     m_popupOpen = false;
    424     chromeClientChromium()->popupClosed(this);
     419     chromeClientChromium()->popupClosed(this);
    425420}
    426421

  • trunk/WebCore/platform/chromium/PopupMenuChromium.h

    r57599 r57606  
    149149    void show(const IntRect&, FrameView*, int index);
    150150
    151     // Hides the popup.
     151    // Hide the popup.
    152152    void hidePopup();
    153153
    … …  
    178178    PopupType popupType() const { return m_popupType; }
    179179
    180     // Whether the popup is currently open.
    181     bool m_popupOpen;
    182 
    183180private:
    184181    friend class WTF::RefCounted<PopupContainer>;

  • trunk/WebKit/chromium/ChangeLog

    r57604 r57606  
     12010-04-14  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r57599.
     4        http://trac.webkit.org/changeset/57599
     5        https://bugs.webkit.org/show_bug.cgi?id=37605
     6
     7        "Broke Chromium build" (Requested by dglazkov on #webkit).
     8
     9        * WebKit.gyp:
     10        * src/WebViewImpl.h:
     11        * tests/PopupMenuTest.cpp: Removed.
     12
    1132010-04-14  Aaron Boodman  <aa@chromium.org>
    214

  • trunk/WebKit/chromium/WebKit.gyp

    r57599 r57606  
    503503                'tests/KeyboardTest.cpp',
    504504                'tests/KURLTest.cpp',
    505                 'tests/PopupMenuTest.cpp',
    506505                'tests/RunAllTests.cpp',
    507506            ],

  • trunk/WebKit/chromium/src/WebViewImpl.h

    r57599 r57606  
    312312#endif
    313313
    314     WebCore::PopupContainer* selectPopup() const { return m_selectPopup.get(); }
    315 
    316314private:
    317315    friend class WebView;  // So WebView::Create can call our constructor
Note: See TracChangeset for help on using the changeset viewer.