Changeset 58405 in webkit
- Timestamp:
- Apr 28, 2010 5:58:19 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r58266 r58405 122 122 using namespace WebCore; 123 123 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 133 124 bool QWebPagePrivate::drtRun = false; 134 125 … … 1215 1206 1216 1207 ev->accept(); 1208 } 1209 1210 void 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 } 1217 1222 } 1218 1223 … … 2565 2570 break; 2566 2571 #endif 2572 case QEvent::DynamicPropertyChange: 2573 d->dynamicPropertyChangeEvent(static_cast<QDynamicPropertyChangeEvent*>(ev)); 2574 break; 2567 2575 default: 2568 2576 return QObject::event(ev); -
trunk/WebKit/qt/Api/qwebpage_p.h
r57793 r58405 114 114 void inputMethodEvent(QInputMethodEvent*); 115 115 116 void dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent*); 117 116 118 void shortcutOverrideEvent(QKeyEvent*); 117 119 void leaveEvent(QEvent*); -
trunk/WebKit/qt/ChangeLog
r58391 r58405 1 2010-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 1 17 2010-04-28 Janne Koskinen <janne.p.koskinen@digia.com> 2 18 -
trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
r58218 r58405 109 109 void errorPageExtensionInFrameset(); 110 110 111 void wrt_viewModes(); 112 111 113 void crashTests_LazyInitializationOfMainFrame(); 112 114 … … 354 356 QVERIFY(networkManager->requestedUrls.count() >= 1); 355 357 QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png")); 358 } 359 360 void 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()); 356 373 } 357 374 -
trunk/WebKitTools/ChangeLog
r58401 r58405 1 2010-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 1 13 2010-04-28 Chris Jerdonek <cjerdonek@webkit.org> 2 14 -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r58072 r58405 38 38 #include <qwebsettings.h> 39 39 40 extern void qt_wrt_setViewMode(QWebPage* page, const QString& mode);41 40 extern void qt_dump_editing_callbacks(bool b); 42 41 extern void qt_dump_frame_loader(bool b); … … 142 141 void LayoutTestController::setViewModeMediaFeature(const QString& mode) 143 142 { 144 qt_wrt_setViewMode(m_drt->webPage(), mode);143 m_drt->webPage()->setProperty("wrt_viewMode", mode); 145 144 } 146 145
Note: See TracChangeset
for help on using the changeset viewer.