Index: head/converters/wkhtmltopdf/Makefile =================================================================== --- head/converters/wkhtmltopdf/Makefile (revision 542903) +++ head/converters/wkhtmltopdf/Makefile (revision 542904) @@ -1,95 +1,93 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= wkhtmltopdf -PORTVERSION= 0.12.5 -PORTREVISION= 5 +PORTVERSION= 0.12.6 CATEGORIES= converters MAINTAINER= pi@FreeBSD.org COMMENT= Convert HTML (or live webpages) to PDF or image LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to build: error: cast from pointer to smaller type loses information BROKEN_armv6= fails to build: error: Not supported ARM architecture BROKEN_armv7= fails to build: error: invalid operand for instruction BROKEN_mips64= fails to link: undefined reference to __sync_add_and_fetch_4 RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libpng.so:graphics/png \ - libQt5WebKit.so:www/qt5-webkit + libpng.so:graphics/png USES= compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl xorg +USE_GCC= 8 USE_XORG= x11 xext xrender USE_PERL5= build USE_LDCONFIG= yes USE_GITHUB= yes WKQT_TAGNAME= 5db36ec GH_TUPLE= ${PORTNAME}:qt:${WKQT_TAGNAME}:qt -USE_CXXSTD= gnu++98 HAS_CONFIGURE= yes PATCH_WRKSRC= ${WRKSRC}/qt CONFIGURE_WRKSRC= ${WRKSRC}/build/qt BUILD_WRKSRC= ${WRKSRC}/build/qt INSTALL_WRKSRC= ${WRKSRC}/build/app CONFIGURE_SCRIPT= ../../qt/configure CONFIGURE_ARGS= -prefix ${WRKSRC}/build/qt \ -opensource -confirm-license -fast -release -static \ -graphicssystem raster -webkit -exceptions -xmlpatterns -system-zlib \ -system-libpng -system-libjpeg -no-libmng -no-libtiff -no-stl \ -no-accessibility -no-qt3support -no-phonon -no-phonon-backend \ -no-opengl -no-declarative -no-script -no-scripttools \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \ -no-sql-sqlite -no-sql-sqlite2 -no-mmx -no-3dnow -no-sse -no-sse2 \ -no-multimedia -nomake demos -nomake docs -nomake examples \ -nomake tools -nomake tests -nomake translations -xrender -largefile \ -iconv -openssl-linked -no-rpath -no-dbus -no-nis -no-cups -no-pch \ -no-gtkstyle -no-nas-sound -no-sm -no-xshape -no-xinerama -no-xcursor \ -no-xfixes -no-xrandr -no-mitshm -no-xinput -no-xkb -no-glib \ -no-gstreamer -D ENABLE_VIDEO=0 -no-openvg -no-xsync \ -no-audio-backend -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx \ -no-neon MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}${PREFIX}" pre-patch: ${RMDIR} ${WRKSRC}/qt ${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ -e 's|/usr/X11R6/include|${LOCALBASE}/include/X11|g' \ -e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \ ${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ ${PATCH_WRKSRC}/mkspecs/common/gcc-base.conf ${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ ${PATCH_WRKSRC}/mkspecs/common/g++-base.conf ${REINPLACE_CMD} -e "s|share/man|man|g" \ ${WRKSRC}/src/image/image.pro \ ${WRKSRC}/src/pdf/pdf.pro ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/image/image.pro ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro ${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ ${WRKSRC}/build/wkhtmltox post-build: cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \ ../qt/bin/qmake ../../wkhtmltopdf.pro && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \ ${ALL_TARGET} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wkhtmltoimage \ ${STAGEDIR}${PREFIX}/bin/wkhtmltopdf \ ${STAGEDIR}${PREFIX}/lib/libwkhtmltox.so.${PORTVERSION} .include Index: head/converters/wkhtmltopdf/distinfo =================================================================== --- head/converters/wkhtmltopdf/distinfo (revision 542903) +++ head/converters/wkhtmltopdf/distinfo (revision 542904) @@ -1,5 +1,5 @@ -TIMESTAMP = 1528798989 -SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621 -SIZE (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 511181 +TIMESTAMP = 1591904530 +SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0 +SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = 519045 SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1 SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377 Index: head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf =================================================================== --- head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf (nonexistent) @@ -1,11 +0,0 @@ ---- mkspecs/common/gcc-base.conf.orig 2018-10-01 11:36:14 UTC -+++ mkspecs/common/gcc-base.conf -@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB - QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC - QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden - --QMAKE_LFLAGS += -+QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%% - QMAKE_LFLAGS_DEBUG += - QMAKE_LFLAGS_APP += - QMAKE_LFLAGS_RELEASE += Property changes on: head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test =================================================================== --- head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test (revision 542904) @@ -1,11 +1,11 @@ ---- config.tests/unix/compile.test.orig +--- config.tests/unix/compile.test.orig 2018-05-29 06:56:52 UTC +++ config.tests/unix/compile.test -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ DESCRIPTION=$7 shift 7 LFLAGS="$SYSROOT_FLAG" INCLUDEPATH="" -CXXFLAGS="$SYSROOT_FLAG" +CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" MAC_ARCH_CXXFLAGS="" MAC_ARCH_LFLAGS="" while [ "$#" -gt 0 ]; do Index: head/converters/wkhtmltopdf/files/patch-configure =================================================================== --- head/converters/wkhtmltopdf/files/patch-configure (nonexistent) +++ head/converters/wkhtmltopdf/files/patch-configure (revision 542904) @@ -0,0 +1,11 @@ +--- configure.orig 2018-05-29 06:56:52 UTC ++++ configure +@@ -7754,7 +7754,7 @@ case "$XPLATFORM" in + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 8*|7*|6*|5*|4*|3.4*) ++ 11*|10*|9*|8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" Property changes on: head/converters/wkhtmltopdf/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Index: head/converters/wkhtmltopdf/files/patch-libcxx =================================================================== --- head/converters/wkhtmltopdf/files/patch-libcxx (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-libcxx (revision 542904) @@ -1,620 +1,614 @@ Several upstream (as in WebKit itself) commits that fix the build with libc++, plus a few additional changes made only for the port (the OS(FREEBSD) part for time_t). Some of those commits had to be edited because they did not apply cleanly to the ancient WebKit checkout present in Qt. Upstream commit messages: ------------------------------------------------------------------------ r86529 | abarth@webkit.org | 2011-05-16 09:30:58 +0300 (Mon, 16 May 2011) | 7 lines 2011-05-15 Adam Barth Attempt to fix Qt build. (Strict PassOwnPtr fix.) * dom/XMLDocumentParserQt.cpp: (WebCore::XMLDocumentParser::doEnd): ------------------------------------------------------------------------ r86530 | abarth@webkit.org | 2011-05-16 09:36:56 +0300 (Mon, 16 May 2011) | 13 lines 2011-05-15 Adam Barth Attempt to fix Qt build. (Strict PassOwnPtr fix.) * platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyWrapper::release): (WebCore::QNetworkReplyWrapper::receiveMetaData): (WebCore::QNetworkReplyWrapper::receiveSniffedMIMEType): (WebCore::QNetworkReplyHandler::release): (WebCore::QNetworkReplyHandler::finish): (WebCore::QNetworkReplyHandler::redirect): (WebCore::QNetworkReplyHandler::start): ------------------------------------------------------------------------ r86531 | abarth@webkit.org | 2011-05-16 09:41:08 +0300 (Mon, 16 May 2011) | 7 lines 2011-05-15 Adam Barth Attempt to fix Qt build. (Strict PassOwnPtr fix.) * platform/text/qt/TextCodecQt.cpp: (WebCore::newTextCodecQt): ------------------------------------------------------------------------ r86532 | abarth@webkit.org | 2011-05-16 09:46:33 +0300 (Mon, 16 May 2011) | 8 lines 2011-05-15 Adam Barth Attempt to fix Qt build. (Strict PassOwnPtr fix.) * platform/graphics/qt/GraphicsLayerQt.cpp: (WebCore::GraphicsLayerQt::GraphicsLayerQt): (WebCore::GraphicsLayer::create): ------------------------------------------------------------------------ r86533 | abarth@webkit.org | 2011-05-16 09:52:23 +0300 (Mon, 16 May 2011) | 10 lines 2011-05-15 Adam Barth Attempt to fix the Qt build. (Strict PassOwnPtr fix.) * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::detachCurrentPage): (QGraphicsWebView::setPage): * Api/qwebpage.cpp: (QWebPage::setView): ------------------------------------------------------------------------ r86537 | abarth@webkit.org | 2011-05-16 10:24:01 +0300 (Mon, 16 May 2011) | 41 lines 2011-05-16 Adam Barth [Qt] QtPlatformPlugin create methods should use PassOwnPtr https://bugs.webkit.org/show_bug.cgi?id=60873 This change is slightly more than a build fix because the patch kind of spidered a bit while I was trying to fix the build the "right way." Hopefully nothing here is controversial. * Api/qwebpage.cpp: (QWebPagePrivate::adjustPointForClicking): * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::createSelectPopup): * WebCoreSupport/FullScreenVideoQt.cpp: (WebCore::FullScreenVideoQt::FullScreenVideoQt): (WebCore::FullScreenVideoQt::~FullScreenVideoQt): * WebCoreSupport/FullScreenVideoQt.h: * WebCoreSupport/NotificationPresenterClientQt.cpp: (WebCore::NotificationWrapper::NotificationWrapper): (WebCore::NotificationPresenterClientQt::displayNotification): * WebCoreSupport/PopupMenuQt.cpp: (WebCore::PopupMenuQt::PopupMenuQt): (WebCore::PopupMenuQt::~PopupMenuQt): (WebCore::PopupMenuQt::show): * WebCoreSupport/PopupMenuQt.h: * WebCoreSupport/QtPlatformPlugin.cpp: (WebCore::QtPlatformPlugin::createSelectInputMethod): (WebCore::QtPlatformPlugin::createNotificationPresenter): (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer): (WebCore::QtPlatformPlugin::createTouchModifier): (WebCore::QtPlatformPlugin::createFullScreenVideoHandler): * WebCoreSupport/QtPlatformPlugin.h: (WebCore::QtPlatformPlugin::QtPlatformPlugin): 2011-05-16 Adam Barth [Qt] QtPlatformPlugin create methods should use PassOwnPtr https://bugs.webkit.org/show_bug.cgi?id=60873 * plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::platformStart): ------------------------------------------------------------------------ r86538 | abarth@webkit.org | 2011-05-16 10:27:51 +0300 (Mon, 16 May 2011) | 6 lines 2011-05-16 Adam Barth Missing include. * WebCoreSupport/PopupMenuQt.h: ------------------------------------------------------------------------ r86540 | abarth@webkit.org | 2011-05-16 10:43:22 +0300 (Mon, 16 May 2011) | 10 lines 2011-05-16 Adam Barth Attempt to fix Qt build. (Strict PassOwnPtr fix.) This patch requires some slightly fancy footwork. * WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::openInspectorFrontend): (WebCore::InspectorFrontendClientQt::InspectorFrontendClientQt): ------------------------------------------------------------------------ r86541 | abarth@webkit.org | 2011-05-16 10:51:04 +0300 (Mon, 16 May 2011) | 7 lines 2011-05-16 Adam Barth Sigh. This code is somewhat crazy. * WebCoreSupport/InspectorClientQt.cpp: (WebCore::InspectorClientQt::openInspectorFrontend): ------------------------------------------------------------------------ r86550 | abarth@webkit.org | 2011-05-16 12:30:40 +0300 (Mon, 16 May 2011) | 13 lines 2011-05-16 Adam Barth Partial revert of r86537. FullScreenVideoQt.h can't depend on OwnPtr.h because moc_FullScreenVideoQt.cpp fails to include config.h. Apparently, having moc_FullScreenVideoQt.cpp properly include config.h is hard, so we're going back to manual new and delete for this class. Bad times. * WebCoreSupport/FullScreenVideoQt.cpp: (WebCore::FullScreenVideoQt::FullScreenVideoQt): (WebCore::FullScreenVideoQt::~FullScreenVideoQt): * WebCoreSupport/FullScreenVideoQt.h: ------------------------------------------------------------------------ r90915 | andersca@apple.com | 2011-07-13 17:11:49 +0300 (Wed, 13 Jul 2011) | 7 lines If a compiler has nullptr support, include to get the nullptr_t definition https://bugs.webkit.org/show_bug.cgi?id=64429 Include the cstddef which has the nullptr_t typedef according to the C++0x standard. * wtf/NullPtr.h: ------------------------------------------------------------------------ r92556 | darin@apple.com | 2011-08-06 23:17:26 +0300 (Sat, 06 Aug 2011) | 17 lines Fix Timer heap implementation to work with more libraries (other versions of STL) https://bugs.webkit.org/show_bug.cgi?id=65782 Reviewed by Anders Carlsson. No behavior change, so no tests needed. Existing tests pass. * platform/Timer.cpp: Added TimerHeapPointer and TimerHeapReference class alongside the TimerHeapIterator class. Also added a swap function. Also added a TimerHeapLessThanFunction class. (WebCore::TimerBase::heapDecreaseKey): Pass pointers in to the TimerHeapIterator since that's how the class works now. Pass a TimerHeapLessThanFunction object instead of letting the library use the < operator directly. (WebCore::TimerBase::heapPopMin): Ditto. * platform/Timer.h: Updated for above changes. ------------------------------------------------------------------------ r107489 | weinig@apple.com | 2012-02-12 01:10:24 +0200 (Sun, 12 Feb 2012) | 9 lines Prepare JavaScriptCore to build with libc++ https://bugs.webkit.org/show_bug.cgi?id=78424 Reviewed by Anders Carlsson. * wtf/NullPtr.cpp: * wtf/NullPtr.h: libc++ provides std::nullptr emulation, so we don't have to. ------------------------------------------------------------------------ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2018-05-29 06:56:52 UTC +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h -@@ -35,10 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +@@ -35,9 +35,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH D #define __has_feature(feature) 0 #endif --#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) +#include + -+#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) + #if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) #define HAVE_NULLPTR 1 - -+#include + ++#include + #else - namespace std { ---- src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp (revision 86528) -+++ src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp (revision 86529) -@@ -215,7 +215,7 @@ +--- src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp +@@ -215,7 +215,7 @@ void XMLDocumentParser::doEnd() { #if ENABLE(XSLT) if (m_sawXSLTransform) { - document()->setTransformSource(new TransformSource(m_originalSourceForTransform)); + document()->setTransformSource(adoptPtr(new TransformSource(m_originalSourceForTransform))); document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets. document()->styleSelectorChanged(RecalcStyleImmediately); document()->setParsing(true); ---- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h +--- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h.orig 2018-05-29 06:56:52 UTC +++ src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h @@ -38,7 +38,7 @@ #include #include -#if OS(SOLARIS) +#if OS(FREEBSD) || OS(SOLARIS) #include // For time_t structure. #endif ---- src/3rdparty/webkit/Source/WebCore/page/Page.h +--- src/3rdparty/webkit/Source/WebCore/page/Page.h.orig 2018-05-29 06:56:52 UTC +++ src/3rdparty/webkit/Source/WebCore/page/Page.h @@ -29,7 +29,7 @@ #include #include -#if OS(SOLARIS) +#if OS(FREEBSD) || OS(SOLARIS) #include // For time_t structure. #endif ---- src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h +--- src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h.orig 2018-05-29 06:56:52 UTC +++ src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h @@ -35,7 +35,7 @@ #include #include -#if OS(SOLARIS) +#if OS(FREEBSD) || OS(SOLARIS) #include // For time_t structure. #endif ---- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (revision 86529) -+++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (revision 86530) -@@ -285,7 +285,7 @@ +--- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +@@ -285,7 +285,7 @@ void QNetworkReplyWrapper::receiveMetaData() Q_ASSERT(!m_sniffer); - m_sniffer = new QtMIMETypeSniffer(m_reply, m_advertisedMIMEType, isSupportedImageType); + m_sniffer = adoptPtr(new QtMIMETypeSniffer(m_reply, m_advertisedMIMEType, isSupportedImageType)); if (m_sniffer->isFinished()) { receiveSniffedMIMEType(); -@@ -666,7 +666,7 @@ +@@ -666,7 +666,7 @@ void QNetworkReplyHandler::start() if (!reply) return; - m_replyWrapper = new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this); + m_replyWrapper = adoptPtr(new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this)); if (m_loadType == SynchronousLoad) { m_replyWrapper->synchronousLoad(); -=================================================================== ---- src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp (revision 86530) -+++ src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp (revision 86531) -@@ -64,7 +64,7 @@ +--- src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp +@@ -64,7 +64,7 @@ void TextCodecQt::registerEncodingNames(EncodingNameRe static PassOwnPtr newTextCodecQt(const TextEncoding& encoding, const void*) { - return new TextCodecQt(encoding); + return adoptPtr(new TextCodecQt(encoding)); } void TextCodecQt::registerCodecs(TextCodecRegistrar registrar) - ---- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp (revision 86532) -+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp (revision 86533) -@@ -504,7 +504,7 @@ +--- src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -950,7 +950,7 @@ bool PluginView::platformStart() + + #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER) + if (shouldUseAcceleratedCompositing()) { +- m_platformLayer = new PluginGraphicsLayerQt(this); ++ m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this)); + // Trigger layer computation in RenderLayerCompositor + m_element->setNeedsStyleRecalc(SyntheticStyleChange); + } +--- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp +@@ -504,7 +504,7 @@ void QGraphicsWebView::setPage(QWebPage* page) if (!d->page) return; - d->page->d->client = new PageClientQGraphicsWidget(this, page); // set the page client + d->page->d->client = adoptPtr(new PageClientQGraphicsWidget(this, page)); if (d->overlay()) d->overlay()->prepareGraphicsItemGeometryChange(); ---- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp (revision 86532) -+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp (revision 86550) -@@ -1319,7 +1319,7 @@ +--- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp +@@ -1343,7 +1343,7 @@ void QWebPagePrivate::adjustPointForClicking(QMouseEve void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev) { QtPlatformPlugin platformPlugin; - QWebTouchModifier* touchModifier = platformPlugin.createTouchModifier(); + OwnPtr touchModifier = platformPlugin.createTouchModifier(); if (!touchModifier) return; -@@ -1328,8 +1328,7 @@ +@@ -1352,8 +1352,7 @@ void QWebPagePrivate::adjustPointForClicking(QGraphics unsigned bottomPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Down); unsigned leftPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Left); - delete touchModifier; - touchModifier = 0; + touchModifier = nullptr; if (!topPadding && !rightPadding && !bottomPadding && !leftPadding) return; -@@ -2044,7 +2044,7 @@ +@@ -2068,7 +2067,7 @@ void QWebPage::setView(QWidget* view) } if (view) - d->client = new PageClientQWidget(view, this); + d->client = adoptPtr(new PageClientQWidget(view, this)); } /*! ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h (revision 86550) -@@ -22,6 +22,8 @@ - - #include "PopupMenu.h" - #include -+#include -+#include - - class QWebSelectData; - class QWebSelectMethod; -@@ -49,8 +51,8 @@ - - private: - PopupMenuClient* m_popupClient; -- QWebSelectMethod* m_popup; -- QWebSelectData* m_selectData; -+ OwnPtr m_popup; -+ OwnPtr m_selectData; - const ChromeClientQt* m_chromeClient; - }; - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h (revision 86550) -@@ -22,6 +22,7 @@ - #define QtPlatformPlugin_h - - #include -+#include - - class QWebSelectMethod; - class QWebKitPlatformPlugin; -@@ -37,15 +38,20 @@ - - class QtPlatformPlugin { - public: -- QtPlatformPlugin() : m_loaded(false), m_plugin(0) {} -+ QtPlatformPlugin() -+ : m_loaded(false) -+ , m_plugin(0) -+ { -+ } -+ - ~QtPlatformPlugin(); - -- QWebSelectMethod* createSelectInputMethod(); -- QWebNotificationPresenter* createNotificationPresenter(); -- QWebHapticFeedbackPlayer* createHapticFeedbackPlayer(); -- QWebTouchModifier* createTouchModifier(); -+ PassOwnPtr createSelectInputMethod(); -+ PassOwnPtr createNotificationPresenter(); -+ PassOwnPtr createHapticFeedbackPlayer(); -+ PassOwnPtr createTouchModifier(); - #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) -- QWebFullScreenVideoHandler* createFullScreenVideoHandler(); -+ PassOwnPtr createFullScreenVideoHandler(); - #endif - - QWebKitPlatformPlugin* plugin(); ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (revision 86550) -@@ -696,18 +696,18 @@ +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +@@ -702,18 +702,18 @@ void ChromeClientQt::exitFullscreenForNode(Node* node) } #endif -QWebSelectMethod* ChromeClientQt::createSelectPopup() const +PassOwnPtr ChromeClientQt::createSelectPopup() const { - QWebSelectMethod* result = m_platformPlugin.createSelectInputMethod(); + OwnPtr result = m_platformPlugin.createSelectInputMethod(); if (result) - return result; + return result.release(); #if defined(Q_WS_MAEMO_5) - return new QtMaemoWebPopup; + return adoptPtr(new QtMaemoWebPopup); #elif !defined(QT_NO_COMBOBOX) - return new QtFallbackWebPopup(this); + return adoptPtr(new QtFallbackWebPopup(this)); #else - return 0; + return nullptr; #endif } ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp (revision 86550) -@@ -82,8 +82,6 @@ +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h +@@ -34,6 +34,7 @@ + #include "KURL.h" + #include "PlatformString.h" + #include "QtPlatformPlugin.h" ++#include + #include + QT_BEGIN_NAMESPACE +@@ -190,7 +191,7 @@ class ChromeClientQt : public ChromeClient { (public) + virtual PassRefPtr createSearchPopupMenu(PopupMenuClient*) const; + virtual void populateVisitedLinks(); + +- QWebSelectMethod* createSelectPopup() const; ++ PassOwnPtr createSelectPopup() const; + + virtual void dispatchViewportDataDidChange(const ViewportArguments&) const; + +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp +@@ -140,7 +140,7 @@ FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* c + Q_ASSERT(m_chromeClient); + + #if USE(QT_MULTIMEDIA) +- m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler(); ++ m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler().leakPtr(); + if (!m_FullScreenVideoHandler) + m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler; + +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp +@@ -203,8 +203,9 @@ void InspectorClientQt::inspectorDestroyed() + void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController) + { + #if ENABLE(INSPECTOR) +- QWebView* inspectorView = new QWebView; +- InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView); ++ OwnPtr inspectorView = adoptPtr(new QWebView); ++ // FIXME: Where does inspectorPage get deleted? ++ InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView.get()); + inspectorView->setPage(inspectorPage); + + QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector(); +@@ -229,11 +230,14 @@ void InspectorClientQt::openInspectorFrontend(WebCore: + inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects); + #endif + inspectorView->page()->mainFrame()->load(inspectorUrl); +- m_inspectedWebPage->d->inspectorFrontend = inspectorView; +- inspector->d->setFrontend(inspectorView); ++ m_inspectedWebPage->d->inspectorFrontend = inspectorView.get(); ++ inspector->d->setFrontend(inspectorView.get()); + +- m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this); +- inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient); ++ // Is 'controller' the same object as 'inspectorController' (which appears to be unused)? ++ InspectorController* controller = inspectorView->page()->d->page->inspectorController(); ++ OwnPtr frontendClient = adoptPtr(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView.release(), this)); ++ m_frontendClient = frontendClient.get(); ++ controller->setInspectorFrontendClient(frontendClient.release()); + m_frontendWebPage = inspectorPage; + #endif + } +@@ -297,7 +301,7 @@ bool InspectorClientQt::sendMessageToFrontend(const St + + #if ENABLE(INSPECTOR) + InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr inspectorView, InspectorClientQt* inspectorClient) +- : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, new InspectorFrontendSettingsQt()) ++ : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, adoptPtr(new InspectorFrontendSettingsQt())) + , m_inspectedWebPage(inspectedWebPage) + , m_inspectorView(inspectorView) + , m_destroyingInspectorView(false) +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp +@@ -211,9 +211,9 @@ void NotificationPresenterClientQt::displayNotificatio + QPixmap pixmap; + if (bytes.length() && pixmap.loadFromData(bytes)) { + QIcon icon(pixmap); +- wrapper->m_notificationIcon = new QSystemTrayIcon(icon); ++ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon)); + } else +- wrapper->m_notificationIcon = new QSystemTrayIcon(); ++ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon()); + #endif + } + +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp +@@ -82,16 +82,12 @@ namespace WebCore { + PopupMenuQt::PopupMenuQt(PopupMenuClient* client, const ChromeClientQt* chromeClient) : m_popupClient(client) - , m_popup(0) - , m_selectData(0) , m_chromeClient(chromeClient) { } -@@ -90,8 +88,6 @@ PopupMenuQt::~PopupMenuQt() { - delete m_selectData; - delete m_popup; } void PopupMenuQt::disconnectClient() -@@ -107,11 +103,11 @@ +@@ -107,21 +103,19 @@ void PopupMenuQt::show(const IntRect& rect, FrameView* if (!m_popup) { m_popup = m_chromeClient->createSelectPopup(); - connect(m_popup, SIGNAL(didHide()), this, SLOT(didHide())); - connect(m_popup, SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool))); + connect(m_popup.get(), SIGNAL(didHide()), this, SLOT(didHide())); + connect(m_popup.get(), SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool))); } - if (QtFallbackWebPopup* fallback = qobject_cast(m_popup)) { + if (QtFallbackWebPopup* fallback = qobject_cast(m_popup.get())) { QRect geometry(rect); geometry.moveTopLeft(view->contentsToWindow(rect.location())); fallback->setGeometry(geometry); -@@ -118,10 +114,8 @@ fallback->setFont(m_popupClient->menuStyle().font().font()); } - if (m_selectData) - delete m_selectData; - m_selectData = new SelectData(m_popupClient); - m_popup->show(*m_selectData); + m_selectData = adoptPtr(new SelectData(m_popupClient)); + m_popup->show(*m_selectData.get()); #endif } ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp (revision 86550) -@@ -136,7 +136,7 @@ - Q_ASSERT(m_chromeClient); +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h +@@ -22,6 +22,8 @@ - #if USE(QT_MULTIMEDIA) -- m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler(); -+ m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler().leakPtr(); - if (!m_FullScreenVideoHandler) - m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler; + #include "PopupMenu.h" + #include ++#include ++#include ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp (revision 86550) -@@ -102,36 +102,35 @@ + class QWebSelectData; + class QWebSelectMethod; +@@ -49,8 +51,8 @@ private slots: + + private: + PopupMenuClient* m_popupClient; +- QWebSelectMethod* m_popup; +- QWebSelectData* m_selectData; ++ OwnPtr m_popup; ++ OwnPtr m_selectData; + const ChromeClientQt* m_chromeClient; + }; + +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp +@@ -102,36 +102,35 @@ QWebKitPlatformPlugin* QtPlatformPlugin::plugin() return m_plugin; } -QWebSelectMethod* QtPlatformPlugin::createSelectInputMethod() +PassOwnPtr QtPlatformPlugin::createSelectInputMethod() { QWebKitPlatformPlugin* p = plugin(); - return p ? static_cast(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0; + return adoptPtr(p ? static_cast(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0); } - -QWebNotificationPresenter* QtPlatformPlugin::createNotificationPresenter() +PassOwnPtr QtPlatformPlugin::createNotificationPresenter() { QWebKitPlatformPlugin* p = plugin(); - return p ? static_cast(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0; + return adoptPtr(p ? static_cast(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0); } -QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer() +PassOwnPtr QtPlatformPlugin::createHapticFeedbackPlayer() { QWebKitPlatformPlugin* p = plugin(); - return p ? static_cast(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0; + return adoptPtr(p ? static_cast(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0); } -QWebTouchModifier* QtPlatformPlugin::createTouchModifier() +PassOwnPtr QtPlatformPlugin::createTouchModifier() { QWebKitPlatformPlugin* p = plugin(); - return p ? static_cast(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0; + return adoptPtr(p ? static_cast(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0); } #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) -QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler() +PassOwnPtr QtPlatformPlugin::createFullScreenVideoHandler() { QWebKitPlatformPlugin* p = plugin(); - return p ? static_cast(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0; + return adoptPtr(p ? static_cast(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0); } #endif ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (revision 86550) -@@ -203,8 +203,9 @@ - void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController) - { - #if ENABLE(INSPECTOR) -- QWebView* inspectorView = new QWebView; -- InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView); -+ OwnPtr inspectorView = adoptPtr(new QWebView); -+ // FIXME: Where does inspectorPage get deleted? -+ InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView.get()); - inspectorView->setPage(inspectorPage); +--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h +@@ -22,6 +22,7 @@ + #define QtPlatformPlugin_h - QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector(); -@@ -229,11 +230,14 @@ - inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects); - #endif - inspectorView->page()->mainFrame()->load(inspectorUrl); -- m_inspectedWebPage->d->inspectorFrontend = inspectorView; -- inspector->d->setFrontend(inspectorView); -+ m_inspectedWebPage->d->inspectorFrontend = inspectorView.get(); -+ inspector->d->setFrontend(inspectorView.get()); - -- m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this); -- inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient); -+ // Is 'controller' the same object as 'inspectorController' (which appears to be unused)? -+ InspectorController* controller = inspectorView->page()->d->page->inspectorController(); -+ OwnPtr frontendClient = adoptPtr(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView.release(), this)); -+ m_frontendClient = frontendClient.get(); -+ controller->setInspectorFrontendClient(frontendClient.release()); - m_frontendWebPage = inspectorPage; - #endif - } -@@ -297,7 +301,7 @@ - - #if ENABLE(INSPECTOR) - InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr inspectorView, InspectorClientQt* inspectorClient) -- : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, new InspectorFrontendSettingsQt()) -+ : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, adoptPtr(new InspectorFrontendSettingsQt())) - , m_inspectedWebPage(inspectedWebPage) - , m_inspectorView(inspectorView) - , m_destroyingInspectorView(false) ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (revision 86550) -@@ -211,9 +211,9 @@ - QPixmap pixmap; - if (bytes.length() && pixmap.loadFromData(bytes)) { - QIcon icon(pixmap); -- wrapper->m_notificationIcon = new QSystemTrayIcon(icon); -+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon)); - } else -- wrapper->m_notificationIcon = new QSystemTrayIcon(); -+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon()); - #endif - } - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (revision 86536) -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (revision 86550) -@@ -34,6 +34,7 @@ - #include "KURL.h" - #include "PlatformString.h" - #include "QtPlatformPlugin.h" + #include +#include - #include - QT_BEGIN_NAMESPACE -@@ -189,7 +190,7 @@ - virtual PassRefPtr createSearchPopupMenu(PopupMenuClient*) const; - virtual void populateVisitedLinks(); + class QWebSelectMethod; + class QWebKitPlatformPlugin; +@@ -37,15 +38,20 @@ namespace WebCore { -- QWebSelectMethod* createSelectPopup() const; -+ PassOwnPtr createSelectPopup() const; + class QtPlatformPlugin { + public: +- QtPlatformPlugin() : m_loaded(false), m_plugin(0) {} ++ QtPlatformPlugin() ++ : m_loaded(false) ++ , m_plugin(0) ++ { ++ } ++ + ~QtPlatformPlugin(); - virtual void dispatchViewportDataDidChange(const ViewportArguments&) const; - ---- src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp (revision 86536) -+++ src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp (revision 86550) -@@ -950,7 +950,7 @@ bool PluginView::platformStart() +- QWebSelectMethod* createSelectInputMethod(); +- QWebNotificationPresenter* createNotificationPresenter(); +- QWebHapticFeedbackPlayer* createHapticFeedbackPlayer(); +- QWebTouchModifier* createTouchModifier(); ++ PassOwnPtr createSelectInputMethod(); ++ PassOwnPtr createNotificationPresenter(); ++ PassOwnPtr createHapticFeedbackPlayer(); ++ PassOwnPtr createTouchModifier(); + #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) +- QWebFullScreenVideoHandler* createFullScreenVideoHandler(); ++ PassOwnPtr createFullScreenVideoHandler(); + #endif - #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER) - if (shouldUseAcceleratedCompositing()) { -- m_platformLayer = new PluginGraphicsLayerQt(this); -+ m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this)); - // Trigger layer computation in RenderLayerCompositor - m_element->setNeedsStyleRecalc(SyntheticStyleChange); - } + QWebKitPlatformPlugin* plugin(); Index: head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h =================================================================== --- head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h (revision 542904) @@ -1,26 +1,26 @@ ---- ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h.orig 2011-12-08 06:06:02.000000000 +0100 -+++ ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h 2012-01-08 17:18:52.511348683 +0100 -@@ -227,7 +227,11 @@ +--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h +@@ -227,7 +227,11 @@ namespace JSC { u.asBits.tag = CellTag; else u.asBits.tag = EmptyValueTag; +#if defined(__sparc64__) + u.asBits.payload = reinterpret_cast(ptr); +#else u.asBits.payload = reinterpret_cast(ptr); +#endif #if ENABLE(JSC_ZOMBIES) ASSERT(!isZombie()); #endif -@@ -239,7 +243,11 @@ +@@ -239,7 +243,11 @@ namespace JSC { u.asBits.tag = CellTag; else u.asBits.tag = EmptyValueTag; +#if defined(__sparc64__) + u.asBits.payload = reinterpret_cast(const_cast(ptr)); +#else u.asBits.payload = reinterpret_cast(const_cast(ptr)); +#endif #if ENABLE(JSC_ZOMBIES) ASSERT(!isZombie()); #endif Index: head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h =================================================================== --- head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h (revision 542904) @@ -1,34 +1,35 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2014-04-10 20:37:11.000000000 +0200 -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h 2014-04-24 16:11:40.000000000 +0200 -@@ -63,18 +63,10 @@ +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h +@@ -63,19 +63,11 @@ #if OS(WINDOWS) #include -#elif OS(DARWIN) -#include #elif OS(ANDROID) #include #elif OS(QNX) #include -#elif COMPILER(GCC) && !OS(SYMBIAN) -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) -#include -#else -#include --#endif #endif +-#endif namespace WTF { -@@ -90,12 +82,6 @@ + +@@ -89,12 +81,6 @@ inline int atomicDecrement(int* addend) { return Inter + inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(reinterpret_cast(addend)); } inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast(addend)); } #endif - +- -#elif OS(DARWIN) -#define WTF_USE_LOCKFREE_THREADSAFESHARED 1 - -inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast(addend)); } -inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast(addend)); } -- + #elif OS(ANDROID) - inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } Index: head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro =================================================================== --- head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro (revision 542903) +++ head/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro (revision 542904) @@ -1,11 +1,11 @@ ---- ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2011-12-08 06:06:03.000000000 +0100 -+++ ./src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro 2012-01-08 17:18:52.521346053 +0100 -@@ -84,7 +84,7 @@ +--- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2018-05-29 06:56:52 UTC ++++ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro +@@ -115,7 +115,7 @@ CONFIG(QTDIR_build) { } moduleFile=$$PWD/qt_webkit_version.pri -isEmpty(QT_BUILD_TREE):include($$moduleFile) +include($$moduleFile) VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} symbian { Index: head/converters/wkhtmltopdf/pkg-plist =================================================================== --- head/converters/wkhtmltopdf/pkg-plist (revision 542903) +++ head/converters/wkhtmltopdf/pkg-plist (revision 542904) @@ -1,12 +1,12 @@ bin/wkhtmltoimage bin/wkhtmltopdf include/wkhtmltox/dllbegin.inc include/wkhtmltox/dllend.inc include/wkhtmltox/image.h include/wkhtmltox/pdf.h lib/libwkhtmltox.so lib/libwkhtmltox.so.0 lib/libwkhtmltox.so.0.12 -lib/libwkhtmltox.so.0.12.5 +lib/libwkhtmltox.so.0.12.6 man/man1/wkhtmltoimage.1.gz man/man1/wkhtmltopdf.1.gz