Changeset 138933 in webkit

Timestamp:

Jan 7, 2013 2:09:16 AM (11 years ago)

Author:

michael.bruning@digia.com

Message:

[Qt] Horizontal scrollbars events are offseted making them difficult to use
​https://bugs.webkit.org/show_bug.cgi?id=105014

Reviewed by Allan Sandfeld Jensen.

Patch co-authored by Simon Hausmann.

Only copy the layout direction from the facade options if the
current option is Qt::LayoutDirectionAuto in order to prevent
misinterpretations as different layout direction when hit testing.

Tests added to tst_qwebview and tst_qgraphicswebview to verify
that the view actually is scrolled in the right direction.

• WidgetSupport/QStyleFacadeImp.cpp:

(WebKit::initGenericStyleOption):

• tests/qgraphicswebview/resources/scrolltest_page.html: Added.
• tests/qgraphicswebview/tst_qgraphicswebview.cpp:

(tst_QGraphicsWebView):
(tst_QGraphicsWebView::horizontalScrollbarTest):

• tests/qgraphicswebview/tst_qgraphicswebview.qrc:
• tests/qwebview/resources/scrolltest_page.html: Added.
• tests/qwebview/tst_qwebview.cpp:

(tst_QWebView):
(tst_QWebView::horizontalScrollbarTest):

• tests/qwebview/tst_qwebview.qrc:

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WidgetSupport/QStyleFacadeImp.cpp (modified) (1 diff)
• tests/qgraphicswebview/resources/scrolltest_page.html (added)
• tests/qgraphicswebview/tst_qgraphicswebview.cpp (modified) (2 diffs)
• tests/qgraphicswebview/tst_qgraphicswebview.qrc (modified) (1 diff)
• tests/qwebview/resources/scrolltest_page.html (added)
• tests/qwebview/tst_qwebview.cpp (modified) (2 diffs)
• tests/qwebview/tst_qwebview.qrc (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-01-07  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt] Horizontal scrollbars events are offseted making them difficult to use
+        https://bugs.webkit.org/show_bug.cgi?id=105014
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        Patch co-authored by Simon Hausmann.
+
+        Only copy the layout direction from the facade options if the
+        current option is Qt::LayoutDirectionAuto in order to prevent
+        misinterpretations as different layout direction when hit testing.
+
+        Tests added to tst_qwebview and tst_qgraphicswebview to verify
+        that the view actually is scrolled in the right direction.
+
+        * WidgetSupport/QStyleFacadeImp.cpp:
+        (WebKit::initGenericStyleOption):
+        * tests/qgraphicswebview/resources/scrolltest_page.html: Added.
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView):
+        (tst_QGraphicsWebView::horizontalScrollbarTest):
+        * tests/qgraphicswebview/tst_qgraphicswebview.qrc:
+        * tests/qwebview/resources/scrolltest_page.html: Added.
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView):
+        (tst_QWebView::horizontalScrollbarTest):
+        * tests/qwebview/tst_qwebview.qrc:
+
 2012-12-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp

@@ -78 +78 @@
     option->rect = facadeOption.rect;
     option->state = convertToQStyleState(facadeOption.state);
-    option->direction = facadeOption.direction;
+    if (option->direction == Qt::LayoutDirectionAuto)
+        option->direction = facadeOption.direction;
     option->palette = facadeOption.palette;
 }

trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

@@ -43 +43 @@
     void widgetsRenderingThroughCache();
     void windowResizeEvent();
+    void horizontalScrollbarTest();
 
 #if !(defined(WTF_USE_QT_MOBILE_THEME) && WTF_USE_QT_MOBILE_THEME)
@@ -681 +682 @@
 }
 
+void tst_QGraphicsWebView::horizontalScrollbarTest()
+{
+    QWebPage* page = new QWebPage;
+    GraphicsWebView* webView = new GraphicsWebView;
+    webView->setPage(page);
+    webView->setGeometry(QRect(0, 0, 600, 600));
+    QGraphicsView* view = new QGraphicsView;
+    QGraphicsScene* scene = new QGraphicsScene(view);
+    view->setScene(scene);
+    scene->addItem(webView);
+
+    // Turn off scrolling on the containing QGraphicsView, let the
+    // QGraphicsWebView handle the scrolling by itself.
+    view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    view->show();
+    QCoreApplication::processEvents();
+
+    QUrl url("qrc:///resources/scrolltest_page.html");
+    page->mainFrame()->load(url);
+    page->mainFrame()->setFocus();
+
+    QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+
+    QVERIFY(webView->page()->mainFrame()->scrollPosition() == QPoint(0, 0));
+
+    // Note: The test below assumes that the layout direction is Qt::LeftToRight.
+    webView->fireMouseClick(QPointF(550.0, 590.0));
+    QVERIFY(page->mainFrame()->scrollPosition().x() > 0);
+
+    // Note: The test below assumes that the layout direction is Qt::LeftToRight.
+    webView->fireMouseClick(QPointF(20.0, 590.0));
+    QVERIFY(page->mainFrame()->scrollPosition() == QPoint(0, 0));
+
+    delete webView;
+    delete view;
+}
+
 QTEST_MAIN(tst_QGraphicsWebView)
 

trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc

@@ -5 +5 @@
         <file>resources/pointing_up.html</file>
         <file>resources/greendiv.html</file>
+        <file>resources/scrolltest_page.html</file>
     </qresource>
 </RCC>

trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp

@@ -53 +53 @@
     void microFocusCoordinates();
     void focusInputTypes();
+    void horizontalScrollbarTest();
 
     void crashTests();
@@ -303 +304 @@
     QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 }
+
+void tst_QWebView::horizontalScrollbarTest()
+{
+    QWebView webView;
+    webView.resize(600, 600);
+    webView.show();
+    QTest::qWaitForWindowExposed(&webView);
+
+    QUrl url("qrc:///resources/scrolltest_page.html");
+    QWebFrame* const mainFrame = webView.page()->mainFrame();
+    mainFrame->load(url);
+    mainFrame->setFocus();
+
+    QVERIFY(waitForSignal(&webView, SIGNAL(loadFinished(bool))));
+
+    QVERIFY(webView.page()->mainFrame()->scrollPosition() == QPoint(0, 0));
+
+    // Note: The test below assumes that the layout direction is Qt::LeftToRight.
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, QPoint(550, 595));
+    QVERIFY(webView.page()->mainFrame()->scrollPosition().x() > 0);
+
+    // Note: The test below assumes that the layout direction is Qt::LeftToRight.
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, QPoint(20, 595));
+    QVERIFY(webView.page()->mainFrame()->scrollPosition() == QPoint(0, 0));
+}
+
 
 #if !(defined(WTF_USE_QT_MOBILE_THEME) && WTF_USE_QT_MOBILE_THEME)

trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.qrc

@@ -4 +4 @@
     <file>resources/frame_a.html</file>
     <file>resources/input_types.html</file>
+    <file>resources/scrolltest_page.html</file>
 </qresource>
 </RCC>