Revert 176261 "Fix for select PopupMenuList appearance in rtl mo..."

trunk/Source/web/tests/PopupMenuTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "core/dom/Element.h"
 #include "core/frame/FrameView.h"
-#include "core/frame/Settings.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/page/EventHandler.h"
 #include "platform/KeyboardCodes.h"
 #include "platform/PlatformMouseEvent.h"
 #include "platform/PopupMenu.h"
 #include "platform/PopupMenuClient.h"
 #include "platform/graphics/Color.h"
-#include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScreenInfo.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "public/web/WebViewClient.h"
 #include "v8.h"
 #include "web/PopupContainer.h"
-#include "web/PopupListBox.h"
 #include "web/PopupMenuChromium.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPopupMenuImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "web/tests/URLTestHelpers.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 using namespace blink;
 using blink::URLTestHelpers::toKURL;
 
 namespace {
 
 class TestPopupMenuClient : public PopupMenuClient {
 public:
     // Item at index 0 is selected by default.
-    TestPopupMenuClient() : m_selectIndex(0), m_node(0), m_listSize(10) { }
+    TestPopupMenuClient() : m_selectIndex(0), m_node(0) { }
     virtual ~TestPopupMenuClient() {}
     virtual void valueChanged(unsigned listIndex, bool fireEvents = true)
     {
         m_selectIndex = listIndex;
         if (m_node) {
             HTMLSelectElement* select = toHTMLSelectElement(m_node);
             select->optionSelectedByUser(select->listToOptionIndex(listIndex), fireEvents);
         }
     }
     virtual void selectionChanged(unsigned, bool) {}
@@ skipping 16 matching lines @@
         fontDescription.setComputedSize(12.0);
         Font font(fontDescription);
         font.update(nullptr);
         return PopupMenuStyle(Color::black, Color::white, font, true, false, Length(), TextDirection(), false /* has text direction override */);
     }
     virtual PopupMenuStyle menuStyle() const { return itemStyle(0); }
     virtual int clientInsetLeft() const { return 0; }
     virtual int clientInsetRight() const { return 0; }
     virtual LayoutUnit clientPaddingLeft() const { return 0; }
     virtual LayoutUnit clientPaddingRight() const { return 0; }
-    virtual int listSize() const { return m_listSize; }
+    virtual int listSize() const { return 10; }
     virtual int selectedIndex() const { return m_selectIndex; }
     virtual void popupDidHide() { }
     virtual bool itemIsSeparator(unsigned listIndex) const { return false; }
     virtual bool itemIsLabel(unsigned listIndex) const { return false; }
     virtual bool itemIsSelected(unsigned listIndex) const { return listIndex == m_selectIndex; }
     virtual bool valueShouldChangeOnHotTrack() const { return false; }
     virtual void setTextFromItem(unsigned listIndex) { }
 
     virtual FontSelector* fontSelector() const { return 0; }
     virtual HostWindow* hostWindow() const { return 0; }
 
     virtual PassRefPtr<Scrollbar> createScrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize) { return nullptr; }
 
     void setDisabledIndex(unsigned index) { m_disabledIndexSet.insert(index); }
     void setFocusedNode(Node* node) { m_node = node; }
-    void setListSize(int listSize) { m_listSize = listSize; }
 
 private:
     unsigned m_selectIndex;
     std::set<unsigned> m_disabledIndexSet;
     Node* m_node;
-    int m_listSize;
 };
 
 class TestWebWidgetClient : public WebWidgetClient {
 public:
     ~TestWebWidgetClient() { }
 };
 
 class TestWebPopupMenuImpl : public WebPopupMenuImpl {
 public:
     static PassRefPtr<TestWebPopupMenuImpl> create(WebWidgetClient* client)
@@ skipping 346 matching lines @@
     int menuItemHeight = webView()->selectPopup()->menuItemHeight();
     // menuItemHeight * 1.5 means the Y position on the item at index 1.
     IntPoint row1Point(2, menuItemHeight * 1.5);
     simulateLeftMouseDownEvent(row1Point);
     simulateLeftMouseUpEvent(row1Point);
 
     WebElement element = webView()->mainFrame()->document().getElementById("message");
     EXPECT_STREQ("click", element.innerText().utf8().data());
 }
 
-TEST_F(SelectPopupMenuTest, PopupListBoxWithOverlayScrollbarEnabled)
-{
-    Settings::setMockScrollbarsEnabled(true);
-    RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
-    EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());
-    registerMockedURLLoad("select_rtl.html");
-    loadFrame(mainFrame(), "select_rtl.html");
-
-    m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement());
-    m_popupMenuClient.setListSize(30);
-
-    showPopup();
-    PopupContainer* container = webView()->selectPopup();
-    PopupListBox* listBox = container->listBox();
-
-    EXPECT_EQ(container->width(), listBox->contentsSize().width() + 2);
-    Settings::setMockScrollbarsEnabled(false);
-    RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
-    EXPECT_FALSE(ScrollbarTheme::theme()->usesOverlayScrollbars());
-}
-
-TEST_F(SelectPopupMenuTest, PopupListBoxWithOverlayScrollbarDisabled)
-{
-    EXPECT_FALSE(ScrollbarTheme::theme()->usesOverlayScrollbars());
-    registerMockedURLLoad("select_rtl.html");
-    loadFrame(mainFrame(), "select_rtl.html");
-
-    m_popupMenuClient.setFocusedNode(mainFrame()->frame()->document()->focusedElement());
-    m_popupMenuClient.setListSize(30);
-
-    showPopup();
-    PopupContainer* container = webView()->selectPopup();
-    PopupListBox* listBox = container->listBox();
-
-    EXPECT_EQ(container->width(), listBox->contentsSize().width() + ScrollbarTheme::theme()->scrollbarThickness() + 2);
-}
-
 } // namespace