Attachment #54668 for bug #38119

View Details Raw Unified Return to Bug 38119

| Differences between



2010-04-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by NOBODY (OOPS!).

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

        Rename the property from wrt_viewMode to viewMode.

        * Api/qwebpage.cpp:
        (QWebPagePrivate::dynamicPropertyChangeEvent):
        * tests/qwebpage/tst_qwebpage.cpp:
        (tst_QWebPage::viewModes):

2010-04-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Unreviewed, Qt build fix.




void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
{
    if (event->propertyName() == "viewMode") {
        QString mode = q->property("viewMode").toString();
        if (mode != viewMode) {
            viewMode = mode;
            WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());



    void errorPageExtensionInIFrames();
    void errorPageExtensionInFrameset();

    void viewModes();

    void crashTests_LazyInitializationOfMainFrame();


    QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
}

void tst_QWebPage::viewModes()
{
    m_view->setHtml("<body></body>");
    m_page->setProperty("viewMode", "minimized");

    QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");
    QVERIFY(empty.type() == QVariant::Bool && empty.toBool());



2010-04-28  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by NOBODY (OOPS!).

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

        Rename the property from wrt_viewMode to viewMode.

        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
        (LayoutTestController::setViewModeMediaFeature):

2010-04-28  Chris Jerdonek  <cjerdonek@webkit.org>

        Reviewed by Daniel Bates.

Lines 140-146 QString LayoutTestController::counterVal WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp_sec1
- WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp -1 / +1 lines
140		140
141	void LayoutTestController::setViewModeMediaFeature(const QString& mode)	141	void LayoutTestController::setViewModeMediaFeature(const QString& mode)
142	{	142	{
143	m_drt->webPage()->setProperty("wrt_viewMode", mode);	143	m_drt->webPage()->setProperty("viewMode", mode);
144	}	144	}
145		145
146	int LayoutTestController::webHistoryItemCount()	146	int LayoutTestController::webHistoryItemCount()

Return to Bug 38119

Lines 1209-1216 void QWebPagePrivate::inputMethodEvent(Q WebKit/qt/Api/qwebpage.cpp_sec1
- WebKit/qt/Api/qwebpage.cpp -2 / +2 lines
1209		1209
1210	void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)	1210	void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
1211	{	1211	{
1212	if (event->propertyName() == "wrt_viewMode") {	1212	if (event->propertyName() == "viewMode") {
1213	QString mode = q->property("wrt_viewMode").toString();	1213	QString mode = q->property("viewMode").toString();
1214	if (mode != viewMode) {	1214	if (mode != viewMode) {
1215	viewMode = mode;	1215	viewMode = mode;
1216	WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());	1216	WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());

Lines 108-114 private slots: WebKit/qt/tests/qwebpage/tst_qwebpage.cpp_sec1
- WebKit/qt/tests/qwebpage/tst_qwebpage.cpp -3 / +3 lines
108	void errorPageExtensionInIFrames();	108	void errorPageExtensionInIFrames();
109	void errorPageExtensionInFrameset();	109	void errorPageExtensionInFrameset();
110		110
111	void wrt_viewModes();	111	void viewModes();
112		112
113	void crashTests_LazyInitializationOfMainFrame();	113	void crashTests_LazyInitializationOfMainFrame();
114		114
Lines 357-366 void tst_QWebPage::userStyleSheet() WebKit/qt/tests/qwebpage/tst_qwebpage.cpp_sec2
357	QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));	357	QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
358	}	358	}
359		359
360	void tst_QWebPage::wrt_viewModes()	360	void tst_QWebPage::viewModes()
361	{	361	{
362	m_view->setHtml("<body></body>");	362	m_view->setHtml("<body></body>");
363	m_page->setProperty("wrt_viewMode", "minimized");	363	m_page->setProperty("viewMode", "minimized");
364		364
365	QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");	365	QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");
366	QVERIFY(empty.type() == QVariant::Bool && empty.toBool());	366	QVERIFY(empty.type() == QVariant::Bool && empty.toBool());

Lines 1-3 WebKit/qt/ChangeLog_sec1
- WebKit/qt/ChangeLog +14 lines
		1	2010-04-28 Laszlo Gombos <laszlo.1.gombos@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Qt] QWebPage viewMode property
		6	https://bugs.webkit.org/show_bug.cgi?id=38119
		7
		8	Rename the property from wrt_viewMode to viewMode.
		9
		10	* Api/qwebpage.cpp:
		11	(QWebPagePrivate::dynamicPropertyChangeEvent):
		12	* tests/qwebpage/tst_qwebpage.cpp:
		13	(tst_QWebPage::viewModes):
		14
1	2010-04-28 Laszlo Gombos <laszlo.1.gombos@nokia.com>	15	2010-04-28 Laszlo Gombos <laszlo.1.gombos@nokia.com>
2		16
3	Unreviewed, Qt build fix.	17	Unreviewed, Qt build fix.

Lines 1-3 WebKitTools/ChangeLog_sec1
- WebKitTools/ChangeLog +12 lines
		1	2010-04-28 Laszlo Gombos <laszlo.1.gombos@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Qt] QWebPage viewMode property
		6	https://bugs.webkit.org/show_bug.cgi?id=38119
		7
		8	Rename the property from wrt_viewMode to viewMode.
		9
		10	* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
		11	(LayoutTestController::setViewModeMediaFeature):
		12
1	2010-04-28 Chris Jerdonek <cjerdonek@webkit.org>	13	2010-04-28 Chris Jerdonek <cjerdonek@webkit.org>
2		14
3	Reviewed by Daniel Bates.	15	Reviewed by Daniel Bates.