Changeset 58405 in webkit


Ignore:
Timestamp:
Apr 28, 2010 5:58:19 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-28 Luiz Agostini <luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QWebPage viewMode property
https://bugs.webkit.org/show_bug.cgi?id=38119

Replacing method qt_wrt_setViewMode by wrt_viewMode property.

  • Api/qwebpage.cpp: (QWebPagePrivate::dynamicPropertyChangeEvent): (QWebPage::event):
  • Api/qwebpage_p.h:
  • tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::wrt_viewModes):

2010-04-28 Luiz Agostini <luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QWebPage viewMode property
https://bugs.webkit.org/show_bug.cgi?id=38119

Replacing method qt_wrt_setViewMode by wrt_viewMode property.

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::setViewModeMediaFeature):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/Api/qwebpage.cpp

    r58266 r58405  
    122122using namespace WebCore;
    123123
    124 void QWEBKIT_EXPORT qt_wrt_setViewMode(QWebPage* page, const QString& mode)
    125 {
    126     QWebPagePrivate::priv(page)->viewMode = mode;
    127     WebCore::Frame* frame = QWebFramePrivate::core(page->mainFrame());
    128     WebCore::FrameView* view = frame->view();
    129     frame->document()->updateStyleSelector();
    130     view->forceLayout();
    131 }
    132 
    133124bool QWebPagePrivate::drtRun = false;
    134125
     
    12151206
    12161207    ev->accept();
     1208}
     1209
     1210void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
     1211{
     1212    if (event->propertyName() == "wrt_viewMode") {
     1213        QString mode = q->property("wrt_viewMode").toString();
     1214        if (mode != viewMode) {
     1215            viewMode = mode;
     1216            WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
     1217            WebCore::FrameView* view = frame->view();
     1218            frame->document()->updateStyleSelector();
     1219            view->forceLayout();
     1220        }
     1221    }
    12171222}
    12181223
     
    25652570        break;
    25662571#endif
     2572    case QEvent::DynamicPropertyChange:
     2573        d->dynamicPropertyChangeEvent(static_cast<QDynamicPropertyChangeEvent*>(ev));
     2574        break;
    25672575    default:
    25682576        return QObject::event(ev);
  • trunk/WebKit/qt/Api/qwebpage_p.h

    r57793 r58405  
    114114    void inputMethodEvent(QInputMethodEvent*);
    115115
     116    void dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent*);
     117
    116118    void shortcutOverrideEvent(QKeyEvent*);
    117119    void leaveEvent(QEvent*);
  • trunk/WebKit/qt/ChangeLog

    r58391 r58405  
     12010-04-28  Luiz Agostini  <luiz.agostini@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] QWebPage viewMode property
     6        https://bugs.webkit.org/show_bug.cgi?id=38119
     7
     8        Replacing method qt_wrt_setViewMode by wrt_viewMode property.
     9
     10        * Api/qwebpage.cpp:
     11        (QWebPagePrivate::dynamicPropertyChangeEvent):
     12        (QWebPage::event):
     13        * Api/qwebpage_p.h:
     14        * tests/qwebpage/tst_qwebpage.cpp:
     15        (tst_QWebPage::wrt_viewModes):
     16
    1172010-04-28  Janne Koskinen  <janne.p.koskinen@digia.com>
    218
  • trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r58218 r58405  
    109109    void errorPageExtensionInFrameset();
    110110
     111    void wrt_viewModes();
     112
    111113    void crashTests_LazyInitializationOfMainFrame();
    112114
     
    354356    QVERIFY(networkManager->requestedUrls.count() >= 1);
    355357    QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
     358}
     359
     360void tst_QWebPage::wrt_viewModes()
     361{
     362    m_view->setHtml("<body></body>");
     363    m_page->setProperty("wrt_viewMode", "minimized");
     364
     365    QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");
     366    QVERIFY(empty.type() == QVariant::Bool && empty.toBool());
     367
     368    QVariant minimized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: minimized)\")");
     369    QVERIFY(minimized.type() == QVariant::Bool && minimized.toBool());
     370
     371    QVariant maximized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: maximized)\")");
     372    QVERIFY(maximized.type() == QVariant::Bool && !maximized.toBool());
    356373}
    357374
  • trunk/WebKitTools/ChangeLog

    r58401 r58405  
     12010-04-28  Luiz Agostini  <luiz.agostini@openbossa.org>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] QWebPage viewMode property
     6        https://bugs.webkit.org/show_bug.cgi?id=38119
     7
     8        Replacing method qt_wrt_setViewMode by wrt_viewMode property.
     9
     10        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     11        (LayoutTestController::setViewModeMediaFeature):
     12
    1132010-04-28  Chris Jerdonek  <cjerdonek@webkit.org>
    214
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r58072 r58405  
    3838#include <qwebsettings.h>
    3939
    40 extern void qt_wrt_setViewMode(QWebPage* page, const QString& mode);
    4140extern void qt_dump_editing_callbacks(bool b);
    4241extern void qt_dump_frame_loader(bool b);
     
    142141void LayoutTestController::setViewModeMediaFeature(const QString& mode)
    143142{
    144     qt_wrt_setViewMode(m_drt->webPage(), mode);
     143    m_drt->webPage()->setProperty("wrt_viewMode", mode);
    145144}
    146145
Note: See TracChangeset for help on using the changeset viewer.