From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp') diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index 46120a7b0..0d28cbcc1 100755 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -471,6 +471,8 @@ DumpRenderTree::DumpRenderTree() DumpRenderTreeSupportQt::setDumpRenderTreeModeEnabled(true); DumpRenderTreeSupportQt::setInteractiveFormValidationEnabled(webPage(), true); + DumpRenderTreeSupportQt::enableMockScrollbars(); + QFocusEvent event(QEvent::FocusIn, Qt::ActiveWindowFocusReason); QApplication::sendEvent(m_mainView, &event); } @@ -947,6 +949,23 @@ void DumpRenderTree::dump() } else image = DumpRenderTreeSupportQt::paintPagesWithBoundaries(mainFrame); + if (DumpRenderTreeSupportQt::trackRepaintRects(m_page->mainFrame())) { + QVector repaintRects; + DumpRenderTreeSupportQt::getTrackedRepaintRects(m_page->mainFrame(), repaintRects); + QImage mask(image.size(), image.format()); + mask.fill(QColor(0, 0, 0, 0.66 * 255)); + + QPainter maskPainter(&mask); + maskPainter.setCompositionMode(QPainter::CompositionMode_Source); + for (int i = 0; i < repaintRects.size(); ++i) + maskPainter.fillRect(repaintRects[i], Qt::transparent); + + QPainter painter(&image); + painter.drawImage(image.rect(), mask); + + DumpRenderTreeSupportQt::setTrackRepaintRects(m_page->mainFrame(), false); + } + QCryptographicHash hash(QCryptographicHash::Md5); for (int row = 0; row < image.height(); ++row) hash.addData(reinterpret_cast(image.scanLine(row)), image.width() * 4); -- cgit v1.2.1