diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/debian/changelog qtwebkit-opensource-src-5.7.1+dfsg/debian/changelog --- qtwebkit-opensource-src-5.6.1+dfsg/debian/changelog 2016-12-23 10:17:01.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/debian/changelog 2017-01-09 16:56:10.000000000 +0000 @@ -1,29 +1,52 @@ -qtwebkit-opensource-src (5.6.1+dfsg-5ubuntu1) zesty; urgency=medium +qtwebkit-opensource-src (5.7.1+dfsg-1build1~2) zesty; urgency=medium - * Re-sync with Debian unstable, no changes remaining. - * Re-enable WebP, it is in main since Trusty (LP: #1652166). - * Drop debian/patches/fix_pthread_linking.diff, it was applied upstream - in 5.6.1 and wrongly rebased in 5.6.1+dfsg-1 upload. - * Fix a Lintian warning about space in license name. + * No-change rebuild. - -- Dmitry Shachnev Fri, 23 Dec 2016 13:00:54 +0300 + -- Timo Jyrinki Mon, 02 Jan 2017 12:11:30 +0200 -qtwebkit-opensource-src (5.6.1+dfsg-5) unstable; urgency=medium +qtwebkit-opensource-src (5.7.1+dfsg-1) unstable; urgency=medium + * New upstream release. + - Bump only the necessary Qt build dependencies. * Update symbols files with buildds' logs. + * Re mark 5.7.1~* symbols to 5.7.1. - -- Lisandro Damián Nicanor Pérez Meyer Wed, 10 Aug 2016 22:13:17 -0300 + -- Lisandro Damián Nicanor Pérez Meyer Thu, 15 Dec 2016 17:22:14 -0300 + +qtwebkit-opensource-src (5.7.1~20161021+dfsg-2) unstable; urgency=medium + + * Update symbols files from buildds’ logs. + * Upload to unstable. + + -- Dmitry Shachnev Tue, 01 Nov 2016 15:04:32 +0300 + +qtwebkit-opensource-src (5.7.1~20161021+dfsg-1) experimental; urgency=medium -qtwebkit-opensource-src (5.6.1+dfsg-4ubuntu1~2) yakkety; urgency=medium + * New upstream snapshot. + * Merge 5.6.1+dfsg-5 upload from unstable. + * Bump Qt build-dependencies to 5.7.1~20161021. + * Fix a Lintian warning about space in license name. + + -- Dmitry Shachnev Tue, 25 Oct 2016 15:44:52 +0300 + +qtwebkit-opensource-src (5.7.0+dfsg-1) experimental; urgency=medium * New upstream release. - * Drop transitional package after 16.04 LTS is released. - * Sync with Debian packaging, remaining changes: - - Build without WebP (in universe) - - Own .symbols file - * Update symbols from s390x build log. + * Drop debian/patches/fix_pthread_linking.diff, it was applied upstream + in 5.6.1 and wrongly rebased in 5.6.1+dfsg-1 upload. + * Refresh no_gc_sections.diff. + * Bump Qt build-dependencies to 5.7.0. + * Update the symbols files from 5.6.1 build logs. + * Drop the syncqt hack, the new tarballs are generated properly. + * Add Qt_5.7 version tag to debian/libqt5webkit5.symbols. + + -- Dmitry Shachnev Thu, 07 Jul 2016 21:37:28 +0300 + +qtwebkit-opensource-src (5.6.1+dfsg-5) unstable; urgency=medium + + * Update symbols files with buildds' logs. - -- Timo Jyrinki Tue, 08 Mar 2016 09:35:31 +0000 + -- Lisandro Damián Nicanor Pérez Meyer Wed, 10 Aug 2016 22:13:17 -0300 qtwebkit-opensource-src (5.6.1+dfsg-4) unstable; urgency=medium @@ -84,16 +107,6 @@ -- Dmitry Shachnev Sun, 06 Mar 2016 13:12:22 +0300 -qtwebkit-opensource-src (5.5.1+dfsg-2ubuntu1) xenial; urgency=medium - - * New upstream release. - * Sync with Debian packaging, remaining changes: - - Build without WebP (in universe) - - Transitional package for 14.04 LTS -> 16.04 LTS - - Own .symbols file - - -- Timo Jyrinki Mon, 30 Nov 2015 09:27:17 +0000 - qtwebkit-opensource-src (5.5.1+dfsg-2) unstable; urgency=medium * Upload to unstable. @@ -149,28 +162,6 @@ -- Felix Geyer Tue, 23 Jun 2015 19:20:46 +0200 -qtwebkit-opensource-src (5.4.2+dfsg-1ubuntu2.1) wily; urgency=medium - - * Build using ICU 55.1. - - -- Matthias Klose Sat, 18 Jul 2015 12:26:43 +0200 - -qtwebkit-opensource-src (5.4.2+dfsg-1ubuntu2) wily; urgency=medium - - * Rebuild for GCC5 transition. - * Update symbols. - - -- Timo Jyrinki Sun, 12 Jul 2015 15:33:28 +0300 - -qtwebkit-opensource-src (5.4.2+dfsg-1ubuntu1) wily; urgency=medium - - * New upstream release. - * Drop upstream patches: - - fix_unsafe_memory_load_store_on_arm.patch - - fix_gmutexlocker.patch - - -- Timo Jyrinki Thu, 11 Jun 2015 09:37:58 +0000 - qtwebkit-opensource-src (5.4.2+dfsg-1) experimental; urgency=medium [ Dmitry Shachnev ] @@ -196,16 +187,6 @@ -- Dmitry Shachnev Mon, 02 Mar 2015 17:03:48 +0300 -qtwebkit-opensource-src (5.4.1+dfsg-2ubuntu1) vivid; urgency=medium - - * New upstream release. - * Merge with Debian's 5.4.1+dfsg-2. - * debian/patches/fix_gmutexlocker.patch: - - Fix FTBFS due to new glib - * Comment out libleveldb-dev build-dep - - -- Timo Jyrinki Tue, 10 Mar 2015 11:39:12 +0000 - qtwebkit-opensource-src (5.4.1+dfsg-2) experimental; urgency=medium * Update leveldb_memenv_path.diff to make it really work. @@ -225,22 +206,6 @@ -- Dmitry Shachnev Sun, 01 Mar 2015 19:43:59 +0300 -qtwebkit-opensource-src (5.4.0+dfsg-1ubuntu1) vivid; urgency=medium - - [ Timo Jyrinki ] - * New upstream release. - * Bump build dependencies - * Drop debian/patches/LLIntCLoop32BigEndian.patch - - [ Dmitry Shachnev ] - * Merge with Debian experimental, remaining changes: - - Build with GStreamer 1.0 and without WebP (in universe) - - Keep the transitional QML package - - Keep additional patches from webkit.org upstream - - Keep Ubuntu device pixel ratio patches - - -- Timo Jyrinki Fri, 13 Feb 2015 06:34:49 +0000 - qtwebkit-opensource-src (5.4.0+dfsg-1) experimental; urgency=medium [ Dmitry Shachnev ] @@ -286,18 +251,6 @@ -- Lisandro Damián Nicanor Pérez Meyer Fri, 17 Oct 2014 02:04:39 -0300 -qtwebkit-opensource-src (5.3.2+dfsg-2ubuntu1) vivid; urgency=medium - - * New upstream release - * Sync with Debian 5.3.2+dfsg-2, remaining changes: - - Build with GStreamer 1.0 and without WebP (in universe) - - Keep the transitional QML package - - Keep additional patches from webkit.org upstream - - Keep Ubuntu device pixel ratio patches - * Update symbols - - -- Timo Jyrinki Wed, 16 Jul 2014 13:39:04 +0000 - qtwebkit-opensource-src (5.3.2+dfsg-2) unstable; urgency=medium * Upload to unstable. @@ -359,30 +312,6 @@ -- Lisandro Damián Nicanor Pérez Meyer Fri, 06 Jun 2014 00:31:56 -0300 -qtwebkit-opensource-src (5.3.0+dfsg-1ubuntu2) utopic; urgency=medium - - * Update symbols. - - -- Timo Jyrinki Thu, 05 Jun 2014 11:42:21 +0000 - -qtwebkit-opensource-src (5.3.0+dfsg-1ubuntu1) utopic; urgency=medium - - [ Timo Jyrinki ] - * New upstream release - * Change include directories - * Drop patches merged upstream: - - debian/patches/aarch64.patch - - debian/patches/dont_pollute_pri_and_pc_with_private_deps.patch - - debian/patches/fix_ftbfs_in_archs_without_jit_support.patch - * Update symbols file. - * Sync with Debian's 5.3.0 packaging - - Remaining changes building with GStreamer 1.0 and without WebP - - Drop sensors and location b-d, not critical and Oxide provides those - - Keep the transitional QML package - - Keep additional patches from webkit.org upstream - - -- Timo Jyrinki Thu, 05 Jun 2014 06:51:34 +0000 - qtwebkit-opensource-src (5.3.0+dfsg-1) experimental; urgency=medium * New upstream release. @@ -406,37 +335,6 @@ -- Lisandro Damián Nicanor Pérez Meyer Fri, 23 May 2014 21:53:24 -0300 -qtwebkit-opensource-src (5.2.1+dfsg1-1ubuntu2) utopic; urgency=medium - - * Update arm64 and ppc64el symbols - - -- Timo Jyrinki Wed, 04 Jun 2014 09:03:36 +0000 - -qtwebkit-opensource-src (5.2.1+dfsg1-1ubuntu1) utopic; urgency=medium - - * debian/control: Sort build-dependencies. - * Merge with unreleased debian Git, remaining changes: - - Build against qtsensors and qtlocation for additional features. - - Build-depend on libudev-dev. - - Build against GStreamer 1.0. - - Disable WebP support since webp not in main. - - Make libqt5webkit5-dev on some additional dev packages. - - Backport upstream patches: - + LLIntCLoop32BigEndian.patch - + bug_118860_qtwebkit_511.patch - + fix_unsafe_memory_load_store_on_arm.patch - + aarch64.patch - - Add Ubuntu-specific patches: - + devicePixelResolution.patch - + add_experimentalDevicePixelRatio.patch - - Add Vcs-Bzr field. - * Drop private headers, touch apps using them got ported to Oxide. - * Refresh all Ubuntu patches. - * Update symbols file. - * Update for qtsensors5-dev → libqt5sensors5-dev renaming. - - -- Dmitry Shachnev Sun, 11 May 2014 11:05:04 +0400 - qtwebkit-opensource-src (5.2.1+dfsg1-1) unstable; urgency=medium * Rename libqt5webkit5-qmlwebkitplugin to qml-module-qtwebkit, adding proper @@ -499,39 +397,6 @@ -- Lisandro Damián Nicanor Pérez Meyer Thu, 20 Feb 2014 20:42:53 -0300 -qtwebkit-opensource-src (5.2.1+dfsg-0ubuntu2) trusty; urgency=medium - - [ Ricardo Salveti de Araujo ] - * Refresh add_experimentalDevicePixelRatio.patch based on latest changes - from upstream - - -- Timo Jyrinki Tue, 11 Mar 2014 07:22:25 +0000 - -qtwebkit-opensource-src (5.2.1+dfsg-0ubuntu1) trusty; urgency=low - - * New release - * Bump dependencies to 5.2.1, also for qtsensors and qtlocation - * Refresh patches: - - bug_118860_qtwebkit_511.patch - - no_gc_sections.diff - * Enable debug temporarily - * Disable patches temporarily (need rebasing): - - add_experimentalDevicePixelRatio.patch - * Drop patches merged upstream: - - file_access.patch - - gstreamer-build-issue-gst10.patch - * Add build dependency on libudev-dev - * Add fix_unsafe_memory_load_store_on_arm.patch: - - Cherry-pick from upstream to fix ARM crash (LP: #1275961) - * Sync with Debian 5.2.0+dfsg1-1, remaining changes: - - Build against qtsensors and qtlocation for additional features - - Patches - - Keep private headers for webbrowser-app - - Build against GStreamer 1.0 - - Disable WebP support since webp not in main - - -- Timo Jyrinki Fri, 28 Feb 2014 11:06:17 +0000 - qtwebkit-opensource-src (5.2.0+dfsg1-1) unstable; urgency=medium [ Pino Toscano ] @@ -592,88 +457,6 @@ -- Lisandro Damián Nicanor Pérez Meyer Sun, 22 Dec 2013 16:35:23 -0300 -qtwebkit-opensource-src (5.1.1-1ubuntu8) trusty; urgency=medium - - * Copy dont_pollute_pri_and_pc_with_private_deps.patch from Debian - (LP: #1134745). - - -- Dmitry Shachnev Wed, 19 Mar 2014 14:07:02 +0400 - -qtwebkit-opensource-src (5.1.1-1ubuntu7) trusty; urgency=medium - - * Backport upstream patch to add AArch64 support. - * Add a patch to disable JIT and YARR JIT when they are not needed. - - -- Dmitry Shachnev Sat, 15 Mar 2014 11:43:38 +0400 - -qtwebkit-opensource-src (5.1.1-1ubuntu6) trusty; urgency=medium - - * Rebuild in correct landing PPA. - - -- Timo Jyrinki Thu, 13 Mar 2014 19:04:22 +0000 - -qtwebkit-opensource-src (5.1.1-1ubuntu5) trusty; urgency=medium - - * Backporting fixes from QtWebKit 5.2 and rebuilding against the - Qt 5.2 stack (avoid regressions with QtWebKit 5.2 on Touch) - - -- Ricardo Salveti de Araujo Thu, 13 Mar 2014 00:37:53 -0300 - -qtwebkit-opensource-src (5.1.1-1ubuntu4) trusty; urgency=medium - - * No change rebuild against libicu52 - - -- Dimitri John Ledkov Fri, 27 Dec 2013 08:32:20 +0000 - -qtwebkit-opensource-src (5.1.1-1ubuntu3) trusty; urgency=medium - - * Cherrypick patch from upstream/qt/webkit/ANGLE to fix FTBFS with bison - 3.0. - - -- Dimitri John Ledkov Tue, 24 Dec 2013 14:26:17 +0000 - -qtwebkit-opensource-src (5.1.1-1ubuntu2) saucy; urgency=low - - * Drop libwebp-dev dependency and disable it, not in main. - - -- Timo Jyrinki Thu, 19 Sep 2013 16:18:00 +0300 - -qtwebkit-opensource-src (5.1.1-1ubuntu1) saucy; urgency=low - - [ Loïc Minier ] - * FFE is LP: #1219695. - - [ Timo Jyrinki ] - * New upstream release - * Drop patches now in upstream: - - fixTriggerOSKonWebPages.patch - - fix_gcc48.patch - - add_module_version.patch - - DidFirstLayout.patch - * Drop disable_geolocation_501.diff, builds again fine with the support - * Refresh no_gc_sections.diff and LLIntCLoop32BigEndian.patch - * Fix watch file - * Sync with Debian 5.1.1-1, remaining changes: - - Build-depend on qtsensors and qtlocation - - Keep the LLIntCLoop32BigEndian, file_access patches - - Keep private headers - - Keep workaround for a upstream dependency problem - * Enable JIT again on armhf (drop disabling_jit_for_arm.patch) - * debian/patches/bug_118860_qtwebkit_511.patch - - Add isMainFrame property (LP: #1217683) - - [ Ricardo Salveti de Araujo ] - * Refresh add_experimentalDevicePixelRatio.patch based on latest changes - from upstream - * debian/patches/gstreamer-build-issue-gst10.patch: - - Fixing build issue with gstreamer 1.0 as fullscreen window is not yet - support but it gets used via moc - * debian/control: - - Changing qt build-deps to depend on >= 5.0.2 - - Build-dep on gstreamer-1.0 instead of 0.10 - - -- Loïc Minier Thu, 19 Sep 2013 14:47:16 +0200 - qtwebkit-opensource-src (5.1.1-1) unstable; urgency=low * New upstream release. diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/debian/control qtwebkit-opensource-src-5.7.1+dfsg/debian/control --- qtwebkit-opensource-src-5.6.1+dfsg/debian/control 2016-12-23 10:17:01.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/debian/control 2016-12-15 20:22:09.000000000 +0000 @@ -1,7 +1,6 @@ Source: qtwebkit-opensource-src Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Timo Jyrinki , Lisandro Damián Nicanor Pérez Meyer , Dmitry Shachnev @@ -21,8 +20,8 @@ libjpeg-dev, # libleveldb-dev, libpng-dev, - libqt5opengl5-dev (>= 5.6.1+dfsg~), - libqt5xmlpatterns5-dev (>= 5.6.1~), + libqt5opengl5-dev (>= 5.7.1+dfsg~), + libqt5xmlpatterns5-dev (>= 5.7.1~20161021~), libsqlite3-dev, libwebp-dev, libxcomposite-dev, @@ -34,13 +33,13 @@ pkg-kde-tools (>= 0.6.4), python-minimal, python2.7, - qtbase5-private-dev (>= 5.6.1+dfsg~), - qtdeclarative5-private-dev (>= 5.6.1~), - qtscript5-private-dev (>= 5.6.1+dfsg~), + qtbase5-private-dev (>= 5.7.1+dfsg~), + qtdeclarative5-private-dev (>= 5.7.1~), + qtscript5-private-dev (>= 5.7.1~20161021+dfsg~), ruby -Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~), - qtbase5-doc-html (>= 5.6.1+dfsg~), - qttools5-dev-tools (>= 5.6.1~) +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1+dfsg~), + qtbase5-doc-html (>= 5.7.1+dfsg~), + qttools5-dev-tools (>= 5.7.1~20161021~) Standards-Version: 3.9.8 Section: libs Homepage: http://trac.webkit.org/wiki/QtWebKit diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/debian/libqt5webkit5.symbols qtwebkit-opensource-src-5.7.1+dfsg/debian/libqt5webkit5.symbols --- qtwebkit-opensource-src-5.6.1+dfsg/debian/libqt5webkit5.symbols 2016-12-23 10:17:01.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/debian/libqt5webkit5.symbols 2016-12-15 20:22:09.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 5.6.1 amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 +# SymbolsHelper-Confirmed: 5.7.1 amd64 arm64 kfreebsd-amd64 mips64el ppc64el s390x sparc64 libQt5WebKit.so.5 libqt5webkit5 #MINVER# JSCheckScriptSyntax@Base 5.0.2 JSClassCreate@Base 5.0.2 @@ -1423,7 +1423,7 @@ _ZN15QWebPageAdapter16registerUndoStepEN3WTF10PassRefPtrIN7WebCore8UndoStepEEE@Base 5.0.2 _ZN15QWebPageAdapter17didCloseInspectorEv@Base 5.0.2 _ZN15QWebPageAdapter17mouseReleaseEventEP11QMouseEvent@Base 5.0.2 - (optional=gccinternal)_ZN15QWebPageAdapter17setPluginsVisibleEb@Base 5.4.2 + _ZN15QWebPageAdapter17setPluginsVisibleEb@Base 5.4.2 _ZN15QWebPageAdapter17setSystemTrayIconEP7QObject@Base 5.0.2 _ZN15QWebPageAdapter18setContentEditableEb@Base 5.0.2 _ZN15QWebPageAdapter18setVisibilityStateENS_15VisibilityStateE@Base 5.2.0 @@ -1691,8 +1691,8 @@ _ZN21QWebNavigationRequest13actionChangedEv@Base 5.0.2 _ZN21QWebNavigationRequest16staticMetaObjectE@Base 5.0.2 _ZN21QWebNavigationRequest9setActionEN13QQuickWebView23NavigationRequestActionE@Base 5.0.2 - _ZN21QWebNavigationRequestC1ERK4QUrlN2Qt11MouseButtonE6QFlagsINS3_16KeyboardModifierEEN13QQuickWebView14NavigationTypeEP7QObject@Base 5.5.0 - _ZN21QWebNavigationRequestC2ERK4QUrlN2Qt11MouseButtonE6QFlagsINS3_16KeyboardModifierEEN13QQuickWebView14NavigationTypeEP7QObject@Base 5.5.0 + _ZN21QWebNavigationRequestC1ERK4QUrlN2Qt11MouseButtonE6QFlagsINS3_16KeyboardModifierEEN13QQuickWebView14NavigationTypeEP7QObject@Base 5.0.2 + _ZN21QWebNavigationRequestC2ERK4QUrlN2Qt11MouseButtonE6QFlagsINS3_16KeyboardModifierEEN13QQuickWebView14NavigationTypeEP7QObject@Base 5.0.2 _ZN21QWebNavigationRequestD0Ev@Base 5.0.2 _ZN21QWebNavigationRequestD1Ev@Base 5.0.2 _ZN21QWebNavigationRequestD2Ev@Base 5.0.2 @@ -2445,7 +2445,7 @@ _ZN3WTF22cancelCallOnMainThreadEPFvPvES0_@Base 5.0.2 (subst)_ZN3WTF22charactersToUIntStrictEPKh{size_t}Pbi@Base 5.2.0 (subst)_ZN3WTF22charactersToUIntStrictEPKt{size_t}Pbi@Base 5.2.0 - (arch=amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386)_ZN3WTF22isMainThreadOrGCThreadEv@Base 5.2.1 + (arch=amd64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZN3WTF22isMainThreadOrGCThreadEv@Base 5.6.1 _ZN3WTF23callOnMainThreadAndWaitEPFvPvES0_@Base 5.0.2 _ZN3WTF23dayInMonthFromDayInYearEib@Base 5.0.2 _ZN3WTF23waitForThreadCompletionEj@Base 5.0.2 @@ -2588,9 +2588,9 @@ _ZN3WTF9MediaTimeD1Ev@Base 5.0.2 _ZN3WTF9MediaTimeD2Ev@Base 5.0.2 _ZN3WTF9MediaTimeaSERKS0_@Base 5.0.2 - (arch=amd64 kfreebsd-amd64 powerpc s390x)_ZN3WTF9dataLogFVEPKcP13__va_list_tag@Base 5.2.1 + (arch=amd64 kfreebsd-amd64 powerpc s390x x32)_ZN3WTF9dataLogFVEPKcP13__va_list_tag@Base 5.6.1 (arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN3WTF9dataLogFVEPKcPc@Base 5.3.2 - (arch=mips mips64el mipsel sparc sparc64)_ZN3WTF9dataLogFVEPKcPv@Base 5.3.1 + (arch=hppa mips mips64el mipsel sparc sparc64)_ZN3WTF9dataLogFVEPKcPv@Base 5.6.1 (arch=arm64 armel armhf)_ZN3WTF9dataLogFVEPKcSt9__va_list@Base 5.3.1 _ZN3WTF9dayInYearEdi@Base 5.0.2 _ZN3WTF9dayInYearEiii@Base 5.2.0 @@ -2888,7 +2888,8 @@ _ZNK25QQuickWebViewExperimental9userAgentEv@Base 5.0.2 _ZNK3JSC10JSFunction10sourceCodeEv@Base 5.0.2 _ZNK3JSC10JSFunction23isHostFunctionNonInlineEv@Base 5.0.2 - (optional=gccinternal)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.3.1 + (optional=gccinternal|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiRlRN3WTF6StringERNS_7JSValueE@Base 5.3.1 + (arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNK3JSC11Interpreter18retrieveLastCallerEPNS_9ExecStateERiS3_RN3WTF6StringERNS_7JSValueE@Base 5.6.1 _ZNK3JSC12JSRopeString11resolveRopeEPNS_9ExecStateE@Base 5.0.2 _ZNK3JSC12PropertySlot14functionGetterEPNS_9ExecStateE@Base 5.0.2 _ZNK3JSC17DebuggerCallFrame10thisObjectEv@Base 5.0.2 @@ -3000,17 +3001,18 @@ (optional=templinst|subst)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJRK{size_t}EEEvDpOT_@Base 5.2.0 (optional=templinst|subst)_ZNSt6vectorI{size_t}SaI{size_t}EE19_M_emplace_back_auxIJ{size_t}EEEvDpOT_@Base 5.2.0 (optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_@Base 5.0.2 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0 + (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 5.2.0 (optional=templinst)_ZNSt8_Rb_treeI10TBasicTypeSt4pairIKS0_10TPrecisionESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 5.0.2 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_@Base 5.4.2 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 5.4.2 + (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 5.4.2 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_9TBehaviorESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 5.4.2 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 5.4.2 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 5.4.2 + (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 5.4.2 (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 5.4.2 (optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EES0_ISt17_Rb_tree_iteratorIS1_EbEOT_@Base 5.4.1 (optional=templinst|subst)_ZNSt8_Rb_treeISt4pairIi{uint64_t}ES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 5.4.1 - (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeImEPKS9_PSt18_Rb_tree_node_baseRT_@Base 5.6.1 + (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeImEPKS9_PSt18_Rb_tree_node_baseRT_@Base 5.7.1 + (optional=templinst|arch=armel armhf)_ZNSt8_Rb_treeIyySt9_IdentityIyESt4lessIyESaIyEE4findERKy@Base 5.6.1 (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE16_M_insert_uniqueIRK{uint64_t}EESt4pairISt17_Rb_tree_iteratorI{uint64_t}EbEOT_@Base 5.3.0 (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE5eraseERK{uint64_t}@Base 5.3.0 (optional=templinst|subst)_ZNSt8_Rb_treeI{uint64_t}{uint64_t}St9_IdentityI{uint64_t}ESt4lessI{uint64_t}ESaI{uint64_t}EE8_M_eraseEPSt13_Rb_tree_nodeI{uint64_t}E@Base 5.3.0 @@ -3115,17 +3117,18 @@ (c++)"non-virtual thunk to QQuickWebPage::~QQuickWebPage()@Base" 5.0.2 (c++)"non-virtual thunk to QQuickWebView::componentComplete()@Base" 5.0.2 (c++)"non-virtual thunk to QQuickWebView::~QQuickWebView()@Base" 5.0.2 -# SymbolsHelper-Confirmed: 5.6.0~rc ppc64el +# SymbolsHelper-Confirmed: 5.7.1 amd64 arm64 kfreebsd-amd64 mips64el ppc64el s390x libQt5WebKitWidgets.so.5 libqt5webkit5 #MINVER# - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.0@Qt_5.0 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.1@Qt_5.1 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.2@Qt_5.2 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.3@Qt_5.3 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.4@Qt_5.4 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.5@Qt_5.5 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5.6@Qt_5.6 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5@Qt_5 5.6.1 - (optional=linker|arch=!hppa !mips64el !s390x !sparc64)Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.0@Qt_5.0 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.1@Qt_5.1 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.2@Qt_5.2 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.3@Qt_5.3 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.4@Qt_5.4 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.5@Qt_5.5 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.6@Qt_5.6 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5.7@Qt_5.7 5.7.0 + (optional=linker|arch=!hppa !s390x)Qt_5@Qt_5 5.6.1 + (optional=linker|arch=!hppa !s390x)Qt_5_PRIVATE_API@Qt_5_PRIVATE_API 5.6.1 _ZN13QWebInspector10closeEventEP11QCloseEvent@Qt_5 5.6.0~rc _ZN13QWebInspector11qt_metacallEN11QMetaObject4CallEiPPv@Qt_5 5.6.0~rc _ZN13QWebInspector11qt_metacastEPKc@Qt_5 5.6.0~rc diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/debian/patches/no_gc_sections.diff qtwebkit-opensource-src-5.7.1+dfsg/debian/patches/no_gc_sections.diff --- qtwebkit-opensource-src-5.6.1+dfsg/debian/patches/no_gc_sections.diff 2016-12-23 10:17:01.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/debian/patches/no_gc_sections.diff 2016-12-15 20:22:09.000000000 +0000 @@ -14,7 +14,7 @@ --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri -@@ -313,7 +313,7 @@ +@@ -314,7 +314,7 @@ unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/debian/rules qtwebkit-opensource-src-5.7.1+dfsg/debian/rules --- qtwebkit-opensource-src-5.6.1+dfsg/debian/rules 2016-12-23 10:17:01.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/debian/rules 2016-12-15 20:22:09.000000000 +0000 @@ -16,10 +16,6 @@ disabled_jit_architectures := armel mips mipsel disabled_pch_architectures := amd64 powerpc s390x -debian_version = $(shell dpkg-parsechangelog -SVersion) -upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version))) -upstream_version = $(firstword $(subst +, ,$(debian_version))) - %: dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper @@ -54,9 +50,6 @@ # Run qmake again now with the proper values. qmake - # Upstream 5.6.0 RC tarball was generated improperly and has no synced headers - /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version) - override_dh_auto_build-indep: dh_auto_build -- sub-Source-QtWebKit-pro-clean dh_auto_build -- -CSource -fMakefile.api docs diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/dist/changes-5.6.2 qtwebkit-opensource-src-5.7.1+dfsg/dist/changes-5.6.2 --- qtwebkit-opensource-src-5.6.1+dfsg/dist/changes-5.6.2 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/dist/changes-5.6.2 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1,40 @@ +Qt 5.6.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* Library * +**************************************************************************** + +QtWebkit +-------- + - [QTBUG-53532] Fixed drawing of zoomed border-image with repeat mode + - [QTBUG-53989] Suppressed warnings about image format being blocked for + invalid images + - [QTBUG-55171] Dotted borders having radius are painted as solid + - [QTBUG-55175] Border dashes have wrong length + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +- Fixed compilation on macOS when targeting 10.9 or higher +- Fixed compilation on OpenBSD in C++11 mode +- Various other build fixes diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/dist/changes-5.7.1 qtwebkit-opensource-src-5.7.1+dfsg/dist/changes-5.7.1 --- qtwebkit-opensource-src-5.6.1+dfsg/dist/changes-5.7.1 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/dist/changes-5.7.1 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1,40 @@ +Qt 5.7.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.7.0. + +Qt 5.7.1 contains a merge from Qt 5.6.2 and all changes in Qt 5.6.2 are +also in Qt 5.7.1. For more see changes-5.6.2. + +Qt 5.7 introduces many new features and improvements as well as bugfixes +over the 5.6.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +QtWebkit +-------- + - [QTBUG-37899] Report JavaScript errors from Qt signals and slots to Console + - [QTBUG-56302] Fixed painting of checkbox and radiobutton indicators + - Support unprefixed CSS3 Flexbox properties, which are required for correct + layout in some real world web content + - Backported a few fixes for CSS calc() from WebKit upstream + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + - Fixed build with Python 3 diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/bytearraytestdata.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/bytearraytestdata.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/bytearraytestdata.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/bytearraytestdata.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qhttpheader_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qhttpheader_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qhttpheader_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qhttpheader_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qhttpheader_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkreply_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkreply_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkreply_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkreply_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkrequest_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquicknetworkrequest_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickurlschemedelegate_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickurlschemedelegate_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickurlschemedelegate_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickurlschemedelegate_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebpage_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qquickwebview_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qrawwebview_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qtwebsecurityorigin_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qtwebsecurityorigin_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qtwebsecurityorigin_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qtwebsecurityorigin_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebchannelwebkittransport_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebchannelwebkittransport_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebchannelwebkittransport_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebchannelwebkittransport_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdatabase_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdatabase_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdatabase_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdatabase_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebdatabase_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebdownloaditem_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebelement_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebelement_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebelement_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebelement_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebelement_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebhistory_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebhistory_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebhistory_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebhistory_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebhistory_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebiconimageprovider_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebiconimageprovider_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebiconimageprovider_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebiconimageprovider_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebkittest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebkittest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebkittest_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebkittest_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebloadrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebloadrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebloadrequest_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebloadrequest_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebloadrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationhistory_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationrequest_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebnavigationrequest_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpermissionrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpermissionrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpermissionrequest_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpermissionrequest_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebplugindatabase_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebplugindatabase_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebplugindatabase_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebplugindatabase_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebplugindatabase_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebpreferences_p_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebscriptworld.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebscriptworld_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebscriptworld_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebsecurityorigin_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebsecurityorigin_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebsecurityorigin_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/qwebsecurityorigin_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/Api/qwebsecurityorigin_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/testwindow.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/testwindow.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/testwindow.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/testwindow.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/testwindow.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/util.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/util.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/util.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.6.1/QtWebKit/private/util.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/util.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/bytearraytestdata.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/bytearraytestdata.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/bytearraytestdata.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/bytearraytestdata.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qhttpheader_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qhttpheader_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qhttpheader_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qhttpheader_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qhttpheader_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkreply_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkreply_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkreply_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkreply_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkrequest_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquicknetworkrequest_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickurlschemedelegate_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickurlschemedelegate_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickurlschemedelegate_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickurlschemedelegate_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebpage_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qquickwebview_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qrawwebview_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qtwebsecurityorigin_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qtwebsecurityorigin_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qtwebsecurityorigin_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qtwebsecurityorigin_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebchannelwebkittransport_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebchannelwebkittransport_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebchannelwebkittransport_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebchannelwebkittransport_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdatabase_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdatabase_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdatabase_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdatabase_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebdatabase_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebdownloaditem_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebelement_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebelement_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebelement_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebelement_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebelement_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebhistory_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebhistory_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebhistory_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebhistory_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebhistory_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebiconimageprovider_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebiconimageprovider_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebiconimageprovider_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebiconimageprovider_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebkittest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebkittest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebkittest_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebkittest_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebloadrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebloadrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebloadrequest_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebloadrequest_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebloadrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationhistory_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationrequest_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebnavigationrequest_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpermissionrequest_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpermissionrequest_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpermissionrequest_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpermissionrequest_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebplugindatabase_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebplugindatabase_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebplugindatabase_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebplugindatabase_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebplugindatabase_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpreferences_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebpreferences_p_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebscriptworld.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebscriptworld_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebscriptworld_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebsecurityorigin_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebsecurityorigin_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebsecurityorigin_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/qwebsecurityorigin_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/Api/qwebsecurityorigin_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/testwindow.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/testwindow.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/testwindow.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/testwindow.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/testwindow.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/util.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/util.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/util.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/5.7.1/QtWebKit/private/util.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit2/UIProcess/API/qt/tests/util.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/qtwebkitversion.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/qtwebkitversion.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKit/qtwebkitversion.h 2016-06-02 06:59:22.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKit/qtwebkitversion.h 2016-12-02 11:08:36.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBKIT_VERSION_H #define QT_QTWEBKIT_VERSION_H -#define QTWEBKIT_VERSION_STR "5.6.1" +#define QTWEBKIT_VERSION_STR "5.7.1" -#define QTWEBKIT_VERSION 0x050601 +#define QTWEBKIT_VERSION 0x050701 #endif // QT_QTWEBKIT_VERSION_H diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebframe_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebframe_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebframe_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebframe_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/WidgetApi/qwebframe_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebinspector_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebinspector_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebinspector_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebinspector_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/WidgetApi/qwebinspector_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebpage_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebpage_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebpage_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebpage_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/WidgetApi/qwebpage_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebviewaccessible_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebviewaccessible_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebviewaccessible_p.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.6.1/QtWebKitWidgets/private/qwebviewaccessible_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebframe_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebframe_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebframe_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebframe_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/WidgetApi/qwebframe_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebinspector_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebinspector_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebinspector_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebinspector_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/WidgetApi/qwebinspector_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebpage_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebpage_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebpage_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebpage_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/WidgetApi/qwebpage_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebviewaccessible_p.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebviewaccessible_p.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebviewaccessible_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/5.7.1/QtWebKitWidgets/private/qwebviewaccessible_p.h 2016-10-14 19:28:46.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/qtwebkitwidgetsversion.h qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/qtwebkitwidgetsversion.h --- qtwebkit-opensource-src-5.6.1+dfsg/include/QtWebKitWidgets/qtwebkitwidgetsversion.h 2016-06-02 06:59:22.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/include/QtWebKitWidgets/qtwebkitwidgetsversion.h 2016-12-02 11:08:36.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBKITWIDGETS_VERSION_H #define QT_QTWEBKITWIDGETS_VERSION_H -#define QTWEBKITWIDGETS_VERSION_STR "5.6.1" +#define QTWEBKITWIDGETS_VERSION_STR "5.7.1" -#define QTWEBKITWIDGETS_VERSION 0x050601 +#define QTWEBKITWIDGETS_VERSION 0x050701 #endif // QT_QTWEBKITWIDGETS_VERSION_H diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/.qmake.conf qtwebkit-opensource-src-5.7.1+dfsg/.qmake.conf --- qtwebkit-opensource-src-5.6.1+dfsg/.qmake.conf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/.qmake.conf 2016-10-14 19:28:46.000000000 +0000 @@ -3,4 +3,4 @@ QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR load(qt_build_config) -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.7.1 diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py qtwebkit-opensource-src-5.7.1+dfsg/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py --- qtwebkit-opensource-src-5.6.1+dfsg/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/JavaScriptCore/disassembler/udis86/ud_opcode.py 2016-10-14 19:28:46.000000000 +0000 @@ -115,9 +115,9 @@ '/mod' : lambda v: '00' if v == '!11' else '01', # Mode extensions: # (16, 32, 64) => (00, 01, 02) - '/o' : lambda v: "%02x" % (int(v) / 32), - '/a' : lambda v: "%02x" % (int(v) / 32), - '/m' : lambda v: "%02x" % (int(v) / 32), + '/o' : lambda v: "%02x" % (int(v) // 32), + '/a' : lambda v: "%02x" % (int(v) // 32), + '/m' : lambda v: "%02x" % (int(v) // 32), '/sse' : lambda v: UdOpcodeTables.OpcExtIndex['sse'][v] } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/JavaScriptCore/jsc.pro qtwebkit-opensource-src-5.7.1+dfsg/Source/JavaScriptCore/jsc.pro --- qtwebkit-opensource-src-5.6.1+dfsg/Source/JavaScriptCore/jsc.pro 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/JavaScriptCore/jsc.pro 2016-10-14 19:28:46.000000000 +0000 @@ -13,7 +13,7 @@ win32-*: CONFIG += console win32-msvc*: CONFIG += exceptions_off stl_off -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0)"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 WEBKIT += javascriptcore wtf diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/bridge/qt/qt_runtime.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/bridge/qt/qt_runtime.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/bridge/qt/qt_runtime.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/bridge/qt/qt_runtime.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -1577,7 +1577,12 @@ args[i] = convertQVariantToValue(m_context, m_rootObject, QVariant(argType, argv[i+1]), ignoredException); } - JSObjectCallAsFunction(m_context, m_receiverFunction, m_receiver, argc, args.data(), 0); + JSValueRef call_exception = 0; + ExecState* exec = toJS(m_context); + JSObjectCallAsFunction(m_context, m_receiverFunction, m_receiver, argc, args.data(), &call_exception); + if (call_exception) { + WebCore::reportException(exec, toJS(exec, call_exception)); + } } bool QtConnectionObject::match(JSContextRef context, QObject* sender, int signalIndex, JSObjectRef receiver, JSObjectRef receiverFunction) diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/BasicShapeFunctions.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/BasicShapeFunctions.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/BasicShapeFunctions.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/BasicShapeFunctions.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -38,7 +38,7 @@ namespace WebCore { -PassRefPtr valueForBasicShape(const BasicShape* basicShape) +PassRefPtr valueForBasicShape(const RenderStyle* style, const BasicShape* basicShape) { RefPtr basicShapeValue; switch (basicShape->type()) { @@ -46,12 +46,12 @@ const BasicShapeRectangle* rectangle = static_cast(basicShape); RefPtr rectangleValue = CSSBasicShapeRectangle::create(); - rectangleValue->setX(cssValuePool().createValue(rectangle->x())); - rectangleValue->setY(cssValuePool().createValue(rectangle->y())); - rectangleValue->setWidth(cssValuePool().createValue(rectangle->width())); - rectangleValue->setHeight(cssValuePool().createValue(rectangle->height())); - rectangleValue->setRadiusX(cssValuePool().createValue(rectangle->cornerRadiusX())); - rectangleValue->setRadiusY(cssValuePool().createValue(rectangle->cornerRadiusY())); + rectangleValue->setX(cssValuePool().createValue(rectangle->x(), style)); + rectangleValue->setY(cssValuePool().createValue(rectangle->y(), style)); + rectangleValue->setWidth(cssValuePool().createValue(rectangle->width(), style)); + rectangleValue->setHeight(cssValuePool().createValue(rectangle->height(), style)); + rectangleValue->setRadiusX(cssValuePool().createValue(rectangle->cornerRadiusX(), style)); + rectangleValue->setRadiusY(cssValuePool().createValue(rectangle->cornerRadiusY(), style)); basicShapeValue = rectangleValue.release(); break; @@ -60,9 +60,9 @@ const BasicShapeCircle* circle = static_cast(basicShape); RefPtr circleValue = CSSBasicShapeCircle::create(); - circleValue->setCenterX(cssValuePool().createValue(circle->centerX())); - circleValue->setCenterY(cssValuePool().createValue(circle->centerY())); - circleValue->setRadius(cssValuePool().createValue(circle->radius())); + circleValue->setCenterX(cssValuePool().createValue(circle->centerX(), style)); + circleValue->setCenterY(cssValuePool().createValue(circle->centerY(), style)); + circleValue->setRadius(cssValuePool().createValue(circle->radius(), style)); basicShapeValue = circleValue.release(); break; @@ -71,10 +71,10 @@ const BasicShapeEllipse* ellipse = static_cast(basicShape); RefPtr ellipseValue = CSSBasicShapeEllipse::create(); - ellipseValue->setCenterX(cssValuePool().createValue(ellipse->centerX())); - ellipseValue->setCenterY(cssValuePool().createValue(ellipse->centerY())); - ellipseValue->setRadiusX(cssValuePool().createValue(ellipse->radiusX())); - ellipseValue->setRadiusY(cssValuePool().createValue(ellipse->radiusY())); + ellipseValue->setCenterX(cssValuePool().createValue(ellipse->centerX(), style)); + ellipseValue->setCenterY(cssValuePool().createValue(ellipse->centerY(), style)); + ellipseValue->setRadiusX(cssValuePool().createValue(ellipse->radiusX(), style)); + ellipseValue->setRadiusY(cssValuePool().createValue(ellipse->radiusY(), style)); basicShapeValue = ellipseValue.release(); break; @@ -86,7 +86,7 @@ polygonValue->setWindRule(polygon->windRule()); const Vector& values = polygon->values(); for (unsigned i = 0; i < values.size(); i += 2) - polygonValue->appendPoint(cssValuePool().createValue(values.at(i)), cssValuePool().createValue(values.at(i + 1))); + polygonValue->appendPoint(cssValuePool().createValue(values.at(i), style), cssValuePool().createValue(values.at(i + 1), style)); basicShapeValue = polygonValue.release(); break; @@ -95,12 +95,12 @@ const BasicShapeInsetRectangle* rectangle = static_cast(basicShape); RefPtr rectangleValue = CSSBasicShapeInsetRectangle::create(); - rectangleValue->setTop(cssValuePool().createValue(rectangle->top())); - rectangleValue->setRight(cssValuePool().createValue(rectangle->right())); - rectangleValue->setBottom(cssValuePool().createValue(rectangle->bottom())); - rectangleValue->setLeft(cssValuePool().createValue(rectangle->left())); - rectangleValue->setRadiusX(cssValuePool().createValue(rectangle->cornerRadiusX())); - rectangleValue->setRadiusY(cssValuePool().createValue(rectangle->cornerRadiusY())); + rectangleValue->setTop(cssValuePool().createValue(rectangle->top(), style)); + rectangleValue->setRight(cssValuePool().createValue(rectangle->right(), style)); + rectangleValue->setBottom(cssValuePool().createValue(rectangle->bottom(), style)); + rectangleValue->setLeft(cssValuePool().createValue(rectangle->left(), style)); + rectangleValue->setRadiusX(cssValuePool().createValue(rectangle->cornerRadiusX(), style)); + rectangleValue->setRadiusY(cssValuePool().createValue(rectangle->cornerRadiusY(), style)); basicShapeValue = rectangleValue.release(); break; @@ -113,7 +113,7 @@ static Length convertToLength(const RenderStyle* style, const RenderStyle* rootStyle, CSSPrimitiveValue* value) { - return value->convertToLength(style, rootStyle, style->effectiveZoom()); + return value->convertToLength(style, rootStyle, style->effectiveZoom()); } PassRefPtr basicShapeForValue(const RenderStyle* style, const RenderStyle* rootStyle, const CSSBasicShape* basicShapeValue) diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/BasicShapeFunctions.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/BasicShapeFunctions.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/BasicShapeFunctions.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/BasicShapeFunctions.h 2016-10-14 19:28:46.000000000 +0000 @@ -39,7 +39,7 @@ class CSSValue; class RenderStyle; -PassRefPtr valueForBasicShape(const BasicShape*); +PassRefPtr valueForBasicShape(const RenderStyle*, const BasicShape*); PassRefPtr basicShapeForValue(const RenderStyle*, const RenderStyle* rootStyle, const CSSBasicShape*); } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSCalculationValue.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSCalculationValue.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSCalculationValue.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSCalculationValue.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -31,10 +31,12 @@ #include "config.h" #include "CSSCalculationValue.h" +#include "CSSPrimitiveValueMappings.h" #include "CSSValueList.h" #include "Length.h" #include "StyleResolver.h" +#include #include #include #include @@ -55,8 +57,6 @@ case CSSPrimitiveValue::CSS_NUMBER: case CSSPrimitiveValue::CSS_PARSER_INTEGER: return CalcNumber; - case CSSPrimitiveValue::CSS_PERCENTAGE: - return CalcPercent; case CSSPrimitiveValue::CSS_EMS: case CSSPrimitiveValue::CSS_EXS: case CSSPrimitiveValue::CSS_PX: @@ -68,6 +68,19 @@ case CSSPrimitiveValue::CSS_REMS: case CSSPrimitiveValue::CSS_CHS: return CalcLength; + case CSSPrimitiveValue::CSS_PERCENTAGE: + return CalcPercent; + case CSSPrimitiveValue::CSS_DEG: + case CSSPrimitiveValue::CSS_RAD: + case CSSPrimitiveValue::CSS_GRAD: + case CSSPrimitiveValue::CSS_TURN: + return CalcAngle; + case CSSPrimitiveValue::CSS_MS: + case CSSPrimitiveValue::CSS_S: + return CalcTime; + case CSSPrimitiveValue::CSS_HZ: + case CSSPrimitiveValue::CSS_KHZ: + return CalcFrequency; #if ENABLE(CSS_VARIABLES) case CSSPrimitiveValue::CSS_VARIABLE_NAME: return CalcVariable; @@ -77,6 +90,72 @@ } } +static bool hasDoubleValue(CSSPrimitiveValue::UnitTypes type) +{ + switch (type) { + case CSSPrimitiveValue::CSS_NUMBER: + case CSSPrimitiveValue::CSS_PARSER_INTEGER: + case CSSPrimitiveValue::CSS_PERCENTAGE: + case CSSPrimitiveValue::CSS_EMS: + case CSSPrimitiveValue::CSS_EXS: + case CSSPrimitiveValue::CSS_CHS: + case CSSPrimitiveValue::CSS_REMS: + case CSSPrimitiveValue::CSS_PX: + case CSSPrimitiveValue::CSS_CM: + case CSSPrimitiveValue::CSS_MM: + case CSSPrimitiveValue::CSS_IN: + case CSSPrimitiveValue::CSS_PT: + case CSSPrimitiveValue::CSS_PC: + case CSSPrimitiveValue::CSS_DEG: + case CSSPrimitiveValue::CSS_RAD: + case CSSPrimitiveValue::CSS_GRAD: + case CSSPrimitiveValue::CSS_MS: + case CSSPrimitiveValue::CSS_S: + case CSSPrimitiveValue::CSS_HZ: + case CSSPrimitiveValue::CSS_KHZ: + case CSSPrimitiveValue::CSS_DIMENSION: + case CSSPrimitiveValue::CSS_VW: + case CSSPrimitiveValue::CSS_VH: + case CSSPrimitiveValue::CSS_VMIN: + case CSSPrimitiveValue::CSS_VMAX: + case CSSPrimitiveValue::CSS_DPPX: + case CSSPrimitiveValue::CSS_DPI: + case CSSPrimitiveValue::CSS_DPCM: + return true; + case CSSPrimitiveValue::CSS_UNKNOWN: + case CSSPrimitiveValue::CSS_STRING: + case CSSPrimitiveValue::CSS_URI: + case CSSPrimitiveValue::CSS_IDENT: + case CSSPrimitiveValue::CSS_ATTR: + case CSSPrimitiveValue::CSS_COUNTER: + case CSSPrimitiveValue::CSS_RECT: + case CSSPrimitiveValue::CSS_RGBCOLOR: + case CSSPrimitiveValue::CSS_PAIR: + case CSSPrimitiveValue::CSS_UNICODE_RANGE: + case CSSPrimitiveValue::CSS_PARSER_OPERATOR: + case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR: + case CSSPrimitiveValue::CSS_PARSER_IDENTIFIER: + case CSSPrimitiveValue::CSS_TURN: + case CSSPrimitiveValue::CSS_COUNTER_NAME: + case CSSPrimitiveValue::CSS_SHAPE: + case CSSPrimitiveValue::CSS_QUAD: + case CSSPrimitiveValue::CSS_CALC: + case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER: + case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH: +#if ENABLE(CSS_VARIABLES) + case CSSPrimitiveValue::CSS_VARIABLE_NAME: +#endif + case CSSPrimitiveValue::CSS_PROPERTY_ID: + case CSSPrimitiveValue::CSS_VALUE_ID: +#if ENABLE(DASHBOARD_SUPPORT) + case CSSPrimitiveValue::CSS_DASHBOARD_REGION: +#endif + return false; + }; + ASSERT_NOT_REACHED(); + return false; +} + static String buildCssText(const String& expression) { StringBuilder result; @@ -87,7 +166,7 @@ result.append(expression); if (expressionHasSingleTerm) result.append(')'); - return result.toString(); + return result.toString(); } String CSSCalcValue::customCssText() const @@ -115,10 +194,10 @@ double CSSCalcValue::clampToPermittedRange(double value) const { return m_nonNegative && value < 0 ? 0 : value; -} - -double CSSCalcValue::doubleValue() const -{ +} + +double CSSCalcValue::doubleValue() const +{ return clampToPermittedRange(m_expression->doubleValue()); } @@ -126,20 +205,27 @@ { return clampToPermittedRange(m_expression->computeLengthPx(currentStyle, rootStyle, multiplier, computingFontSize)); } - -CSSCalcExpressionNode::~CSSCalcExpressionNode() + +CSSCalcExpressionNode::~CSSCalcExpressionNode() { } - + class CSSCalcPrimitiveValue : public CSSCalcExpressionNode { WTF_MAKE_FAST_ALLOCATED; public: - static PassRefPtr create(CSSPrimitiveValue* value, bool isInteger) + static PassRefPtr create(PassRefPtr value, bool isInteger) { return adoptRef(new CSSCalcPrimitiveValue(value, isInteger)); } - + + static PassRefPtr create(double value, CSSPrimitiveValue::UnitTypes type, bool isInteger) + { + if (std::isnan(value) || std::isinf(value)) + return 0; + return adoptRef(new CSSCalcPrimitiveValue(CSSPrimitiveValue::create(value, type).get(), isInteger)); + } + virtual bool isZero() const { return !m_value->getDoubleValue(); @@ -155,7 +241,7 @@ { return m_value->customSerializeResolvingVariables(variables); } - + virtual bool hasVariableReference() const { return m_value->isVariableName(); @@ -170,39 +256,36 @@ case CalcLength: return adoptPtr(new CalcExpressionNumber(m_value->computeLength(style, rootStyle, zoom))); case CalcPercent: - case CalcPercentLength: - return adoptPtr(new CalcExpressionLength(StyleResolver::convertToFloatLength(m_value.get(), style, rootStyle, zoom))); + case CalcPercentLength: { + CSSPrimitiveValue* primitiveValue = m_value.get(); + return adoptPtr(new CalcExpressionLength(primitiveValue + ? primitiveValue->convertToLength(style, rootStyle, zoom) + : Length(Undefined))); + } // Only types that could be part of a Length expression can be converted // to a CalcExpressionNode. CalcPercentNumber makes no sense as a Length. case CalcPercentNumber: + case CalcAngle: + case CalcTime: + case CalcFrequency: #if ENABLE(CSS_VARIABLES) case CalcVariable: #endif case CalcOther: ASSERT_NOT_REACHED(); } + ASSERT_NOT_REACHED(); return nullptr; } virtual double doubleValue() const { - switch (m_category) { - case CalcNumber: - case CalcPercent: + if (hasDoubleValue(primitiveType())) return m_value->getDoubleValue(); - case CalcLength: - case CalcPercentLength: - case CalcPercentNumber: -#if ENABLE(CSS_VARIABLES) - case CalcVariable: -#endif - case CalcOther: - ASSERT_NOT_REACHED(); - break; - } + ASSERT_NOT_REACHED(); return 0; } - + virtual double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier, bool computingFontSize) const { switch (m_category) { @@ -213,6 +296,9 @@ return m_value->getDoubleValue(); case CalcPercentLength: case CalcPercentNumber: + case CalcAngle: + case CalcTime: + case CalcFrequency: #if ENABLE(CSS_VARIABLES) case CalcVariable: #endif @@ -220,7 +306,8 @@ ASSERT_NOT_REACHED(); break; } - return 0; + ASSERT_NOT_REACHED(); + return 0; } virtual bool equals(const CSSCalcExpressionNode& other) const @@ -232,9 +319,13 @@ } virtual Type type() const { return CssCalcPrimitiveValue; } - + virtual CSSPrimitiveValue::UnitTypes primitiveType() const + { + return CSSPrimitiveValue::UnitTypes(m_value->primitiveType()); + } + private: - explicit CSSCalcPrimitiveValue(CSSPrimitiveValue* value, bool isInteger) + explicit CSSCalcPrimitiveValue(PassRefPtr value, bool isInteger) : CSSCalcExpressionNode(unitCategory((CSSPrimitiveValue::UnitTypes)value->primitiveType()), isInteger) , m_value(value) { @@ -243,21 +334,21 @@ RefPtr m_value; }; -static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = { - { CalcNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther }, - { CalcOther, CalcLength, CalcPercentLength, CalcOther, CalcPercentLength }, - { CalcPercentNumber, CalcPercentLength, CalcPercent, CalcPercentNumber, CalcPercentLength }, - { CalcPercentNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther }, - { CalcOther, CalcPercentLength, CalcPercentLength, CalcOther, CalcPercentLength }, -}; +static const CalculationCategory addSubtractResult[CalcAngle][CalcAngle] = { +// CalcNumber CalcLength CalcPercent CalcPercentNumber CalcPercentLength + { CalcNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther }, // CalcNumber + { CalcOther, CalcLength, CalcPercentLength, CalcOther, CalcPercentLength }, // CalcLength + { CalcPercentNumber, CalcPercentLength, CalcPercent, CalcPercentNumber, CalcPercentLength }, // CalcPercent + { CalcPercentNumber, CalcOther, CalcPercentNumber, CalcPercentNumber, CalcOther }, // CalcPercentNumber + { CalcOther, CalcPercentLength, CalcPercentLength, CalcOther, CalcPercentLength }, // CalcPercentLength +}; static CalculationCategory determineCategory(const CSSCalcExpressionNode& leftSide, const CSSCalcExpressionNode& rightSide, CalcOperator op) { CalculationCategory leftCategory = leftSide.category(); CalculationCategory rightCategory = rightSide.category(); - - if (leftCategory == CalcOther || rightCategory == CalcOther) - return CalcOther; + ASSERT(leftCategory < CalcOther); + ASSERT(rightCategory < CalcOther); #if ENABLE(CSS_VARIABLES) if (leftCategory == CalcVariable || rightCategory == CalcVariable) @@ -266,10 +357,14 @@ switch (op) { case CalcAdd: - case CalcSubtract: - return addSubtractResult[leftCategory][rightCategory]; + case CalcSubtract: + if (leftCategory < CalcAngle && rightCategory < CalcAngle) + return addSubtractResult[leftCategory][rightCategory]; + if (leftCategory == rightCategory) + return leftCategory; + return CalcOther; case CalcMultiply: - if (leftCategory != CalcNumber && rightCategory != CalcNumber) + if (leftCategory != CalcNumber && rightCategory != CalcNumber) return CalcOther; return leftCategory == CalcNumber ? rightCategory : leftCategory; case CalcDivide: @@ -277,18 +372,26 @@ return CalcOther; return leftCategory; } - + ASSERT_NOT_REACHED(); return CalcOther; } +static bool isIntegerResult(const CSSCalcExpressionNode* leftSide, const CSSCalcExpressionNode* rightSide, CalcOperator op) +{ + // Performs W3C spec's type checking for calc integers. + // http://www.w3.org/TR/css3-values/#calc-type-checking + return op != CalcDivide && leftSide->isInteger() && rightSide->isInteger(); +} + class CSSCalcBinaryOperation : public CSSCalcExpressionNode { public: - static PassRefPtr create(PassRefPtr leftSide, PassRefPtr rightSide, CalcOperator op) + static PassRefPtr create(PassRefPtr leftSide, PassRefPtr rightSide, CalcOperator op) { - ASSERT(leftSide->category() != CalcOther && rightSide->category() != CalcOther); - + ASSERT(leftSide->category() < CalcOther); + ASSERT(rightSide->category() < CalcOther); + CalculationCategory newCategory = determineCategory(*leftSide, *rightSide, op); if (newCategory == CalcOther) @@ -296,7 +399,65 @@ return adoptRef(new CSSCalcBinaryOperation(leftSide, rightSide, op, newCategory)); } - + + static PassRefPtr createSimplified(PassRefPtr leftSide, PassRefPtr rightSide, CalcOperator op) + { + CalculationCategory leftCategory = leftSide->category(); + CalculationCategory rightCategory = rightSide->category(); + ASSERT(leftCategory < CalcOther); + ASSERT(rightCategory < CalcOther); + + bool isInteger = isIntegerResult(leftSide.get(), rightSide.get(), op); + + // Simplify numbers. + if (leftCategory == CalcNumber && rightCategory == CalcNumber) { + CSSPrimitiveValue::UnitTypes evaluationType = isInteger ? CSSPrimitiveValue::CSS_PARSER_INTEGER : CSSPrimitiveValue::CSS_NUMBER; + return CSSCalcPrimitiveValue::create(evaluateOperator(leftSide->doubleValue(), rightSide->doubleValue(), op), evaluationType, isInteger); + } + + // Simplify addition and subtraction between same types. + if (op == CalcAdd || op == CalcSubtract) { + if (leftCategory == rightSide->category()) { + CSSPrimitiveValue::UnitTypes leftType = leftSide->primitiveType(); + if (hasDoubleValue(leftType)) { + CSSPrimitiveValue::UnitTypes rightType = rightSide->primitiveType(); + if (leftType == rightType) + return CSSCalcPrimitiveValue::create(evaluateOperator(leftSide->doubleValue(), rightSide->doubleValue(), op), leftType, isInteger); + CSSPrimitiveValue::UnitCategory leftUnitCategory = CSSPrimitiveValue::unitCategory(leftType); + if (leftUnitCategory != CSSPrimitiveValue::UOther && leftUnitCategory == CSSPrimitiveValue::unitCategory(rightType)) { + CSSPrimitiveValue::UnitTypes canonicalType = CSSPrimitiveValue::canonicalUnitTypeForCategory(leftUnitCategory); + if (canonicalType != CSSPrimitiveValue::CSS_UNKNOWN) { + double leftValue = leftSide->doubleValue() * CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(leftType); + double rightValue = rightSide->doubleValue() * CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(rightType); + return CSSCalcPrimitiveValue::create(evaluateOperator(leftValue, rightValue, op), canonicalType, isInteger); + } + } + } + } + } else { + // Simplify multiplying or dividing by a number for simplifiable types. + ASSERT(op == CalcMultiply || op == CalcDivide); + CSSCalcExpressionNode* numberSide = getNumberSide(leftSide.get(), rightSide.get()); + if (!numberSide) + return create(leftSide, rightSide, op); + if (numberSide == leftSide && op == CalcDivide) + return 0; + CSSCalcExpressionNode* otherSide = leftSide == numberSide ? rightSide.get() : leftSide.get(); + + double number = numberSide->doubleValue(); + if (std::isnan(number) || std::isinf(number)) + return 0; + if (op == CalcDivide && !number) + return 0; + + CSSPrimitiveValue::UnitTypes otherType = otherSide->primitiveType(); + if (hasDoubleValue(otherType)) + return CSSCalcPrimitiveValue::create(evaluateOperator(otherSide->doubleValue(), number, op), otherType, isInteger); + } + + return create(leftSide, rightSide, op); + } + virtual bool isZero() const { return !doubleValue(); @@ -313,11 +474,11 @@ return adoptPtr(new CalcExpressionBinaryOperation(left.release(), right.release(), m_operator)); } - virtual double doubleValue() const + virtual double doubleValue() const { return evaluate(m_leftSide->doubleValue(), m_rightSide->doubleValue()); } - + virtual double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier, bool computingFontSize) const { const double leftValue = m_leftSide->computeLengthPx(currentStyle, rootStyle, multiplier, computingFontSize); @@ -335,8 +496,8 @@ result.append(' '); result.append(rightExpression); result.append(')'); - - return result.toString(); + + return result.toString(); } virtual String customCssText() const @@ -369,18 +530,70 @@ virtual Type type() const { return CssCalcBinaryOperation; } + virtual CSSPrimitiveValue::UnitTypes primitiveType() const + { + switch (m_category) { + case CalcNumber: + ASSERT(m_leftSide->category() == CalcNumber && m_rightSide->category() == CalcNumber); + if (m_isInteger) + return CSSPrimitiveValue::CSS_PARSER_INTEGER; + return CSSPrimitiveValue::CSS_NUMBER; + case CalcLength: + case CalcPercent: { + if (m_leftSide->category() == CalcNumber) + return m_rightSide->primitiveType(); + if (m_rightSide->category() == CalcNumber) + return m_leftSide->primitiveType(); + CSSPrimitiveValue::UnitTypes leftType = m_leftSide->primitiveType(); + if (leftType == m_rightSide->primitiveType()) + return leftType; + return CSSPrimitiveValue::CSS_UNKNOWN; + } +#if ENABLE(CSS_VARIABLES) + case CalcVariable: + return CSSPrimitiveValue::CSS_VARIABLE_NAME; +#endif + case CalcAngle: + return CSSPrimitiveValue::CSS_DEG; + case CalcTime: + return CSSPrimitiveValue::CSS_MS; + case CalcFrequency: + return CSSPrimitiveValue::CSS_HZ; + case CalcPercentLength: + case CalcPercentNumber: + case CalcOther: + return CSSPrimitiveValue::CSS_UNKNOWN; + } + ASSERT_NOT_REACHED(); + return CSSPrimitiveValue::CSS_UNKNOWN; + } + private: CSSCalcBinaryOperation(PassRefPtr leftSide, PassRefPtr rightSide, CalcOperator op, CalculationCategory category) - : CSSCalcExpressionNode(category, leftSide->isInteger() && rightSide->isInteger()) + : CSSCalcExpressionNode(category, isIntegerResult(leftSide.get(), rightSide.get(), op)) , m_leftSide(leftSide) , m_rightSide(rightSide) , m_operator(op) { } - - double evaluate(double leftValue, double rightValue) const + + static CSSCalcExpressionNode* getNumberSide(CSSCalcExpressionNode* leftSide, CSSCalcExpressionNode* rightSide) + { + if (leftSide->category() == CalcNumber) + return leftSide; + if (rightSide->category() == CalcNumber) + return rightSide; + return 0; + } + + double evaluate(double leftSide, double rightSide) const + { + return evaluateOperator(leftSide, rightSide, m_operator); + } + + static double evaluateOperator(double leftValue, double rightValue, CalcOperator op) { - switch (m_operator) { + switch (op) { case CalcAdd: return leftValue + rightValue; case CalcSubtract: @@ -394,7 +607,7 @@ } return 0; } - + const RefPtr m_leftSide; const RefPtr m_rightSide; const CalcOperator m_operator; @@ -449,7 +662,7 @@ if (!value || !value->isPrimitiveValue()) return false; - CSSPrimitiveValue* primitiveValue = static_cast(value.get()); + CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value.get()); result->value = CSSCalcPrimitiveValue::create(primitiveValue, parserValue->isInt); ++*index; @@ -459,8 +672,8 @@ bool parseValueTerm(CSSParserValueList* tokens, int depth, unsigned* index, Value* result) { if (checkDepthAndIndex(&depth, *index, tokens) != OK) - return false; - + return false; + if (operatorValue(tokens, *index) == '(') { unsigned currentIndex = *index + 1; if (!parseValueExpression(tokens, depth, ¤tIndex, result)) @@ -478,7 +691,7 @@ bool parseValueMultiplicativeExpression(CSSParserValueList* tokens, int depth, unsigned* index, Value* result) { if (checkDepthAndIndex(&depth, *index, tokens) != OK) - return false; + return false; if (!parseValueTerm(tokens, depth, index, result)) return false; @@ -493,7 +706,7 @@ if (!parseValueTerm(tokens, depth, index, &rhs)) return false; - result->value = CSSCalcBinaryOperation::create(result->value, rhs.value, static_cast(operatorCharacter)); + result->value = CSSCalcBinaryOperation::createSimplified(result->value, rhs.value, static_cast(operatorCharacter)); if (!result->value) return false; } @@ -505,7 +718,7 @@ bool parseAdditiveValueExpression(CSSParserValueList* tokens, int depth, unsigned* index, Value* result) { if (checkDepthAndIndex(&depth, *index, tokens) != OK) - return false; + return false; if (!parseValueMultiplicativeExpression(tokens, depth, index, result)) return false; @@ -520,7 +733,7 @@ if (!parseValueMultiplicativeExpression(tokens, depth, index, &rhs)) return false; - result->value = CSSCalcBinaryOperation::create(result->value, rhs.value, static_cast(operatorCharacter)); + result->value = CSSCalcBinaryOperation::createSimplified(result->value, rhs.value, static_cast(operatorCharacter)); if (!result->value) return false; } @@ -535,16 +748,96 @@ } }; +PassRefPtr CSSCalcValue::createExpressionNode(PassRefPtr value, bool isInteger) +{ + return CSSCalcPrimitiveValue::create(value, isInteger); +} + +PassRefPtr CSSCalcValue::createExpressionNode(PassRefPtr leftSide, PassRefPtr rightSide, CalcOperator op) +{ + return CSSCalcBinaryOperation::create(leftSide, rightSide, op); +} + +PassRefPtr CSSCalcValue::createExpressionNode(const CalcExpressionNode* node, const RenderStyle* style) +{ + switch (node->type()) { + case CalcExpressionNodeNumber: { + float value = toCalcExpressionNumber(node)->value(); + return createExpressionNode(CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER), value == trunc(value)); + } + case CalcExpressionNodeLength: + return createExpressionNode(toCalcExpressionLength(node)->length(), style); + case CalcExpressionNodeBinaryOperation: { + const CalcExpressionBinaryOperation* binaryNode = toCalcExpressionBinaryOperation(node); + return createExpressionNode(createExpressionNode(binaryNode->leftSide(), style), createExpressionNode(binaryNode->rightSide(), style), binaryNode->getOperator()); + } + case CalcExpressionNodeBlendLength: { + // FIXME: (http://webkit.org/b/122036) Create a CSSCalcExpressionNode equivalent of CalcExpressionBlendLength. + const CalcExpressionBlendLength* blendNode = toCalcExpressionBlendLength(node); + const double progress = blendNode->progress(); + const bool isInteger = !progress || (progress == 1); + return createExpressionNode( + createExpressionNode( + createExpressionNode(blendNode->from(), style), + createExpressionNode(CSSPrimitiveValue::create(1 - progress, CSSPrimitiveValue::CSS_NUMBER), isInteger), + CalcMultiply), + createExpressionNode( + createExpressionNode(blendNode->to(), style), + createExpressionNode(CSSPrimitiveValue::create(progress, CSSPrimitiveValue::CSS_NUMBER), isInteger), + CalcMultiply), + CalcAdd); + } + case CalcExpressionNodeUndefined: + ASSERT_NOT_REACHED(); + return 0; + } + ASSERT_NOT_REACHED(); + return 0; +} + +PassRefPtr CSSCalcValue::createExpressionNode(const Length& length, const RenderStyle* style) +{ + switch (length.type()) { + case Percent: + case ViewportPercentageWidth: + case ViewportPercentageHeight: + case ViewportPercentageMin: + case ViewportPercentageMax: + case Fixed: + return createExpressionNode(CSSPrimitiveValue::create(length, style), length.value() == trunc(length.value())); + case Calculated: + return createExpressionNode(length.calculationValue()->expression(), style); + case Auto: + case Intrinsic: + case MinIntrinsic: + case MinContent: + case MaxContent: + case FillAvailable: + case FitContent: + case Relative: + case Undefined: + ASSERT_NOT_REACHED(); + return 0; + } + ASSERT_NOT_REACHED(); + return 0; +} + PassRefPtr CSSCalcValue::create(CSSParserString name, CSSParserValueList* parserValueList, CalculationPermittedValueRange range) -{ - CSSCalcExpressionNodeParser parser; +{ + CSSCalcExpressionNodeParser parser; RefPtr expression; - + if (equalIgnoringCase(name, "calc(") || equalIgnoringCase(name, "-webkit-calc(")) - expression = parser.parseCalc(parserValueList); - // FIXME calc (http://webkit.org/b/16662) Add parsing for min and max here + expression = parser.parseCalc(parserValueList); + // FIXME: calc (http://webkit.org/b/16662) Add parsing for min and max here return expression ? adoptRef(new CSSCalcValue(expression, range)) : 0; } +PassRefPtr CSSCalcValue::create(PassRefPtr expression, CalculationPermittedValueRange range) +{ + return adoptRef(new CSSCalcValue(expression, range)); +} + } // namespace WebCore diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSCalculationValue.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSCalculationValue.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSCalculationValue.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSCalculationValue.h 2016-10-14 19:28:46.000000000 +0000 @@ -32,6 +32,7 @@ #define CSSCalculationValue_h #include "CSSParserValues.h" +#include "CSSPrimitiveValue.h" #include "CSSValue.h" #include "CalculationValue.h" #include @@ -42,9 +43,10 @@ class CSSParserValueList; class CSSValueList; -class RenderStyle; class CalculationValue; class CalcExpressionNode; +class RenderStyle; +struct Length; enum CalculationCategory { CalcNumber = 0, @@ -52,12 +54,15 @@ CalcPercent, CalcPercentNumber, CalcPercentLength, + CalcAngle, + CalcTime, + CalcFrequency, #if ENABLE(CSS_VARIABLES) CalcVariable, #endif CalcOther }; - + class CSSCalcExpressionNode : public RefCounted { public: enum Type { @@ -67,7 +72,7 @@ virtual ~CSSCalcExpressionNode() = 0; virtual bool isZero() const = 0; - virtual PassOwnPtr toCalcValue(const RenderStyle*, const RenderStyle* rootStyle, double zoom = 1.0) const = 0; + virtual PassOwnPtr toCalcValue(const RenderStyle*, const RenderStyle* rootStyle, double zoom = 1.0) const = 0; virtual double doubleValue() const = 0; virtual double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const = 0; virtual String customCssText() const = 0; @@ -78,56 +83,84 @@ virtual bool equals(const CSSCalcExpressionNode& other) const { return m_category == other.m_category && m_isInteger == other.m_isInteger; } virtual Type type() const = 0; - CalculationCategory category() const { return m_category; } + CalculationCategory category() const { return m_category; } + virtual CSSPrimitiveValue::UnitTypes primitiveType() const = 0; bool isInteger() const { return m_isInteger; } - + protected: CSSCalcExpressionNode(CalculationCategory category, bool isInteger) : m_category(category) , m_isInteger(isInteger) { } - + CalculationCategory m_category; bool m_isInteger; }; - + class CSSCalcValue : public CSSValue { public: static PassRefPtr create(CSSParserString name, CSSParserValueList*, CalculationPermittedValueRange); - static PassRefPtr create(CalculationValue*); + static PassRefPtr create(PassRefPtr, CalculationPermittedValueRange = CalculationRangeAll); + static PassRefPtr create(const CalculationValue* value, const RenderStyle* style) { return adoptRef(new CSSCalcValue(value, style)); } + + static PassRefPtr createExpressionNode(PassRefPtr, bool isInteger = false); + static PassRefPtr createExpressionNode(PassRefPtr, PassRefPtr, CalcOperator); + static PassRefPtr createExpressionNode(const CalcExpressionNode*, const RenderStyle*); + static PassRefPtr createExpressionNode(const Length&, const RenderStyle*); PassRefPtr toCalcValue(const RenderStyle* style, const RenderStyle* rootStyle, double zoom = 1.0) const { return CalculationValue::create(m_expression->toCalcValue(style, rootStyle, zoom), m_nonNegative ? CalculationRangeNonNegative : CalculationRangeAll); } CalculationCategory category() const { return m_expression->category(); } - bool isInt() const { return m_expression->isInteger(); } + bool isInt() const { return m_expression->isInteger(); } double doubleValue() const; bool isNegative() const { return m_expression->doubleValue() < 0; } + CalculationPermittedValueRange permittedValueRange() { return m_nonNegative ? CalculationRangeNonNegative : CalculationRangeAll; } double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const; - + + CSSCalcExpressionNode* expressionNode() const { return m_expression.get(); } + String customCssText() const; bool equals(const CSSCalcValue&) const; #if ENABLE(CSS_VARIABLES) String customSerializeResolvingVariables(const HashMap&) const; bool hasVariableReference() const; #endif - -private: + +private: CSSCalcValue(PassRefPtr expression, CalculationPermittedValueRange range) : CSSValue(CalculationClass) , m_expression(expression) , m_nonNegative(range == CalculationRangeNonNegative) { } - + CSSCalcValue(const CalculationValue* value, const RenderStyle* style) + : CSSValue(CalculationClass) + , m_expression(createExpressionNode(value->expression(), style)) + , m_nonNegative(value->isNonNegative()) + { + } + double clampToPermittedRange(double) const; const RefPtr m_expression; const bool m_nonNegative; }; - + +inline CSSCalcValue* toCSSCalcValue(CSSValue* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isCalculationValue()); + return static_cast(value); +} + +inline const CSSCalcValue* toCSSCalcValue(const CSSValue* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isCalculationValue()); + return static_cast(value); +} + } // namespace WebCore #endif // CSSCalculationValue_h diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSComputedStyleDeclaration.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSComputedStyleDeclaration.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -276,15 +276,15 @@ #if ENABLE(CSS_FILTERS) CSSPropertyWebkitFilter, #endif - CSSPropertyWebkitAlignContent, - CSSPropertyWebkitAlignItems, - CSSPropertyWebkitAlignSelf, - CSSPropertyWebkitFlexBasis, - CSSPropertyWebkitFlexGrow, - CSSPropertyWebkitFlexShrink, - CSSPropertyWebkitFlexDirection, - CSSPropertyWebkitFlexWrap, - CSSPropertyWebkitJustifyContent, + CSSPropertyAlignContent, + CSSPropertyAlignItems, + CSSPropertyAlignSelf, + CSSPropertyFlexBasis, + CSSPropertyFlexGrow, + CSSPropertyFlexShrink, + CSSPropertyFlexDirection, + CSSPropertyFlexWrap, + CSSPropertyJustifyContent, CSSPropertyWebkitFontKerning, CSSPropertyWebkitFontSmoothing, CSSPropertyWebkitFontVariantLigatures, @@ -330,7 +330,7 @@ CSSPropertyWebkitMaskRepeat, CSSPropertyWebkitMaskSize, CSSPropertyWebkitNbspMode, - CSSPropertyWebkitOrder, + CSSPropertyOrder, #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) CSSPropertyWebkitOverflowScrolling, #endif @@ -1958,11 +1958,11 @@ return cssValuePool().createValue(style->display()); case CSSPropertyEmptyCells: return cssValuePool().createValue(style->emptyCells()); - case CSSPropertyWebkitAlignContent: + case CSSPropertyAlignContent: return cssValuePool().createValue(style->alignContent()); - case CSSPropertyWebkitAlignItems: + case CSSPropertyAlignItems: return cssValuePool().createValue(style->alignItems()); - case CSSPropertyWebkitAlignSelf: + case CSSPropertyAlignSelf: if (style->alignSelf() == AlignAuto) { Node* parent = styledNode->parentNode(); if (parent && parent->computedStyle()) @@ -1970,23 +1970,23 @@ return cssValuePool().createValue(AlignStretch); } return cssValuePool().createValue(style->alignSelf()); - case CSSPropertyWebkitFlex: - return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthand()); - case CSSPropertyWebkitFlexBasis: + case CSSPropertyFlex: + return getCSSPropertyValuesForShorthandProperties(flexShorthand()); + case CSSPropertyFlexBasis: return cssValuePool().createValue(style->flexBasis()); - case CSSPropertyWebkitFlexDirection: + case CSSPropertyFlexDirection: return cssValuePool().createValue(style->flexDirection()); - case CSSPropertyWebkitFlexFlow: - return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShorthand()); - case CSSPropertyWebkitFlexGrow: + case CSSPropertyFlexFlow: + return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand()); + case CSSPropertyFlexGrow: return cssValuePool().createValue(style->flexGrow()); - case CSSPropertyWebkitFlexShrink: + case CSSPropertyFlexShrink: return cssValuePool().createValue(style->flexShrink()); - case CSSPropertyWebkitFlexWrap: + case CSSPropertyFlexWrap: return cssValuePool().createValue(style->flexWrap()); - case CSSPropertyWebkitJustifyContent: + case CSSPropertyJustifyContent: return cssValuePool().createValue(style->justifyContent()); - case CSSPropertyWebkitOrder: + case CSSPropertyOrder: return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyFloat: if (style->display() != NONE && style->hasOutOfFlowPosition()) @@ -2707,7 +2707,7 @@ case CSSPropertyWebkitClipPath: if (ClipPathOperation* operation = style->clipPath()) { if (operation->getOperationType() == ClipPathOperation::SHAPE) - return valueForBasicShape(static_cast(operation)->basicShape()); + return valueForBasicShape(style.get(), static_cast(operation)->basicShape()); #if ENABLE(SVG) else if (operation->getOperationType() == ClipPathOperation::REFERENCE) { ReferenceClipPathOperation* referenceOperation = static_cast(operation); @@ -2750,7 +2750,7 @@ return cssValuePool().createIdentifierValue(CSSValueNone); } ASSERT(style->shapeInside()->type() == ShapeValue::Shape); - return valueForBasicShape(style->shapeInside()->shape()); + return valueForBasicShape(style.get(), style->shapeInside()->shape()); case CSSPropertyWebkitShapeOutside: if (!style->shapeOutside()) return cssValuePool().createIdentifierValue(CSSValueAuto); @@ -2760,7 +2760,7 @@ return cssValuePool().createIdentifierValue(CSSValueNone); } ASSERT(style->shapeOutside()->type() == ShapeValue::Shape); - return valueForBasicShape(style->shapeOutside()->shape()); + return valueForBasicShape(style.get(), style->shapeOutside()->shape()); #endif #if ENABLE(CSS_FILTERS) case CSSPropertyWebkitFilter: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSParser.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSParser.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSParser.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSParser.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -703,7 +703,7 @@ // inline | block | list-item | run-in | inline-block | table | // inline-table | table-row-group | table-header-group | table-footer-group | table-row | // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit - // -webkit-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid + // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone) return true; if (parserContext.isCSSGridLayoutEnabled && (valueID == CSSValueWebkitGrid || valueID == CSSValueWebkitInlineGrid)) @@ -872,27 +872,27 @@ if (valueID == CSSValueSrgb || valueID == CSSValueDefault) return true; break; - case CSSPropertyWebkitAlignContent: + case CSSPropertyAlignContent: if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch) return true; break; - case CSSPropertyWebkitAlignItems: + case CSSPropertyAlignItems: if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) return true; break; - case CSSPropertyWebkitAlignSelf: + case CSSPropertyAlignSelf: if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) return true; break; - case CSSPropertyWebkitFlexDirection: + case CSSPropertyFlexDirection: if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse) return true; break; - case CSSPropertyWebkitFlexWrap: + case CSSPropertyFlexWrap: if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse) return true; break; - case CSSPropertyWebkitJustifyContent: + case CSSPropertyJustifyContent: if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround) return true; break; @@ -1119,12 +1119,12 @@ case CSSPropertyWebkitColumnBreakBefore: case CSSPropertyWebkitColumnBreakInside: case CSSPropertyWebkitColumnRuleStyle: - case CSSPropertyWebkitAlignContent: - case CSSPropertyWebkitAlignItems: - case CSSPropertyWebkitAlignSelf: - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexWrap: - case CSSPropertyWebkitJustifyContent: + case CSSPropertyAlignContent: + case CSSPropertyAlignItems: + case CSSPropertyAlignSelf: + case CSSPropertyFlexDirection: + case CSSPropertyFlexWrap: + case CSSPropertyJustifyContent: case CSSPropertyWebkitFontKerning: case CSSPropertyWebkitFontSmoothing: case CSSPropertyWebkitHyphens: @@ -1609,6 +1609,13 @@ bool b = false; switch (m_parsedCalculation->category()) { + case CalcNumber: + b = (unitflags & FNumber); + if (!b && (unitflags & FInteger) && m_parsedCalculation->isInt()) + b = true; + if (b && mustBeNonNegative && m_parsedCalculation->isNegative()) + b = false; + break; case CalcLength: b = (unitflags & FLength); break; @@ -1617,19 +1624,21 @@ if (b && mustBeNonNegative && m_parsedCalculation->isNegative()) b = false; break; - case CalcNumber: - b = (unitflags & FNumber); - if (!b && (unitflags & FInteger) && m_parsedCalculation->isInt()) - b = true; - if (b && mustBeNonNegative && m_parsedCalculation->isNegative()) - b = false; - break; case CalcPercentLength: b = (unitflags & FPercent) && (unitflags & FLength); break; case CalcPercentNumber: b = (unitflags & FPercent) && (unitflags & FNumber); break; + case CalcAngle: + b = (unitflags & FAngle); + break; + case CalcTime: + b = (unitflags & FTime); + break; + case CalcFrequency: + b = (unitflags & FFrequency); + break; #if ENABLE(CSS_VARIABLES) case CalcVariable: b = true; @@ -2500,28 +2509,28 @@ validPrimitive = true; break; #endif - case CSSPropertyWebkitFlex: { + case CSSPropertyFlex: { ShorthandScope scope(this, propId); if (id == CSSValueNone) { - addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); - addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); - addProperty(CSSPropertyWebkitFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important); + addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); + addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); + addProperty(CSSPropertyFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important); return true; } return parseFlex(m_valueList.get(), important); } - case CSSPropertyWebkitFlexBasis: + case CSSPropertyFlexBasis: // FIXME: Support intrinsic dimensions too. if (id == CSSValueAuto) validPrimitive = true; else validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg)); break; - case CSSPropertyWebkitFlexGrow: - case CSSPropertyWebkitFlexShrink: + case CSSPropertyFlexGrow: + case CSSPropertyFlexShrink: validPrimitive = validUnit(value, FNumber | FNonNeg); break; - case CSSPropertyWebkitOrder: + case CSSPropertyOrder: if (validUnit(value, FInteger, CSSStrictMode)) { // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set. parsedValue = cssValuePool().createValue(max(static_cast(std::numeric_limits::min() + 2), value->fValue), @@ -2874,8 +2883,8 @@ case CSSPropertyPadding: // {1,4} | inherit return parse4Values(propId, paddingShorthand().properties(), important); - case CSSPropertyWebkitFlexFlow: - return parseShorthand(propId, webkitFlexFlowShorthand(), important); + case CSSPropertyFlexFlow: + return parseShorthand(propId, flexFlowShorthand(), important); case CSSPropertyFont: // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? // 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit @@ -3047,12 +3056,12 @@ case CSSPropertyWebkitColumnBreakBefore: case CSSPropertyWebkitColumnBreakInside: case CSSPropertyWebkitColumnRuleStyle: - case CSSPropertyWebkitAlignContent: - case CSSPropertyWebkitAlignItems: - case CSSPropertyWebkitAlignSelf: - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexWrap: - case CSSPropertyWebkitJustifyContent: + case CSSPropertyAlignContent: + case CSSPropertyAlignItems: + case CSSPropertyAlignSelf: + case CSSPropertyFlexDirection: + case CSSPropertyFlexWrap: + case CSSPropertyJustifyContent: case CSSPropertyWebkitFontKerning: case CSSPropertyWebkitFontSmoothing: case CSSPropertyWebkitHyphens: @@ -6598,9 +6607,9 @@ if (!flexBasis) flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX); - addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important); - addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important); - addProperty(CSSPropertyWebkitFlexBasis, flexBasis, important); + addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important); + addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important); + addProperty(CSSPropertyFlexBasis, flexBasis, important); return true; } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -52,7 +52,7 @@ using namespace WTF; namespace WebCore { - + // Max/min values for CSS, needs to slightly smaller/larger than the true max/min values to allow for rounding without overflowing. // Subtract two (rather than one) to allow for values to be converted to float and back without exceeding the LayoutUnit::max. const int maxValueForCssLength = INT_MAX / kFixedPointDenominator - 2; @@ -132,46 +132,46 @@ return false; } -static CSSPrimitiveValue::UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes type) +CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValue::UnitTypes type) { // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSPrimitiveValue) and allow conversions // between CSS_PX and relative lengths (see cssPixelsPerInch comment in CSSHelper.h for the topic treatment). switch (type) { - case CSSPrimitiveValue::CSS_NUMBER: - return CSSPrimitiveValue::UNumber; - case CSSPrimitiveValue::CSS_PERCENTAGE: - return CSSPrimitiveValue::UPercent; - case CSSPrimitiveValue::CSS_PX: - case CSSPrimitiveValue::CSS_CM: - case CSSPrimitiveValue::CSS_MM: - case CSSPrimitiveValue::CSS_IN: - case CSSPrimitiveValue::CSS_PT: - case CSSPrimitiveValue::CSS_PC: - return CSSPrimitiveValue::ULength; - case CSSPrimitiveValue::CSS_MS: - case CSSPrimitiveValue::CSS_S: - return CSSPrimitiveValue::UTime; - case CSSPrimitiveValue::CSS_DEG: - case CSSPrimitiveValue::CSS_RAD: - case CSSPrimitiveValue::CSS_GRAD: - case CSSPrimitiveValue::CSS_TURN: - return CSSPrimitiveValue::UAngle; - case CSSPrimitiveValue::CSS_HZ: - case CSSPrimitiveValue::CSS_KHZ: - return CSSPrimitiveValue::UFrequency; - case CSSPrimitiveValue::CSS_VW: - case CSSPrimitiveValue::CSS_VH: - case CSSPrimitiveValue::CSS_VMIN: - case CSSPrimitiveValue::CSS_VMAX: - return CSSPrimitiveValue::UViewportPercentageLength; + case CSS_NUMBER: + return UNumber; + case CSS_PERCENTAGE: + return UPercent; + case CSS_PX: + case CSS_CM: + case CSS_MM: + case CSS_IN: + case CSS_PT: + case CSS_PC: + return ULength; + case CSS_MS: + case CSS_S: + return UTime; + case CSS_DEG: + case CSS_RAD: + case CSS_GRAD: + case CSS_TURN: + return UAngle; + case CSS_HZ: + case CSS_KHZ: + return UFrequency; + case CSS_VW: + case CSS_VH: + case CSS_VMIN: + case CSS_VMAX: + return UViewportPercentageLength; #if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY) - case CSSPrimitiveValue::CSS_DPPX: - case CSSPrimitiveValue::CSS_DPI: - case CSSPrimitiveValue::CSS_DPCM: - return CSSPrimitiveValue::UResolution; + case CSS_DPPX: + case CSS_DPI: + case CSS_DPCM: + return UResolution; #endif default: - return CSSPrimitiveValue::UOther; + return UOther; } } @@ -182,25 +182,31 @@ return cache; } -unsigned short CSSPrimitiveValue::primitiveType() const +unsigned short CSSPrimitiveValue::primitiveType() const { if (m_primitiveUnitType == CSS_PROPERTY_ID || m_primitiveUnitType == CSS_VALUE_ID) return CSS_IDENT; if (m_primitiveUnitType != CSSPrimitiveValue::CSS_CALC) - return m_primitiveUnitType; - + return m_primitiveUnitType; + switch (m_value.calc->category()) { case CalcNumber: return CSSPrimitiveValue::CSS_NUMBER; - case CalcPercent: - return CSSPrimitiveValue::CSS_PERCENTAGE; case CalcLength: return CSSPrimitiveValue::CSS_PX; + case CalcPercent: + return CSSPrimitiveValue::CSS_PERCENTAGE; case CalcPercentNumber: return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER; case CalcPercentLength: return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH; + case CalcAngle: + return CSSPrimitiveValue::CSS_DEG; + case CalcTime: + return CSSPrimitiveValue::CSS_MS; + case CalcFrequency: + return CSSPrimitiveValue::CSS_HZ; #if ENABLE(CSS_VARIABLES) case CalcVariable: return CSSPrimitiveValue::CSS_UNKNOWN; // The type of a calculation containing a variable cannot be known until the value of the variable is determined. @@ -285,65 +291,102 @@ CSSPrimitiveValue::CSSPrimitiveValue(const Length& length) : CSSValue(PrimitiveClass) { + init(length); +} + +CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, const RenderStyle* style) + : CSSValue(PrimitiveClass) +{ switch (length.type()) { - case Auto: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueAuto; - break; - case WebCore::Fixed: - m_primitiveUnitType = CSS_PX; - m_value.num = length.value(); - break; - case Intrinsic: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueIntrinsic; - break; - case MinIntrinsic: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueMinIntrinsic; - break; - case MinContent: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueWebkitMinContent; - break; - case MaxContent: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueWebkitMaxContent; - break; - case FillAvailable: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueWebkitFillAvailable; - break; - case FitContent: - m_primitiveUnitType = CSS_VALUE_ID; - m_value.valueID = CSSValueWebkitFitContent; - break; - case Percent: - m_primitiveUnitType = CSS_PERCENTAGE; - ASSERT(std::isfinite(length.percent())); - m_value.num = length.percent(); - break; - case ViewportPercentageWidth: - m_primitiveUnitType = CSS_VW; - m_value.num = length.viewportPercentageLength(); - break; - case ViewportPercentageHeight: - m_primitiveUnitType = CSS_VH; - m_value.num = length.viewportPercentageLength(); - break; - case ViewportPercentageMin: - m_primitiveUnitType = CSS_VMIN; - m_value.num = length.viewportPercentageLength(); - break; - case ViewportPercentageMax: - m_primitiveUnitType = CSS_VMAX; - m_value.num = length.viewportPercentageLength(); - break; - case Calculated: - case Relative: - case Undefined: - ASSERT_NOT_REACHED(); - break; + case Auto: + case Intrinsic: + case MinIntrinsic: + case MinContent: + case MaxContent: + case FillAvailable: + case FitContent: + case Percent: + case ViewportPercentageWidth: + case ViewportPercentageHeight: + case ViewportPercentageMin: + case ViewportPercentageMax: + init(length); + return; + case Fixed: + m_primitiveUnitType = CSS_PX; + m_value.num = adjustFloatForAbsoluteZoom(length.value(), style); + return; + case Calculated: + init(CSSCalcValue::create(length.calculationValue().get(), style)); + return; + case Relative: + case Undefined: + ASSERT_NOT_REACHED(); + break; + } +} + +void CSSPrimitiveValue::init(const Length& length) +{ + switch (length.type()) { + case Auto: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueAuto; + break; + case WebCore::Fixed: + m_primitiveUnitType = CSS_PX; + m_value.num = length.value(); + break; + case Intrinsic: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueIntrinsic; + break; + case MinIntrinsic: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueMinIntrinsic; + break; + case MinContent: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueWebkitMinContent; + break; + case MaxContent: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueWebkitMaxContent; + break; + case FillAvailable: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueWebkitFillAvailable; + break; + case FitContent: + m_primitiveUnitType = CSS_VALUE_ID; + m_value.valueID = CSSValueWebkitFitContent; + break; + case Percent: + m_primitiveUnitType = CSS_PERCENTAGE; + ASSERT(std::isfinite(length.percent())); + m_value.num = length.percent(); + break; + case ViewportPercentageWidth: + m_primitiveUnitType = CSS_VW; + m_value.num = length.viewportPercentageLength(); + break; + case ViewportPercentageHeight: + m_primitiveUnitType = CSS_VH; + m_value.num = length.viewportPercentageLength(); + break; + case ViewportPercentageMin: + m_primitiveUnitType = CSS_VMIN; + m_value.num = length.viewportPercentageLength(); + break; + case ViewportPercentageMax: + m_primitiveUnitType = CSS_VMAX; + m_value.num = length.viewportPercentageLength(); + break; + case Calculated: + case Relative: + case Undefined: + ASSERT_NOT_REACHED(); + break; } } @@ -552,57 +595,63 @@ if (m_primitiveUnitType == CSS_CALC) // The multiplier and factor is applied to each value in the calc expression individually return m_value.calc->computeLengthPx(style, rootStyle, multiplier, computingFontSize); - + double factor; switch (primitiveType()) { - case CSS_EMS: - factor = computingFontSize ? style->fontDescription().specifiedSize() : style->fontDescription().computedSize(); - break; - case CSS_EXS: - // FIXME: We have a bug right now where the zoom will be applied twice to EX units. - // We really need to compute EX using fontMetrics for the original specifiedSize and not use - // our actual constructed rendering font. - if (style->fontMetrics().hasXHeight()) - factor = style->fontMetrics().xHeight(); - else - factor = (computingFontSize ? style->fontDescription().specifiedSize() : style->fontDescription().computedSize()) / 2.0; - break; - case CSS_REMS: - if (rootStyle) - factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize(); - else - factor = 1.0; - break; - case CSS_CHS: - factor = style->fontMetrics().zeroWidth(); - break; - case CSS_PX: + case CSS_EMS: + factor = computingFontSize ? style->fontDescription().specifiedSize() : style->fontDescription().computedSize(); + break; + case CSS_EXS: + // FIXME: We have a bug right now where the zoom will be applied twice to EX units. + // We really need to compute EX using fontMetrics for the original specifiedSize and not use + // our actual constructed rendering font. + if (style->fontMetrics().hasXHeight()) + factor = style->fontMetrics().xHeight(); + else + factor = (computingFontSize ? style->fontDescription().specifiedSize() : style->fontDescription().computedSize()) / 2.0; + break; + case CSS_REMS: + if (rootStyle) + factor = computingFontSize ? rootStyle->fontDescription().specifiedSize() : rootStyle->fontDescription().computedSize(); + else factor = 1.0; - break; - case CSS_CM: - factor = cssPixelsPerInch / 2.54; // (2.54 cm/in) - break; - case CSS_MM: - factor = cssPixelsPerInch / 25.4; - break; - case CSS_IN: - factor = cssPixelsPerInch; - break; - case CSS_PT: - factor = cssPixelsPerInch / 72.0; - break; - case CSS_PC: - // 1 pc == 12 pt - factor = cssPixelsPerInch * 12.0 / 72.0; - break; - case CSS_CALC_PERCENTAGE_WITH_LENGTH: - case CSS_CALC_PERCENTAGE_WITH_NUMBER: - ASSERT_NOT_REACHED(); - return -1.0; - default: - ASSERT_NOT_REACHED(); - return -1.0; + break; + case CSS_CHS: + factor = style->fontMetrics().zeroWidth(); + break; + case CSS_PX: + factor = 1.0; + break; + case CSS_CM: + factor = cssPixelsPerInch / 2.54; // (2.54 cm/in) + break; + case CSS_MM: + factor = cssPixelsPerInch / 25.4; + break; + case CSS_IN: + factor = cssPixelsPerInch; + break; + case CSS_PT: + factor = cssPixelsPerInch / 72.0; + break; + case CSS_PC: + // 1 pc == 12 pt + factor = cssPixelsPerInch * 12.0 / 72.0; + break; + case CSS_CALC_PERCENTAGE_WITH_LENGTH: + case CSS_CALC_PERCENTAGE_WITH_NUMBER: + ASSERT_NOT_REACHED(); + return -1.0; + case CSS_VH: + case CSS_VW: + case CSS_VMAX: + case CSS_VMIN: + factor = 1.0; + break; + default: + ASSERT_NOT_REACHED(); + return -1.0; } // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming @@ -623,53 +672,53 @@ ec = NO_MODIFICATION_ALLOWED_ERR; } -static double conversionToCanonicalUnitsScaleFactor(unsigned short unitType) +double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(unsigned short unitType) { double factor = 1.0; // FIXME: the switch can be replaced by an array of scale factors. switch (unitType) { - // These are "canonical" units in their respective categories. - case CSSPrimitiveValue::CSS_PX: - case CSSPrimitiveValue::CSS_DEG: - case CSSPrimitiveValue::CSS_MS: - case CSSPrimitiveValue::CSS_HZ: - break; - case CSSPrimitiveValue::CSS_CM: - factor = cssPixelsPerInch / 2.54; // (2.54 cm/in) - break; - case CSSPrimitiveValue::CSS_DPCM: - factor = 2.54 / cssPixelsPerInch; // (2.54 cm/in) - break; - case CSSPrimitiveValue::CSS_MM: - factor = cssPixelsPerInch / 25.4; - break; - case CSSPrimitiveValue::CSS_IN: - factor = cssPixelsPerInch; - break; - case CSSPrimitiveValue::CSS_DPI: - factor = 1 / cssPixelsPerInch; - break; - case CSSPrimitiveValue::CSS_PT: - factor = cssPixelsPerInch / 72.0; - break; - case CSSPrimitiveValue::CSS_PC: - factor = cssPixelsPerInch * 12.0 / 72.0; // 1 pc == 12 pt - break; - case CSSPrimitiveValue::CSS_RAD: - factor = 180 / piDouble; - break; - case CSSPrimitiveValue::CSS_GRAD: - factor = 0.9; - break; - case CSSPrimitiveValue::CSS_TURN: - factor = 360; - break; - case CSSPrimitiveValue::CSS_S: - case CSSPrimitiveValue::CSS_KHZ: - factor = 1000; - break; - default: - break; + // These are "canonical" units in their respective categories. + case CSS_PX: + case CSS_DEG: + case CSS_MS: + case CSS_HZ: + break; + case CSS_CM: + factor = cssPixelsPerInch / 2.54; // (2.54 cm/in) + break; + case CSS_DPCM: + factor = 2.54 / cssPixelsPerInch; // (2.54 cm/in) + break; + case CSS_MM: + factor = cssPixelsPerInch / 25.4; + break; + case CSS_IN: + factor = cssPixelsPerInch; + break; + case CSS_DPI: + factor = 1 / cssPixelsPerInch; + break; + case CSS_PT: + factor = cssPixelsPerInch / 72.0; + break; + case CSS_PC: + factor = cssPixelsPerInch * 12.0 / 72.0; // 1 pc == 12 pt + break; + case CSS_RAD: + factor = 180 / piDouble; + break; + case CSS_GRAD: + factor = 0.9; + break; + case CSS_TURN: + factor = 360; + break; + case CSS_S: + case CSS_KHZ: + factor = 1000; + break; + default: + break; } return factor; @@ -696,7 +745,7 @@ } double CSSPrimitiveValue::getDoubleValue() const -{ +{ return m_primitiveUnitType != CSS_CALC ? m_value.num : m_value.calc->doubleValue(); } @@ -790,20 +839,20 @@ { ec = 0; switch (m_primitiveUnitType) { - case CSS_STRING: - case CSS_ATTR: - case CSS_URI: + case CSS_STRING: + case CSS_ATTR: + case CSS_URI: #if ENABLE(CSS_VARIABLES) - case CSS_VARIABLE_NAME: + case CSS_VARIABLE_NAME: #endif - return m_value.string; - case CSS_VALUE_ID: - return valueName(m_value.valueID); - case CSS_PROPERTY_ID: - return propertyName(m_value.propertyID); - default: - ec = INVALID_ACCESS_ERR; - break; + return m_value.string; + case CSS_VALUE_ID: + return valueName(m_value.valueID); + case CSS_PROPERTY_ID: + return propertyName(m_value.propertyID); + default: + ec = INVALID_ACCESS_ERR; + break; } return String(); @@ -812,19 +861,19 @@ String CSSPrimitiveValue::getStringValue() const { switch (m_primitiveUnitType) { - case CSS_STRING: - case CSS_ATTR: - case CSS_URI: + case CSS_STRING: + case CSS_ATTR: + case CSS_URI: #if ENABLE(CSS_VARIABLES) - case CSS_VARIABLE_NAME: + case CSS_VARIABLE_NAME: #endif - return m_value.string; - case CSS_VALUE_ID: - return valueName(m_value.valueID); - case CSS_PROPERTY_ID: - return propertyName(m_value.propertyID); - default: - break; + return m_value.string; + case CSS_VALUE_ID: + return valueName(m_value.valueID); + case CSS_PROPERTY_ID: + return propertyName(m_value.propertyID); + default: + break; } return String(); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValue.h 2016-10-14 19:28:46.000000000 +0000 @@ -154,6 +154,7 @@ #endif UOther }; + static UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes); bool isAngle() const { @@ -202,8 +203,12 @@ bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; } #endif bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMAX; } + bool isViewportPercentageWidth() const { return m_primitiveUnitType == CSS_VW; } + bool isViewportPercentageHeight() const { return m_primitiveUnitType == CSS_VH; } + bool isViewportPercentageMax() const { return m_primitiveUnitType == CSS_VMAX; } + bool isViewportPercentageMin() const { return m_primitiveUnitType == CSS_VMIN; } bool isValueID() const { return m_primitiveUnitType == CSS_VALUE_ID; } - + static PassRefPtr createIdentifier(CSSValueID valueID) { return adoptRef(new CSSPrimitiveValue(valueID)); } static PassRefPtr createIdentifier(CSSPropertyID propertyID) { return adoptRef(new CSSPrimitiveValue(propertyID)); } static PassRefPtr createParserOperator(int parserOperator) { return adoptRef(new CSSPrimitiveValue(parserOperator)); } @@ -211,6 +216,7 @@ static PassRefPtr createColor(unsigned rgbValue) { return adoptRef(new CSSPrimitiveValue(rgbValue)); } static PassRefPtr create(double value, UnitTypes type) { return adoptRef(new CSSPrimitiveValue(value, type)); } static PassRefPtr create(const String& value, UnitTypes type) { return adoptRef(new CSSPrimitiveValue(value, type)); } + static PassRefPtr create(const Length& value, const RenderStyle* style) { return adoptRef(new CSSPrimitiveValue(value, style)); } template static PassRefPtr create(T value) { @@ -310,7 +316,7 @@ #endif CSSBasicShape* getShapeValue() const { return m_primitiveUnitType != CSS_SHAPE ? 0 : m_value.shape; } - + CSSCalcValue* cssCalcValue() const { return m_primitiveUnitType != CSS_CALC ? 0 : m_value.calc; } CSSPropertyID getPropertyID() const { return m_primitiveUnitType == CSS_PROPERTY_ID ? m_value.propertyID : CSSPropertyInvalid; } @@ -329,12 +335,15 @@ void addSubresourceStyleURLs(ListHashSet&, const StyleSheetContents*) const; Length viewportPercentageLength() const; - + PassRefPtr cloneForCSSOM() const; void setCSSOMSafe() { m_isCSSOMSafe = true; } bool equals(const CSSPrimitiveValue&) const; + static UnitTypes canonicalUnitTypeForCategory(UnitCategory); + static double conversionToCanonicalUnitsScaleFactor(unsigned short unitType); + private: CSSPrimitiveValue(CSSValueID); CSSPrimitiveValue(CSSPropertyID); @@ -342,6 +351,7 @@ CSSPrimitiveValue(int parserOperator); CSSPrimitiveValue(unsigned color); // RGB value CSSPrimitiveValue(const Length&); + CSSPrimitiveValue(const Length&, const RenderStyle*); CSSPrimitiveValue(const String&, UnitTypes); CSSPrimitiveValue(double, UnitTypes); @@ -362,8 +372,7 @@ static void create(unsigned); // compile-time guard template operator T*(); // compile-time guard - static UnitTypes canonicalUnitTypeForCategory(UnitCategory category); - + void init(const Length&); void init(PassRefPtr); void init(PassRefPtr); void init(PassRefPtr); @@ -392,6 +401,18 @@ } m_value; }; +inline CSSPrimitiveValue* toCSSPrimitiveValue(CSSValue* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue()); + return static_cast(value); +} + +inline const CSSPrimitiveValue* toCSSPrimitiveValue(const CSSValue* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue()); + return static_cast(value); +} + } // namespace WebCore #endif // CSSPrimitiveValue_h diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValueMappings.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValueMappings.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-10-14 19:28:46.000000000 +0000 @@ -1289,10 +1289,12 @@ m_value.valueID = CSSValueWebkitInlineBox; break; case FLEX: - m_value.valueID = CSSValueWebkitFlex; + case WEBKIT_FLEX: + m_value.valueID = CSSValueFlex; break; case INLINE_FLEX: - m_value.valueID = CSSValueWebkitInlineFlex; + case WEBKIT_INLINE_FLEX: + m_value.valueID = CSSValueInlineFlex; break; case GRID: m_value.valueID = CSSValueWebkitGrid; @@ -1313,6 +1315,10 @@ EDisplay display = static_cast(m_value.valueID - CSSValueInline); ASSERT(display >= INLINE && display <= NONE); + if (display == WEBKIT_FLEX) + return FLEX; + if (display == WEBKIT_INLINE_FLEX) + return INLINE_FLEX; return display; } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSProperty.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSProperty.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSProperty.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSProperty.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -573,18 +573,18 @@ #if ENABLE(CSS_COMPOSITING) case CSSPropertyWebkitBlendMode: #endif - case CSSPropertyWebkitAlignContent: - case CSSPropertyWebkitAlignItems: - case CSSPropertyWebkitAlignSelf: - case CSSPropertyWebkitFlex: - case CSSPropertyWebkitFlexBasis: - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexFlow: - case CSSPropertyWebkitFlexGrow: - case CSSPropertyWebkitFlexShrink: - case CSSPropertyWebkitFlexWrap: - case CSSPropertyWebkitJustifyContent: - case CSSPropertyWebkitOrder: + case CSSPropertyAlignContent: + case CSSPropertyAlignItems: + case CSSPropertyAlignSelf: + case CSSPropertyFlex: + case CSSPropertyFlexBasis: + case CSSPropertyFlexDirection: + case CSSPropertyFlexFlow: + case CSSPropertyFlexGrow: + case CSSPropertyFlexShrink: + case CSSPropertyFlexWrap: + case CSSPropertyJustifyContent: + case CSSPropertyOrder: case CSSPropertyWebkitFontSizeDelta: case CSSPropertyWebkitGridAutoColumns: case CSSPropertyWebkitGridAutoFlow: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPropertyNames.in qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPropertyNames.in --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSPropertyNames.in 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSPropertyNames.in 2016-10-14 19:28:46.000000000 +0000 @@ -287,17 +287,28 @@ #if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS -webkit-filter #endif --webkit-align-content --webkit-align-items --webkit-align-self --webkit-flex --webkit-flex-basis --webkit-flex-direction --webkit-flex-flow --webkit-flex-grow --webkit-flex-shrink --webkit-flex-wrap --webkit-justify-content +align-content +-webkit-align-content = align-content +align-items +-webkit-align-items = align-items +align-self +-webkit-align-self = align-self +flex +-webkit-flex = flex +flex-basis +-webkit-flex-basis = flex-basis +flex-direction +-webkit-flex-direction = flex-direction +flex-flow +-webkit-flex-flow = flex-flow +flex-grow +-webkit-flex-grow = flex-grow +flex-shrink +-webkit-flex-shrink = flex-shrink +flex-wrap +-webkit-flex-wrap = flex-wrap +justify-content +-webkit-justify-content = justify-content -webkit-font-size-delta -webkit-grid-auto-columns -webkit-grid-auto-rows @@ -363,7 +374,8 @@ -webkit-min-logical-width -webkit-min-logical-height -webkit-nbsp-mode --webkit-order +order +-webkit-order = order -webkit-padding-after -webkit-padding-before -webkit-padding-end diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSValueKeywords.in qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSValueKeywords.in --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSValueKeywords.in 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSValueKeywords.in 2016-10-14 19:28:46.000000000 +0000 @@ -341,7 +341,9 @@ table-caption -webkit-box -webkit-inline-box +flex -webkit-flex +inline-flex -webkit-inline-flex -webkit-grid -webkit-inline-grid diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSValuePool.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSValuePool.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/CSSValuePool.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/CSSValuePool.h 2016-10-14 19:28:46.000000000 +0000 @@ -31,9 +31,9 @@ #include "CSSPrimitiveValue.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" -#include #include #include +#include namespace WebCore { @@ -52,6 +52,7 @@ PassRefPtr createColorValue(unsigned rgbValue); PassRefPtr createValue(double value, CSSPrimitiveValue::UnitTypes); PassRefPtr createValue(const String& value, CSSPrimitiveValue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); } + PassRefPtr createValue(const Length& value, const RenderStyle* style) { return CSSPrimitiveValue::create(value, style); } template static PassRefPtr createValue(T value) { return CSSPrimitiveValue::create(value); } void drain(); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/DeprecatedStyleBuilder.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/DeprecatedStyleBuilder.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -31,6 +31,7 @@ #include "CSSAspectRatioValue.h" #include "CSSCalculationValue.h" #include "CSSCursorImageValue.h" +#include "CSSPrimitiveValue.h" #include "CSSPrimitiveValueMappings.h" #include "CSSToStyleMap.h" #include "CSSValueList.h" @@ -612,7 +613,18 @@ if (originalLength >= 1.0) length = 1.0; } - + if (primitiveValue->isViewportPercentageLength()) { + int viewPortHeight = styleResolver->document()->renderView()->viewportSize().height() * length / 100.0f; + int viewPortWidth = styleResolver->document()->renderView()->viewportSize().width() * length / 100.0f; + if (primitiveValue->isViewportPercentageHeight()) + length = viewPortHeight; + else if (primitiveValue->isViewportPercentageWidth()) + length = viewPortWidth; + else if (primitiveValue->isViewportPercentageMax()) + length = max(viewPortWidth, viewPortHeight); + else if (primitiveValue->isViewportPercentageMin()) + length = min(viewPortWidth, viewPortHeight); + } } else { ASSERT_NOT_REACHED(); length = 0; @@ -2257,17 +2269,17 @@ #if ENABLE(CURSOR_VISIBILITY) setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault::createHandler()); #endif - setPropertyHandler(CSSPropertyWebkitAlignContent, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitAlignItems, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitAlignSelf, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler()); - setPropertyHandler(CSSPropertyWebkitFlexDirection, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitFlexGrow, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitFlexShrink, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitFlexWrap, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyAlignContent, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyAlignItems, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyAlignSelf, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler()); + setPropertyHandler(CSSPropertyFlexDirection, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyFlexGrow, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyFlexShrink, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyFlexWrap, ApplyPropertyDefault::createHandler()); setPropertyHandler(CSSPropertyWebkitGridAutoFlow, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitJustifyContent, ApplyPropertyDefault::createHandler()); - setPropertyHandler(CSSPropertyWebkitOrder, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyJustifyContent, ApplyPropertyDefault::createHandler()); + setPropertyHandler(CSSPropertyOrder, ApplyPropertyDefault::createHandler()); #if ENABLE(CSS_REGIONS) setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString::createHandler()); setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString::createHandler()); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertySet.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertySet.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertySet.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertySet.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -160,10 +160,10 @@ return getShorthandValue(webkitColumnRuleShorthand()); case CSSPropertyWebkitColumns: return getShorthandValue(webkitColumnsShorthand()); - case CSSPropertyWebkitFlex: - return getShorthandValue(webkitFlexShorthand()); - case CSSPropertyWebkitFlexFlow: - return getShorthandValue(webkitFlexFlowShorthand()); + case CSSPropertyFlex: + return getShorthandValue(flexShorthand()); + case CSSPropertyFlexFlow: + return getShorthandValue(flexFlowShorthand()); case CSSPropertyWebkitGridColumn: return getShorthandValue(webkitGridColumnShorthand()); case CSSPropertyWebkitGridRow: @@ -886,14 +886,14 @@ case CSSPropertyWebkitAnimationFillMode: shorthandPropertyID = CSSPropertyWebkitAnimation; break; - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexWrap: - shorthandPropertyID = CSSPropertyWebkitFlexFlow; - break; - case CSSPropertyWebkitFlexBasis: - case CSSPropertyWebkitFlexGrow: - case CSSPropertyWebkitFlexShrink: - shorthandPropertyID = CSSPropertyWebkitFlex; + case CSSPropertyFlexDirection: + case CSSPropertyFlexWrap: + shorthandPropertyID = CSSPropertyFlexFlow; + break; + case CSSPropertyFlexBasis: + case CSSPropertyFlexGrow: + case CSSPropertyFlexShrink: + shorthandPropertyID = CSSPropertyFlex; break; case CSSPropertyWebkitMaskPositionX: case CSSPropertyWebkitMaskPositionY: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertyShorthand.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertyShorthand.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertyShorthand.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertyShorthand.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -344,18 +344,18 @@ return webkitColumnRuleLonghands; } -const StylePropertyShorthand& webkitFlexFlowShorthand() +const StylePropertyShorthand& flexFlowShorthand() { - static const CSSPropertyID flexFlowProperties[] = { CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap }; - DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexFlowLonghands, (flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties))); - return webkitFlexFlowLonghands; + static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap }; + DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexFlowLonghands, (flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties))); + return flexFlowLonghands; } -const StylePropertyShorthand& webkitFlexShorthand() +const StylePropertyShorthand& flexShorthand() { - static const CSSPropertyID flexProperties[] = { CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis }; - DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitFlexLonghands, (flexProperties, WTF_ARRAY_LENGTH(flexProperties))); - return webkitFlexLonghands; + static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis }; + DEFINE_STATIC_LOCAL(StylePropertyShorthand, flexLonghands, (flexProperties, WTF_ARRAY_LENGTH(flexProperties))); + return flexLonghands; } const StylePropertyShorthand& webkitMarginCollapseShorthand() @@ -532,10 +532,10 @@ return webkitColumnsShorthand(); case CSSPropertyWebkitColumnRule: return webkitColumnRuleShorthand(); - case CSSPropertyWebkitFlex: - return webkitFlexShorthand(); - case CSSPropertyWebkitFlexFlow: - return webkitFlexFlowShorthand(); + case CSSPropertyFlex: + return flexShorthand(); + case CSSPropertyFlexFlow: + return flexFlowShorthand(); case CSSPropertyWebkitGridColumn: return webkitGridColumnShorthand(); case CSSPropertyWebkitGridRow: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertyShorthand.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertyShorthand.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StylePropertyShorthand.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StylePropertyShorthand.h 2016-10-14 19:28:46.000000000 +0000 @@ -75,6 +75,8 @@ const StylePropertyShorthand& borderTopShorthand(); const StylePropertyShorthand& borderWidthShorthand(); const StylePropertyShorthand& listStyleShorthand(); +const StylePropertyShorthand& flexFlowShorthand(); +const StylePropertyShorthand& flexShorthand(); const StylePropertyShorthand& fontShorthand(); const StylePropertyShorthand& marginShorthand(); const StylePropertyShorthand& outlineShorthand(); @@ -89,8 +91,6 @@ const StylePropertyShorthand& webkitBorderStartShorthand(); const StylePropertyShorthand& webkitColumnsShorthand(); const StylePropertyShorthand& webkitColumnRuleShorthand(); -const StylePropertyShorthand& webkitFlexFlowShorthand(); -const StylePropertyShorthand& webkitFlexShorthand(); const StylePropertyShorthand& webkitGridColumnShorthand(); const StylePropertyShorthand& webkitGridRowShorthand(); const StylePropertyShorthand& webkitMarginCollapseShorthand(); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StyleResolver.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StyleResolver.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/css/StyleResolver.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/css/StyleResolver.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -1260,6 +1260,7 @@ case TABLE: case BOX: case FLEX: + case WEBKIT_FLEX: case GRID: return display; @@ -1273,6 +1274,7 @@ case INLINE_BOX: return BOX; case INLINE_FLEX: + case WEBKIT_INLINE_FLEX: return FLEX; case INLINE_GRID: return GRID; @@ -2439,8 +2441,8 @@ case CSSPropertyWebkitBorderRadius: case CSSPropertyWebkitColumns: case CSSPropertyWebkitColumnRule: - case CSSPropertyWebkitFlex: - case CSSPropertyWebkitFlexFlow: + case CSSPropertyFlex: + case CSSPropertyFlexFlow: case CSSPropertyWebkitGridColumn: case CSSPropertyWebkitGridRow: case CSSPropertyWebkitMarginCollapse: @@ -3012,16 +3014,16 @@ #if ENABLE(CURSOR_VISIBILITY) case CSSPropertyWebkitCursorVisibility: #endif - case CSSPropertyWebkitAlignContent: - case CSSPropertyWebkitAlignItems: - case CSSPropertyWebkitAlignSelf: - case CSSPropertyWebkitFlexBasis: - case CSSPropertyWebkitFlexDirection: - case CSSPropertyWebkitFlexGrow: - case CSSPropertyWebkitFlexShrink: - case CSSPropertyWebkitFlexWrap: - case CSSPropertyWebkitJustifyContent: - case CSSPropertyWebkitOrder: + case CSSPropertyAlignContent: + case CSSPropertyAlignItems: + case CSSPropertyAlignSelf: + case CSSPropertyFlexBasis: + case CSSPropertyFlexDirection: + case CSSPropertyFlexGrow: + case CSSPropertyFlexShrink: + case CSSPropertyFlexWrap: + case CSSPropertyJustifyContent: + case CSSPropertyOrder: #if ENABLE(CSS_REGIONS) case CSSPropertyWebkitFlowFrom: case CSSPropertyWebkitFlowInto: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -72,7 +72,7 @@ MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) { ASSERT(isMainThread()); - return m_mediaSources.get(url).get(); + return m_mediaSources.get(url); } } // namespace WebCore diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/page/animation/CSSPropertyAnimation.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/page/animation/CSSPropertyAnimation.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -927,7 +927,8 @@ class PropertyWrapperFlex : public AnimationPropertyWrapperBase { public: - PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyWebkitFlex) + PropertyWrapperFlex() + : AnimationPropertyWrapperBase(CSSPropertyFlex) { } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/CalculationValue.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/CalculationValue.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/CalculationValue.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/CalculationValue.h 2016-10-14 19:28:46.000000000 +0000 @@ -59,7 +59,7 @@ CalcExpressionNodeBinaryOperation, CalcExpressionNodeBlendLength, }; - + class CalcExpressionNode { WTF_MAKE_FAST_ALLOCATED; public: @@ -67,37 +67,40 @@ : m_type(CalcExpressionNodeUndefined) { } - + virtual ~CalcExpressionNode() { } - + virtual float evaluate(float maxValue) const = 0; virtual bool operator==(const CalcExpressionNode&) const = 0; CalcExpressionNodeType type() const { return m_type; } - + protected: CalcExpressionNodeType m_type; }; - + class CalculationValue : public RefCounted { public: static PassRefPtr create(PassOwnPtr value, CalculationPermittedValueRange); float evaluate(float maxValue) const; - bool operator==(const CalculationValue& o) const - { + bool operator==(const CalculationValue& o) const + { return *(m_value.get()) == *(o.m_value.get()); } - + + bool isNonNegative() const { return m_isNonNegative; } + const CalcExpressionNode* expression() const { return m_value.get(); } + private: CalculationValue(PassOwnPtr value, CalculationPermittedValueRange range) : m_value(value) , m_isNonNegative(range == CalculationRangeNonNegative) { } - + OwnPtr m_value; bool m_isNonNegative; }; @@ -115,20 +118,28 @@ return m_value == o.m_value; } - virtual bool operator==(const CalcExpressionNode& o) const + virtual bool operator==(const CalcExpressionNode& o) const OVERRIDE { return type() == o.type() && *this == static_cast(o); } - - virtual float evaluate(float) const + + virtual float evaluate(float) const OVERRIDE { return m_value; } - + + float value() const { return m_value; } + private: float m_value; }; +inline const CalcExpressionNumber* toCalcExpressionNumber(const CalcExpressionNode* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->type() == CalcExpressionNodeNumber); + return static_cast(value); +} + class CalcExpressionLength : public CalcExpressionNode { public: explicit CalcExpressionLength(Length length) @@ -141,21 +152,29 @@ { return m_length == o.m_length; } - - virtual bool operator==(const CalcExpressionNode& o) const + + virtual bool operator==(const CalcExpressionNode& o) const OVERRIDE { return type() == o.type() && *this == static_cast(o); } - - virtual float evaluate(float maxValue) const + + virtual float evaluate(float maxValue) const OVERRIDE { return floatValueForLength(m_length, maxValue); } - + + const Length& length() const { return m_length; } + private: Length m_length; }; +inline const CalcExpressionLength* toCalcExpressionLength(const CalcExpressionNode* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->type() == CalcExpressionNodeLength); + return static_cast(value); +} + class CalcExpressionBinaryOperation : public CalcExpressionNode { public: CalcExpressionBinaryOperation(PassOwnPtr leftSide, PassOwnPtr rightSide, CalcOperator op) @@ -171,13 +190,16 @@ return m_operator == o.m_operator && *m_leftSide == *o.m_leftSide && *m_rightSide == *o.m_rightSide; } - virtual bool operator==(const CalcExpressionNode& o) const + virtual bool operator==(const CalcExpressionNode& o) const OVERRIDE { return type() == o.type() && *this == static_cast(o); } - - - virtual float evaluate(float) const; + + virtual float evaluate(float) const OVERRIDE; + + const CalcExpressionNode* leftSide() const { return m_leftSide.get(); } + const CalcExpressionNode* rightSide() const { return m_rightSide.get(); } + CalcOperator getOperator() const { return m_operator; } private: OwnPtr m_leftSide; @@ -185,6 +207,12 @@ CalcOperator m_operator; }; +inline const CalcExpressionBinaryOperation* toCalcExpressionBinaryOperation(const CalcExpressionNode* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->type() == CalcExpressionNodeBinaryOperation); + return static_cast(value); +} + class CalcExpressionBlendLength : public CalcExpressionNode { public: CalcExpressionBlendLength(Length from, Length to, float progress) @@ -194,28 +222,38 @@ { m_type = CalcExpressionNodeBlendLength; } - + bool operator==(const CalcExpressionBlendLength& o) const { return m_progress == o.m_progress && m_from == o.m_from && m_to == o.m_to; } - - virtual bool operator==(const CalcExpressionNode& o) const + + virtual bool operator==(const CalcExpressionNode& o) const OVERRIDE { return type() == o.type() && *this == static_cast(o); } - - virtual float evaluate(float maxValue) const + + virtual float evaluate(float maxValue) const OVERRIDE { return (1.0f - m_progress) * floatValueForLength(m_from, maxValue) + m_progress * floatValueForLength(m_to, maxValue); } - -private: + + const Length& from() const { return m_from; } + const Length& to() const { return m_to; } + float progress() const { return m_progress; } + +private: Length m_from; Length m_to; float m_progress; }; - + +inline const CalcExpressionBlendLength* toCalcExpressionBlendLength(const CalcExpressionNode* value) +{ + ASSERT_WITH_SECURITY_IMPLICATION(!value || value->type() == CalcExpressionNodeBlendLength); + return static_cast(value); +} + } // namespace WebCore #endif // CalculationValue_h diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -356,6 +356,7 @@ QPen pen(painter->pen()); pen.setColor(strokeColor()); pen.setJoinStyle(toQtLineJoin(MiterJoin)); + pen.setCapStyle(Qt::FlatCap); painter->setPen(pen); } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -93,7 +93,7 @@ // QImageReader only allows retrieving the format before reading the image m_format = m_reader->format(); - if (!isFormatWhiteListed(m_format)) { + if (!m_format.isEmpty() && !isFormatWhiteListed(m_format)) { qWarning("Image of format '%s' blocked because it is not considered safe. If you are sure it is safe to do so, you can white-list the format by setting the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST=%s", m_format.constData(), m_format.constData()); setFailed(); m_reader.clear(); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/ImageQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/ImageQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/graphics/qt/ImageQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -156,6 +156,8 @@ if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) pixmap = pixmap.copy(tr); + QPoint trTopLeft = tr.topLeft(); + CompositeOperator previousOperator = ctxt->compositeOperation(); ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op); @@ -180,13 +182,14 @@ painter.drawPixmap(QRect(0, 0, scaledPixmap.width(), scaledPixmap.height()), pixmap); } pixmap = scaledPixmap; + trTopLeft = transform.map(trTopLeft); transform = QTransform::fromTranslate(transform.dx(), transform.dy()); } } /* Translate the coordinates as phase is not in world matrix coordinate space but the tile rect origin is. */ transform *= QTransform().translate(phase.x(), phase.y()); - transform.translate(tr.x(), tr.y()); + transform.translate(trTopLeft.x(), trTopLeft.y()); QBrush b(pixmap); b.setTransform(transform); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -601,7 +601,8 @@ int statusCode = m_replyWrapper->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); if (url.protocolIsInHTTPFamily()) { - String suggestedFilename = filenameFromHTTPContentDisposition(QString::fromLatin1(m_replyWrapper->reply()->rawHeader("Content-Disposition"))); + QByteArray contentDisposition = m_replyWrapper->reply()->rawHeader("Content-Disposition"); + String suggestedFilename = filenameFromHTTPContentDisposition(String(contentDisposition.constData(), contentDisposition.size())); if (!suggestedFilename.isEmpty()) response.setSuggestedFilename(suggestedFilename); @@ -626,7 +627,7 @@ // Add remaining headers. foreach (const QNetworkReply::RawHeaderPair& pair, m_replyWrapper->reply()->rawHeaderPairs()) - response.setHTTPHeaderField(QString::fromLatin1(pair.first), QString::fromLatin1(pair.second)); + response.setHTTPHeaderField(String(pair.first.constData(), pair.first.size()), String(pair.second.constData(), pair.second.size())); } QUrl redirection = m_replyWrapper->reply()->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -89,6 +89,13 @@ } #endif +static inline QByteArray stringToByteArray(const String& string) +{ + if (string.is8Bit()) + return QByteArray(reinterpret_cast(string.characters8()), string.length()); + return QString(string).toLatin1(); +} + QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) const { QNetworkRequest request; @@ -105,14 +112,13 @@ const HTTPHeaderMap &headers = httpHeaderFields(); for (HTTPHeaderMap::const_iterator it = headers.begin(), end = headers.end(); it != end; ++it) { - QByteArray name = QString(it->key).toLatin1(); - QByteArray value = QString(it->value).toLatin1(); + QByteArray name = stringToByteArray(it->key); // QNetworkRequest::setRawHeader() would remove the header if the value is null // Make sure to set an empty header instead of null header. - if (!value.isNull()) - request.setRawHeader(name, value); + if (!it->value.isNull()) + request.setRawHeader(name, stringToByteArray(it->value)); else - request.setRawHeader(name, ""); + request.setRawHeader(name, QByteArrayLiteral("")); } // Make sure we always have an Accept header; some sites require this to diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -29,6 +29,7 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include "NotImplemented.h" #include #include #include @@ -143,4 +144,12 @@ || mimeType.startsWith("application/x-qt-styled-widget", false); } +#if ENABLE(MEDIA_SOURCE) +bool MIMETypeRegistry::isSupportedMediaSourceMIMEType(const String&, const String&) +{ + notImplemented(); + return false; +} +#endif + } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/QStyleFacade.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/QStyleFacade.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/QStyleFacade.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/QStyleFacade.h 2016-10-14 19:28:46.000000000 +0000 @@ -38,6 +38,8 @@ class QStyleFacade { public: enum ButtonSubElement { + CheckBoxIndicator, + RadioButtonIndicator, PushButtonLayoutItem, PushButtonContents }; diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -62,6 +62,20 @@ using namespace HTMLNames; +static QStyleFacade::ButtonSubElement indicatorSubElement(QStyleFacade::ButtonType part) +{ + switch (part) { + case QStyleFacade::CheckBox: + return QStyleFacade::CheckBoxIndicator; + case QStyleFacade::RadioButton: + return QStyleFacade::RadioButtonIndicator; + default: + break; + } + ASSERT_NOT_REACHED(); + return QStyleFacade::CheckBoxIndicator; +} + QSharedPointer RenderThemeQStyle::getStylePainter(const PaintInfo& paintInfo) { return QSharedPointer(new StylePainterQStyle(this, paintInfo, /*RenderObject*/0)); @@ -139,6 +153,11 @@ palette = pageClient->palette(); } +QRect RenderThemeQStyle::indicatorRect(QStyleFacade::ButtonType part, const QRect& originalRect) const +{ + return m_qStyle->buttonSubElementRect(indicatorSubElement(part), QStyleFacade::State_Small, originalRect); +} + QRect RenderThemeQStyle::inflateButtonRect(const QRect& originalRect) const { QRect layoutRect = m_qStyle->buttonSubElementRect(QStyleFacade::PushButtonLayoutItem, QStyleFacade::State_Small, originalRect); @@ -153,6 +172,29 @@ return originalRect; } +template +static void inflateCheckBoxRectImpl(T& originalRect, const QRect& rect) +{ + if (!rect.isNull()) { + int dx = static_cast((rect.width() - originalRect.width()) / 2); + originalRect.setX(originalRect.x() - dx); + originalRect.setWidth(rect.width()); + int dy = static_cast((rect.height() - originalRect.height()) / 2); + originalRect.setY(originalRect.y() - dy); + originalRect.setHeight(rect.height()); + } +} + +void RenderThemeQStyle::computeControlRect(QStyleFacade::ButtonType part, QRect& originalRect) const +{ + inflateCheckBoxRectImpl(originalRect, indicatorRect(part, originalRect)); +} + +void RenderThemeQStyle::computeControlRect(QStyleFacade::ButtonType part, IntRect& originalRect) const +{ + inflateCheckBoxRectImpl(originalRect, indicatorRect(part, originalRect)); +} + int extendFixedPadding(Length oldPadding, int padding) { if (oldPadding.isFixed()) { return std::max(oldPadding.intValue(), padding); @@ -306,10 +348,13 @@ if (p.appearance == PushButtonPart || p.appearance == ButtonPart) { p.styleOption.rect = inflateButtonRect(p.styleOption.rect); p.paintButton(QStyleFacade::PushButton); - } else if (p.appearance == RadioPart) + } else if (p.appearance == RadioPart) { + computeControlRect(QStyleFacade::RadioButton, p.styleOption.rect); p.paintButton(QStyleFacade::RadioButton); - else if (p.appearance == CheckboxPart) + } else if (p.appearance == CheckboxPart) { + computeControlRect(QStyleFacade::CheckBox, p.styleOption.rect); p.paintButton(QStyleFacade::CheckBox); + } return false; } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQStyle.h 2016-10-14 19:28:46.000000000 +0000 @@ -22,7 +22,6 @@ #ifndef RenderThemeQStyle_h #define RenderThemeQStyle_h -#include "QStyleFacade.h" #include "RenderThemeQt.h" namespace WebCore { @@ -96,6 +95,8 @@ virtual QSharedPointer getStylePainter(const PaintInfo&); virtual QRect inflateButtonRect(const QRect& originalRect) const; + void computeControlRect(QStyleFacade::ButtonType, QRect& originalRect) const OVERRIDE; + void computeControlRect(QStyleFacade::ButtonType, IntRect& originalRect) const OVERRIDE; virtual void setPopupPadding(RenderStyle*) const; @@ -108,6 +109,8 @@ void setPaletteFromPageClientIfExists(QPalette&) const; + QRect indicatorRect(QStyleFacade::ButtonType part, const QRect& originalRect) const; + #ifdef Q_OS_MAC int m_buttonFontPixelSize; #endif diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -211,12 +211,22 @@ return originalRect; } +void RenderThemeQt::computeControlRect(QStyleFacade::ButtonType, QRect&) const +{ +} + +void RenderThemeQt::computeControlRect(QStyleFacade::ButtonType, IntRect&) const +{ +} + void RenderThemeQt::adjustRepaintRect(const RenderObject* o, IntRect& rect) { switch (o->style()->appearance()) { case CheckboxPart: + computeControlRect(QStyleFacade::CheckBox, rect); break; case RadioPart: + computeControlRect(QStyleFacade::RadioButton, rect); break; case PushButtonPart: case ButtonPart: { diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQt.h 2016-10-14 19:28:46.000000000 +0000 @@ -22,6 +22,7 @@ #ifndef RenderThemeQt_h #define RenderThemeQt_h +#include "QStyleFacade.h" #include "RenderTheme.h" #include @@ -168,6 +169,8 @@ virtual String fileListNameForWidth(const FileList*, const Font&, int width, bool multipleFilesAllowed) const OVERRIDE; virtual QRect inflateButtonRect(const QRect& originalRect) const; + virtual void computeControlRect(QStyleFacade::ButtonType, QRect& originalRect) const; + virtual void computeControlRect(QStyleFacade::ButtonType, IntRect& originalRect) const; virtual void setPopupPadding(RenderStyle*) const = 0; diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/platform/qt/RenderThemeQtMobile.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -58,8 +58,8 @@ static const int checkBoxWidth = 21; static const int radioWidth = 21; static const int sliderSize = 20; -static const int buttonHeightRatio = 1.5; +static const float buttonHeightRatio = 1.5; static const float multipleComboDotsOffsetFactor = 1.8; static const float buttonPaddingLeft = 18; static const float buttonPaddingRight = 18; diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/rendering/RenderObject.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/rendering/RenderObject.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/rendering/RenderObject.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/rendering/RenderObject.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -230,6 +230,8 @@ return new (arena) RenderDeprecatedFlexibleBox(element); case FLEX: case INLINE_FLEX: + case WEBKIT_FLEX: + case WEBKIT_INLINE_FLEX: return new (arena) RenderFlexibleBox(element); case GRID: case INLINE_GRID: diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/rendering/style/RenderStyleConstants.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/rendering/style/RenderStyleConstants.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-10-14 19:28:46.000000000 +0000 @@ -443,7 +443,7 @@ TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL, TABLE_CAPTION, BOX, INLINE_BOX, - FLEX, INLINE_FLEX, + FLEX, WEBKIT_FLEX, INLINE_FLEX, WEBKIT_INLINE_FLEX, GRID, INLINE_GRID, NONE }; diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/WebCore.pri qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/WebCore.pri --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebCore/WebCore.pri 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebCore/WebCore.pri 2016-10-14 19:28:46.000000000 +0000 @@ -16,6 +16,7 @@ $$SOURCE_DIR/Modules/filesystem \ $$SOURCE_DIR/Modules/geolocation \ $$SOURCE_DIR/Modules/indexeddb \ + $$SOURCE_DIR/Modules/mediasource \ $$SOURCE_DIR/Modules/navigatorcontentutils \ $$SOURCE_DIR/Modules/notifications \ $$SOURCE_DIR/Modules/proximity \ diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/Api/qwebsettings.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/Api/qwebsettings.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/Api/qwebsettings.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/Api/qwebsettings.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -455,7 +455,7 @@ \value PrivateBrowsingEnabled Private browsing prevents WebKit from recording visited pages in the history and storing web page icons. This is disabled by default. \value JavascriptCanOpenWindows Specifies whether JavaScript programs - can open new windows. This is disabled by default. + can open popup windows without user interaction. This is disabled by default. \value JavascriptCanCloseWindows Specifies whether JavaScript programs can close windows. This is disabled by default. \value JavascriptCanAccessClipboard Specifies whether JavaScript programs diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/declarative/experimental/experimental.pri qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/declarative/experimental/experimental.pri --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/declarative/experimental/experimental.pri 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/declarative/experimental/experimental.pri 2016-10-14 19:28:46.000000000 +0000 @@ -11,9 +11,11 @@ CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir + cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} + COPIES += cpqmldir +} contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/declarative/public.pri qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/declarative/public.pri --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/declarative/public.pri 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/declarative/public.pri 2016-10-14 19:28:46.000000000 +0000 @@ -11,9 +11,11 @@ CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir + cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} + COPIES += cpqmldir +} contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/docs/qtwebkit.qdoc qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/docs/qtwebkit.qdoc --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/docs/qtwebkit.qdoc 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/docs/qtwebkit.qdoc 2016-10-14 19:28:46.000000000 +0000 @@ -175,7 +175,7 @@ \endtable \table - \header \li Mac OS X + \header \li \macos \row \li \list \li \c{Library/Internet Plug-Ins} in the user's home directory diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -642,6 +642,7 @@ void introspectQtMethods_data(); void introspectQtMethods(); void scriptablePlugin(); + void exceptionInSlot(); private: QString evalJS(const QString& s) @@ -1572,26 +1573,26 @@ QString type; QString ret = evalJS("(function() { }).connect()", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect()')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect()')")); } { QString type; QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect()", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect()')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect()')")); } { QString type; QString ret = evalJS("(function() { }).connect(123)", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect(123)')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect(123)')")); } { QString type; QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect(123)", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect(123)')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect(123)')")); } { @@ -2234,5 +2235,32 @@ QCOMPARE(result.toString(), QLatin1String("42")); } +class WebPageWithConsoleCapture : public QWebPage +{ +public: + void javaScriptConsoleMessage(const QString &message, int, const QString &) + { + consoleMessages << message; + } + + QStringList consoleMessages; +}; + +void tst_QObjectBridge::exceptionInSlot() +{ + WebPageWithConsoleCapture page; + QWebFrame* frame = page.mainFrame(); + frame->addToJavaScriptWindowObject("myObject", m_myObject); + frame->evaluateJavaScript( + "myHandler = function() { window.gotSignal = true; throw 'exception in slot'; };" + "myObject.mySignal.connect(myHandler);" + "gotSignal = false;" + "myObject.mySignal();" + ); + QString ret = frame->evaluateJavaScript("gotSignal").toString(); + QCOMPARE(ret, sTrue); + QCOMPARE(page.consoleMessages, QStringList() << "exception in slot"); +} + QTEST_MAIN(tst_QObjectBridge) #include "tst_qobjectbridge.moc" diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -1179,6 +1179,7 @@ case ToggleMediaPlayPause: if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) mediaElt->togglePlayState(); + break; case ToggleMediaMute: if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) mediaElt->setMuted(!mediaElt->muted()); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -163,6 +163,8 @@ QStyle::SubElement subElement = QStyle::SE_CustomBase; switch (buttonElement) { + case CheckBoxIndicator: subElement = QStyle::SE_CheckBoxIndicator; break; + case RadioButtonIndicator: subElement = QStyle::SE_RadioButtonIndicator; break; case PushButtonLayoutItem: subElement = QStyle::SE_PushButtonLayoutItem; break; case PushButtonContents: subElement = QStyle::SE_PushButtonContents; break; default: ASSERT_NOT_REACHED(); @@ -209,7 +211,7 @@ int QStyleFacadeImp::progressBarChunkWidth(const QSize& size) const { - QStyleOptionProgressBarV2 option; + QStyleOptionProgressBar option; option.rect.setSize(size); // FIXME: Until http://bugreports.qt.nokia.com/browse/QTBUG-9171 is fixed, // we simulate one square animating across the progress bar. @@ -263,10 +265,10 @@ { QWidget* widget = qobject_cast(widgetForPainter(painter)); - MappedStyleOption panel(widget, proxyOption); + MappedStyleOption panel(widget, proxyOption); panel.lineWidth = findFrameLineWidth(); - panel.features = QStyleOptionFrameV2::None; + panel.features = QStyleOptionFrame::None; style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, painter, widget); } @@ -389,7 +391,7 @@ { QWidget* widget = qobject_cast(widgetForPainter(painter)); - MappedStyleOption option(widget, proxyOption); + MappedStyleOption option(widget, proxyOption); option.maximum = std::numeric_limits::max(); option.minimum = 0; diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -71,6 +71,9 @@ m_combo->setGeometry(QRect(rect.left(), rect.top(), rect.width(), m_combo->sizeHint().height())); } + // adjust the size of combo box to the longest name + m_combo->adjustSize(); + m_combo->showPopupAtCursorPosition(); } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -141,7 +141,7 @@ // Create the receive port. mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort); -#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0); #endif @@ -423,7 +423,7 @@ OwnPtr decoder = createMessageDecoder(header); ASSERT(decoder); -#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 decoder->setImportanceAssertion(ImportanceAssertion::create(header)); #endif diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2016-10-14 19:28:46.000000000 +0000 @@ -23,7 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WebPluginSiteDataManagerh +#ifndef WebPluginSiteDataManager_h #define WebPluginSiteDataManager_h #if ENABLE(NETSCAPE_PLUGIN_API) diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/WebProcess.pro qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/WebProcess.pro --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WebKit2/WebProcess.pro 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WebKit2/WebProcess.pro 2016-10-14 19:28:46.000000000 +0000 @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- TEMPLATE = app -!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release +!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release TARGET = QtWebProcess DESTDIR = $${ROOT_BUILD_DIR}/bin diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/wtf/FeatureDefines.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/wtf/FeatureDefines.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/wtf/FeatureDefines.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/wtf/FeatureDefines.h 2016-10-14 19:28:46.000000000 +0000 @@ -188,6 +188,15 @@ #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ +#if !PLATFORM(MAC) + +#if !defined(JSC_OBJC_API_ENABLED) +#define JSC_OBJC_API_ENABLED 0 +#endif + +#endif /* !PLATFORM(MAC) */ + + /* --------- Apple Windows port --------- */ #if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/wtf/MathExtras.h qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/wtf/MathExtras.h --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/wtf/MathExtras.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/wtf/MathExtras.h 2016-10-14 19:28:46.000000000 +0000 @@ -43,7 +43,7 @@ #include #endif -#if OS(QNX) +#if OS(QNX) || COMPILER(INTEL) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. @@ -106,7 +106,7 @@ #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/WTF.pri qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/WTF.pri --- qtwebkit-opensource-src-5.6.1+dfsg/Source/WTF/WTF.pri 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Source/WTF/WTF.pri 2016-10-14 19:28:46.000000000 +0000 @@ -49,4 +49,4 @@ } # MSVC is lacking stdint.h as well as inttypes.h. -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 +contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/configure.prf qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/configure.prf --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/configure.prf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/configure.prf 2016-10-14 19:28:46.000000000 +0000 @@ -129,6 +129,9 @@ production_build:android { addReasonForSkippingBuild("Build not supported on Android.") } + production_build:contains(QT_CONFIG, mirclient) { + addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") + } !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/default_post.prf qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/default_post.prf --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/default_post.prf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/default_post.prf 2016-10-14 19:28:46.000000000 +0000 @@ -263,7 +263,8 @@ contains(TEMPLATE, lib) { # Triggers the right export macros for WebKit internals - DEFINES += BUILDING_$${TARGET} + # (don't set for Qt modules; qt_module.prf does it) + !creating_module: DEFINES += BUILDING_$${TARGET} # Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h) !contains(QT, webkit)|equals(MODULE, webkitwidgets): DEFINES += BUILDING_WEBKIT diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/default_pre.prf qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/default_pre.prf --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/default_pre.prf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/default_pre.prf 2016-10-14 19:28:46.000000000 +0000 @@ -102,6 +102,7 @@ # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { + contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release contains(QT_CONFIG, build_all): CONFIG += build_all } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/features.prf qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/features.prf --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/features.prf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/features.prf 2016-10-14 19:28:46.000000000 +0000 @@ -136,9 +136,6 @@ have?(glx):have?(xcomposite):have?(xrender): WEBKIT_CONFIG += use_graphics_surface use_glx } - # Slider Touch is sensible to use when compiling WebKit2 - enable?(touch_events): WEBKIT_CONFIG += touch_slider - # IndexedDB requires leveldb enable?(indexed_database): WEBKIT_CONFIG += use_leveldb @@ -173,6 +170,9 @@ # GStreamer uses Glib use?(gstreamer): WEBKIT_CONFIG += use_glib + # LevelDB is not needed without indexed_database + !enable?(indexed_database): WEBKIT_CONFIG -= use_leveldb + # VideoTrack requires video !enable?(video): WEBKIT_CONFIG -= video_track @@ -182,5 +182,8 @@ # Accelerated 2D canvas uses 3D graphics support. !use?(3d_graphics): WEBKIT_CONFIG -= accelerated_2d_canvas + # Touch slider requires touch events + !enable?(touch_events): WEBKIT_CONFIG -= touch_slider + export(WEBKIT_CONFIG) } diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/features.pri qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/features.pri --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/features.pri 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/features.pri 2016-10-14 19:28:46.000000000 +0000 @@ -114,6 +114,7 @@ ENABLE_TOUCH_ADJUSTMENT=1 \ ENABLE_TOUCH_EVENTS=1 \ ENABLE_TOUCH_ICON_LOADING=0 \ + ENABLE_TOUCH_SLIDER=1 \ ENABLE_USER_TIMING=0 \ ENABLE_VIBRATION=0 \ ENABLE_VIDEO=0 \ diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/win32/default_post.prf qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/win32/default_post.prf --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/qmake/mkspecs/features/win32/default_post.prf 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/qmake/mkspecs/features/win32/default_post.prf 2016-10-14 19:28:46.000000000 +0000 @@ -12,6 +12,10 @@ QMAKE_LIBDIR_POST += $$split(TMPPATH,";") } +# Make sure windows.h doesn't define max() macro +# (it screws up use like std::max and std::numeric_limits::max) +DEFINES += NOMINMAX + # Disable a few warnings. The same warnings are also disabled # in WebKitLibraries/win/tools/vsprops/common.vsprops win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/launcherwindow.cpp qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/launcherwindow.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/launcherwindow.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/launcherwindow.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -782,7 +782,7 @@ void LauncherWindow::screenshot() { - QPixmap pixmap = QPixmap::grabWidget(m_view); + QPixmap pixmap = m_view->grab(); QLabel* label = 0; label = new QLabel; label->setAttribute(Qt::WA_DeleteOnClose); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/locationedit.cpp qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/locationedit.cpp --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/locationedit.cpp 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/locationedit.cpp 2016-10-14 19:28:46.000000000 +0000 @@ -80,7 +80,7 @@ void LocationEdit::updateInternalGeometry() { - QStyleOptionFrameV3 styleOption; + QStyleOptionFrame styleOption; initStyleOption(&styleOption); QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &styleOption, this); diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/locationedit.h qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/locationedit.h --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/QtTestBrowser/locationedit.h 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/QtTestBrowser/locationedit.h 2016-10-14 19:28:46.000000000 +0000 @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include class LocationEdit : public QLineEdit { diff -Nru qtwebkit-opensource-src-5.6.1+dfsg/Tools/Scripts/webkitdirs.pm qtwebkit-opensource-src-5.7.1+dfsg/Tools/Scripts/webkitdirs.pm --- qtwebkit-opensource-src-5.6.1+dfsg/Tools/Scripts/webkitdirs.pm 2016-05-30 11:52:29.000000000 +0000 +++ qtwebkit-opensource-src-5.7.1+dfsg/Tools/Scripts/webkitdirs.pm 2016-10-14 19:28:46.000000000 +0000 @@ -2231,7 +2231,7 @@ } # Using build-webkit to build assumes you want a developer-build - push @buildArgs, "CONFIG-=production_build"; + push @buildArgs, "CONFIG-=production_build" unless grep { $_ eq "CONFIG+=production_build" } @buildArgs; my $svnRevision = currentSVNRevision(); my $previousSvnRevision = "unknown";