⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 107290 in webkit


Ignore:
Timestamp:
Feb 9, 2012, 2:17:41 PM (15 years ago)
Author:
eae@chromium.org
Message:

Changed QWebElement::geometry to pixel snap values as opposed to returning a QRectF

Location:
branches/subpixellayout/Source/WebKit/qt
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp

    r107272 r107290  
    548548    \sa tagName()
    549549*/
    550 QRectF QWebElement::geometry() const
     550QRect QWebElement::geometry() const
    551551{
    552552    if (!m_element)
    553553        return QRect();
    554     return FloatRect(m_element->getRect());
     554    return pixelSnappedIntRect(m_element->getRect());
    555555}
    556556
    … …  
    14991499    view->updateLayoutAndStyleIfNeededRecursive();
    15001500
    1501     IntRect rect = enclosingIntRect(e->getRect());
     1501    IntRect rect = pixelSnappedIntRect(e->getRect());
    15021502
    15031503    if (rect.size().isEmpty())

  • branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.h

    r103754 r107290  
    8585    void setFocus();
    8686
    87     QRectF geometry() const;
     87    QRect geometry() const;
    8888
    8989    QString tagName() const;

  • branches/subpixellayout/Source/WebKit/qt/Api/qwebframe.cpp

    r106970 r107290  
    134134        return false;
    135135
    136     QPoint contentsPos = frame->view()->windowToContents(IntPoint(pos));
     136    QPoint contentsPos = frame->view()->windowToContents(pos);
    137137    Node* node = frame->document()->elementFromPoint(contentsPos.x(), contentsPos.y());
    138138    if (!node)

  • branches/subpixellayout/Source/WebKit/qt/Api/qwebpage.cpp

    r105306 r107290  
    14211421                return QVariant();
    14221422            }
    1423             return QVariant(view->contentsToWindow(enclosingIntRect(frame->selection()->absoluteCaretBounds())));
     1423            return QVariant(view->contentsToWindow(pixelSnappedIntRect(frame->selection()->absoluteCaretBounds())));
    14241424        }
    14251425        case Qt::ImFont: {
    … …  
    24492449{
    24502450    if (d->mainFrame && d->mainFrame.data()->d->frame->view())
    2451         return expandedIntSize(d->mainFrame.data()->d->frame->view()->frameRect().size());
     2451        return pixelSnappedIntRect(d->mainFrame.data()->d->frame->view()->frameRect()).size();
    24522452
    24532453    return d->viewportSize;
    … …  
    24732473    if (frame->d->frame && frame->d->frame->view()) {
    24742474        WebCore::FrameView* view = frame->d->frame->view();
    2475         view->resize(QSize(size));
     2475        view->resize(size);
    24762476        view->adjustViewSize();
    24772477    }
    … …  
    25812581    if (frame) {
    25822582        WebCore::FrameView* view = frame->d->frame->view();
    2583         if (view && view->useFixedLayout()) {
    2584             const FloatSize& size = d->mainFrame.data()->d->frame->view()->fixedLayoutSize();
    2585             return QSize(size.width(), size.height());
    2586         }
     2583        if (view && view->useFixedLayout())
     2584            return d->mainFrame.data()->d->frame->view()->fixedLayoutSize();
    25872585    }
    25882586
    … …  
    26232621    if (size.isValid()) {
    26242622        view->setUseFixedLayout(true);
    2625         view->setFixedLayoutSize(d->fixedLayoutSize);
     2623        view->setFixedLayoutSize(size);
    26262624    } else if (view->useFixedLayout())
    26272625        view->setUseFixedLayout(false);

  • branches/subpixellayout/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

    r98165 r107290  
    10201020        maxHeight = INT_MAX;
    10211021    while (!element.parent().isNull() && element.geometry().width() <= maxWidth && element.geometry().height() <= maxHeight) {
    1022         hitRect = element.geometry().toRect();
     1022        hitRect = element.geometry();
    10231023        element = element.parent();
    10241024    }

  • branches/subpixellayout/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

    r105306 r107290  
    27032703    // open the popup by clicking. check if focus is on the popup
    27042704    const QWebElement webCombo = view.page()->mainFrame()->documentElement().findFirst(QLatin1String("select[name=select]"));
    2705     QTest::mouseClick(&view, Qt::LeftButton, 0, webCombo.geometry().center().toPoint());
     2705    QTest::mouseClick(&view, Qt::LeftButton, 0, webCombo.geometry().center());
    27062706
    27072707    QComboBox* combo = view.findChild<QComboBox*>();
    … …  
    27332733    qApp->setAutoSipEnabled(false);
    27342734    const QWebElement inputElement = view.page()->mainFrame()->documentElement().findFirst(QLatin1String("input[type=text]"));
    2735     QTest::mouseClick(&view, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     2735    QTest::mouseClick(&view, Qt::LeftButton, 0, inputElement.geometry().center());
    27362736    m_inputFieldsTestView = &view;
    27372737    view.installEventFilter( this );
    … …  
    27512751    page.setViewportSize(QSize(200, 0)); //no height so link is not visible
    27522752    const QWebElement linkElement = frame->documentElement().findFirst(QLatin1String("a#link"));
    2753     QWebHitTestResult result = frame->hitTestContent(linkElement.geometry().center().toPoint());
     2753    QWebHitTestResult result = frame->hitTestContent(linkElement.geometry().center());
    27542754    QCOMPARE(result.linkText(), QString("link text"));
    27552755    QWebElement link = result.linkElement();
    … …  
    31273127
    31283128    frame->scrollToAnchor("foo");
    3129     QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().toRect().top());
     3129    QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().top());
    31303130
    31313131    frame->scrollToAnchor("bar");
    31323132    frame->scrollToAnchor("foo");
    3133     QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().toRect().top());
     3133    QCOMPARE(frame->scrollPosition().y(), fooAnchor.geometry().top());
    31343134
    31353135    frame->scrollToAnchor("top");

  • branches/subpixellayout/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r103754 r107290  
    16471647
    16481648    QWebElementCollection inputs = page->mainFrame()->documentElement().findAll("input");
    1649     QPoint textInputCenter = inputs.at(0).geometry().center().toPoint();
     1649    QPoint textInputCenter = inputs.at(0).geometry().center();
    16501650
    16511651    clickOnPage(page, textInputCenter);
    … …  
    18701870
    18711871    //ImhHiddenText
    1872     QPoint passwordInputCenter = inputs.at(1).geometry().center().toPoint();
     1872    QPoint passwordInputCenter = inputs.at(1).geometry().center();
    18731873    clickOnPage(page, passwordInputCenter);
    18741874
    … …  
    18831883
    18841884    QWebElement para = page->mainFrame()->findFirstElement("p");
    1885     clickOnPage(page, para.geometry().center().toPoint());
     1885    clickOnPage(page, para.geometry().center());
    18861886
    18871887    QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
    … …  
    22152215                                            "</body></html>");
    22162216    QWebElement inputElement = page->mainFrame()->findFirstElement("div");
    2217     clickOnPage(page, inputElement.geometry().center().toPoint());
     2217    clickOnPage(page, inputElement.geometry().center());
    22182218
    22192219    QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
    … …  
    31033103
    31043104    QWebElement link = view.page()->mainFrame()->findFirstElement("a");
    3105     QPoint pos(link.geometry().center().toPoint());
     3105    QPoint pos(link.geometry().center());
    31063106    QContextMenuEvent event(QContextMenuEvent::Mouse, pos);
    31073107    view.page()->swallowContextMenuEvent(&event);
    … …  
    31263126
    31273127    QWebElement link = view.page()->mainFrame()->findFirstElement("input");
    3128     QPoint pos(link.geometry().center().toPoint());
     3128    QPoint pos(link.geometry().center());
    31293129    QContextMenuEvent event(QContextMenuEvent::Mouse, pos);
    31303130    view.page()->swallowContextMenuEvent(&event);

  • branches/subpixellayout/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp

    r99784 r107290  
    246246    // 'text' type
    247247    QWebElement inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=text]"));
    248     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     248    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    249249    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
    250250    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    252252    // 'password' field
    253253    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    254     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     254    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    255255    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    256256    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    258258    // 'tel' field
    259259    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=tel]"));
    260     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     260    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    261261    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDialableCharactersOnly);
    262262    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    264264    // 'number' field
    265265    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=number]"));
    266     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     266    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    267267    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDigitsOnly);
    268268    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    270270    // 'email' field
    271271    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=email]"));
    272     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     272    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    273273    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhEmailCharactersOnly);
    274274    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    276276    // 'url' field
    277277    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=url]"));
    278     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     278    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    279279    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhUrlCharactersOnly);
    280280    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    282282    // 'password' field
    283283    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    284     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     284    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    285285    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    286286    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    288288    // 'text' type
    289289    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=text]"));
    290     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     290    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    291291    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
    292292    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    294294    // 'password' field
    295295    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    296     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     296    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    297297    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    298298    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    … …  
    300300    // 'text area' field
    301301    inputElement = mainFrame->documentElement().findFirst(QLatin1String("textarea"));
    302     QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center().toPoint());
     302    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    303303    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
    304304    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
Note: See TracChangeset for help on using the changeset viewer.