summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | QT_CONFIG simplification re debug_and_release and build_allOswald Buddenhagen2016-05-172-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't pretend that these two flags can be set separately - the configures set them in tandem. Change-Id: I90691b78723b79df0fdfa81a6ee81191595582c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * | Fix the build with non-standard qtlibinfix buildsThiago Macieira2016-05-111-1/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qtlibinfix contains non-identifier characters (like '.'), you can't pass BUILDING_$${TARGET} since TARGET has already been modified by qt_module.prf. Change-Id: I22045d72c63a4741b83fffff140f6b7509c1e2c5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0Liang Qi2016-05-2736-146/+282
| | |\ \ | | | |/ | | | | | | | | Change-Id: Id8fd457ab1eb501f8f5622cb5f7d88c352e3758f
| | | * decruft project fileOswald Buddenhagen2016-05-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: I78294e52858387946b2bafd258f7be6b0b5d87d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * make use of COPIESOswald Buddenhagen2016-05-102-16/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I050003e46c437a3fadce11d417861f40d60f6c20 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * Only load QImageIO plugins from white-listed formatsAllan Sandfeld Jensen2016-05-031-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all QImage plugins are safe to load from the internet. We should only load formats that are well-used on the internet and we can be reasonably sure are safe. [ChangeLog][WebKit][Behavior Change] QtWebkit will no longer support any QImage plugin with the Size option, but instead only decode formats that have been whitelisted. If you are using QtWebKit for controlled content and wish to override the white-listed it can now be done with the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST which takes a comma-separated list of QImageIO formats. Change-Id: Ifc4f1a3addfa4ec117697a12000db3c265422314 Reviewed-by: Richard J. Moore <rich@kde.org>
| | | * Fix mixed use of booleans in JPEGImageDecoder.cppMaurice van der Pot2016-04-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=122412 Patch by Maurice van der Pot <griffon26@kfk4ever.com> on 2014-03-31 Reviewed by Darin Adler. Trivial fix for compilation error; no new tests. * platform/image-decoders/jpeg/JPEGImageDecoder.cpp: (WebCore::JPEGImageReader::decode): (WebCore::fill_input_buffer): Use TRUE/FALSE defined by libjpeg for libjpeg booleans git-svn-id: http://svn.webkit.org/repository/webkit/trunk@166490 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I6c669c951fa4bc87862b261ad1a9dd05016086e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Fixed compilation of JPEGImageDecoder with libjpeg v9.Konstantin Tokarev2016-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=156445 Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-04-09 Reviewed by Michael Catanzaro. ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers. No new tests needed. * platform/image-decoders/jpeg/JPEGImageDecoder.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@199278 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I82db8bae210f8b03bd472a82925bd308fa01b6ca Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Allow building QtWebKit on Windows with non-ICU Qt build.Konstantin Tokarev2016-04-053-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, from now use_wchar_unicode is never silently enabled when ICU config test fails, and requires qmake argument WEBKIT_CONFIG+=use_wchar_unicode. Change-Id: I434f5245c796b723a3bb116f62f8d53d05c3b4f7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * Allow using system SQLite without pkg-configKonstantin Tokarev2016-04-014-2/+41
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifff0f8877a2d2d77a04468c205c3353f043e7738 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Many assertion failures and crashes on SVG path animation cases when JS ↵Javier Fernandez2016-03-213-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | garbage collection happens quickly. Based on upstream fix by said@apple.com at http://trac.webkit.org/changeset/197125 Since the whole document was leaking once an SVGAnimatedProperty was created so there was no way to produce this bug. After fixing the leak, one crash and one assert got uncovered. Both of them happen because of the fact: "if an SVGAnimatedProperty is not referenced it will be deleted." * svg/SVGPathElement.cpp: (WebCore::SVGPathElement::lookupOrCreateDWrapper): The code in this function was assuming that the wrapper will be created only once which happens when SVGAnimatedProperty::lookupOrCreateWrapper() is called. Before making this single call, lookupOrCreateDWrapper() was building an initial SVGPathSegList from byte stream. But now SVGAnimatedProperty::lookupWrapper() can return false even after creating the SVGAnimatedProperty because it was deleted later. Calling buildSVGPathSegListFromByteStream() more than once was causing SVGAnimatedListPropertyTearOff::animationStarted() to fire the assertion ASSERT(m_values.size() == m_wrappers.size()) because the path segments were appended twice to m_values which is in fact SVGPathElement::m_pathSegList.value. The fix is to build the initial SVGPathSegList only once which should happen when m_pathSegList.value.isEmpty(). (WebCore::SVGPathElement::animatedPropertyWillBeDeleted): * svg/SVGPathElement.h: * svg/properties/SVGAnimatedPathSegListPropertyTearOff.h: (WebCore::SVGAnimatedPathSegListPropertyTearOff::~SVGAnimatedPathSegListPropertyTearOff): SVGPathElement is assuming the following equivalence relation: m_pathSegList.shouldSynchronize ~ SVGAnimatedProperty_is_created_and_not_null. SVGPathElement::animatedPathSegList() and animatedNormalizedPathSegList() set m_pathSegList.shouldSynchronize to true when SVGAnimatedProperty is created but nothing sets m_pathSegList.shouldSynchronize back to false. This was not a problem when the SVGAnimatedProperty was leaking but after ensuring it is deleted when it is not referenced this equivalence relation becomes untrue sometimes. This caused SVGPathElement::svgAttributeChanged() to crash when we check m_pathSegList.shouldSynchronize and if it is true we assume that SVGAnimatedProperty::lookupWrapper() will return a non-null pointer and therefore we deference this pointer and call SVGAnimatedProperty::isAnimating(). To fix this crash we need to set m_pathSegList.shouldSynchronize back to false when the associated SVGAnimatedProperty is deleted. Change-Id: I05be755635b02d0d76105fc2eb21c2f013298c4e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * Fixed crashes on SVG path animation use cases.Said Abou-Hallawa2016-03-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on upstream fix by said@apple.com at http://trac.webkit.org/changeset/196670 A destructor was added to SVGListPropertyTearOff that notifies its wrapper (the SVGAnimatedListPropertyTearoff) about its deletion. This allows the wrapper to nullify any references to the wrapped content. We needed to do the same thing for SVGPathSegListPropertyTearOff. Both SVGPathSegListPropertyTearOff and SVGListPropertyTearOff inherit from SVGListProperty and both hold pointers to SVGAnimatedListPropertyTearOff which needs to be notified. Change-Id: I1873825c7bdc07bf06cd5c300156ebe084f2607e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * Merge "Merge remote-tracking branch 'origin/5.6.0' into 5.6" into ↵Frederik Gladhorn2016-03-181-1/+10
| | | |\ | | | | | | | | | | | | | | | refs/staging/5.6
| | | | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-1/+10
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: Ibe3360a92dc34a87bc68cacabc48938cdafd49cb
| | | | | * Updated changelog for 5.6.0.5.6.0Konstantin Tokarev2016-02-271-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21cd29080be8f1aeedad6f19f1f11d3df2d9ae1d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * | | Breaking several cyclic references between SVG animated properties.Javier Fernandez2016-03-1815-94/+145
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on upstream fix by sabouhallawa@apple.com at http://trac.webkit.org/changeset/196268 The leak happens because of cyclic reference between SVGListPropertyTearOff and SVGAnimatedListPropertyTearOff which is derived from SVGAnimatedProperty. There is also cyclic reference between SVGAnimatedProperty and SVGElement and this causes the whole document to be leaked. So if the JS requests, for example, an instance of SVGPolylineElement.points, the whole document will be leaked. The fix depends on having the cyclic reference as is since the owning and the owned classes have to live together if any of them is referenced. But the owning class caches a raw 'ref-counted' pointer of the owned class. If it is requested for an instance of the owned class it returned a RefPtr<> of it. Once the owned class is not used, it can delete itself. The only thing needed here is to notify the owner class of the deletion so it cleans its caches and be able to create a new pointer if it is requested for an instance of the owned class later. Revert the change of r181345 in SVGAnimatedProperty::lookupOrCreateWrapper() to break the cyclic reference between SVGElement and SVGAnimatedProperty. Also apply the same approach in SVGAnimatedListPropertyTearOff::baseVal() and animVal() to break cyclic reference between SVGListPropertyTearOff and SVGAnimatedListPropertyTearOff. Change-Id: Ied6a077299e47855feb235a1c9310f1a58aad91b Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * | Make more ctors explicitMarc Mutz2016-03-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: If2e979aa5772b8dc0b9a4a9360914740144d47a7 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-046-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I9e521f91abe7972843eeeb6406f8605778dabbaf Task-number: QTBUG-45291 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * | isLinkVisited: Don't build complete URL unless we use QWebHistoryInterface.Konstantin Tokarev2016-02-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | visitedURL() is non-trivial function with memory allocations, so we should not call it for nothing. Change-Id: I72e14fac75640cb6b22dd1444b9a061e8432dd7e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * | Fix linking with libpthreadAllan Sandfeld Jensen2016-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit use libpthread directly but is depending on other qt modules causing it to be linked against, which might break unless -lpthread is last. Instead just add it explicitly after the static libraries. Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> (cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | | Restored compatibility with QSGRenderNode API from Qt < 5.8.Konstantin Tokarev2016-06-161-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If41869580556fbe9b79fa9c3b162cefb23c74d25 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Fix conflicting forward declarations of NSStringAllan Sandfeld Jensen2016-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSString is also declared in QString.h since qtbase/375c5a00 as struct objc_object. Match Qt. Change-Id: I323719a0831d825e8dc433c34f069da87c9706c4 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | | | Adapt to new public QSGRenderNode APIAllan Sandfeld Jensen2016-06-161-5/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the necessary changes to compile with the recent changes made to QSGRenderNode in qtdeclarative/28f8795d716035516f03542cd55275375462fdc5 Change-Id: Icc2b70db6913cc7a51480ed9c556999aa8874472 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge branch '5.7' into devAllan Sandfeld Jensen2016-02-2618-22/+109
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ibeb12d9d8fe8c1a5234c690420c642c59bb06cad
| * | | Crude hack to disable build on Ubuntu TouchSimon Hausmann2016-02-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an awful hack to disable the build. We are short of a reliable way of detecting the platform and we are facing the issue that cross-compilation against Ubuntu Touch with a sysroot produces linking errors due to the linker in the cross-compilation toolchain not respecting --sysroot when reading /etc/ld.so.conf in order to find the directory that provides libEGL.so.1. Change-Id: I19583ce31d62b0165877dedd3d6ce62bfdb71db4 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-2217-22/+105
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-2117-22/+105
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib65e8e98ec09b9cc934c8ab7d9f1df3bc377a718
| | | * | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-172-5/+7
| | | |\ \ | | | | |/ | | | | | | | | | | Change-Id: I7401888416c81bca2a26c14af9393c08b428b445
| | | | * Fixed unfinished phrase in documentation of evaluateJavaScript.Konstantin Tokarev2016-02-041-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b5f43c68feedbace330494e7eb051cfe8a54128 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | | * Skip building on androidAllan Sandfeld Jensen2016-02-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While it was building at some point, Android was never fully working or supported. Change-Id: I6ce77904e4db7830969664910eea143fa184f848 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | * | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I046c6c4bab94412ff67c5a3a35720dd91c667a2a
| | | * | Assertion failure end < m_runCount in ↵Ryosuke Niwa2016-02-041-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::BidiRunList<WebCore::BidiRun>::reverseRuns https://bugs.webkit.org/show_bug.cgi?id=123863 Reviewed by Andreas Kling. Source/WebCore: Merge https://chromium.googlesource.com/chromium/blink/+/cbaa92c763a37d89eeabd01658e522219299290c Test: fast/text/bidi-reverse-runs-crash.html * platform/text/BidiResolver.h: (WebCore::BidiResolver<Iterator, Run>::createBidiRunsForLine): Don't reverse the runs if there's nothing to be reversed. LayoutTests: * fast/text/bidi-reverse-runs-crash-expected.txt: Added. * fast/text/bidi-reverse-runs-crash.html: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158729 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I6bf0902444acf98db29c3cfa2cd3535e1a0c1bef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Properly clear m_logicallyLastRun to remove use-after-free possibilityBem Jones-Bey2016-02-011-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=129489 Reviewed by David Hyatt. A use-after-free issue was caught in Blink because m_logicallyLastRun is not cleared when the item it points to is deleted. Clearing it turns the use-after-free into a segfault, and prevents any future use-after-frees from happening. * platform/text/BidiRunList.h: (WebCore::BidiRunList<Run>::deleteRuns): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@164876 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ia76a5723ea649e7a3609fc26025dd5bbd96f3302 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Handle WebKitErrorDomain error like other errorsJoni Poikelin2016-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4dd08b18706e44947a00b4d61a185b5fc43f478 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * XMLHttpRequest should not send DNT headerYouenn Fablet2016-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=128533 The DNT header should be set by web engines according user preferences. That includes all HTTP requests, including XHR requests. Unpriviledged web apps should not be allowed to override/interfere with user preferences. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@163915 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I80bed1eb13826cdb3cfade3d51297f439b5016f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Fixed another typo in QWebSecurityOrigin::addLocalScheme() documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7013829d4e30a85374a4f63ab6a45b97b44313d7 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | * Fixed typo in QWebSecurityOrigin::addLocalScheme documentation.Konstantin Tokarev2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ife7db164671b84f28b03b6d86a038d1370486cae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Improved documentation of evaluateJavaScript().Konstantin Tokarev2016-01-212-2/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I47d8f4c0e392ffb70655db9725b035d22a7cad91 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Fixed EventHandler::TextDragDelay setting for OS X.Konstantin Tokarev2016-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=18167 explains that 0.0 value was added specifically to create Windows-like behavior. In Qt port OSX-like behavior was added in r59846, but this behavior was lost after transition to Qt 5. Change-Id: I2d618a356d494805c2d8f9d2fc7751744e040741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * ASSERTION FAILED: stroke->opacity != other->stroke->opacity in ↵Rob Buis2016-01-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::SVGRenderStyle::diff https://bugs.webkit.org/show_bug.cgi?id=119623 Reviewed by Dirk Schulze. Source/WebCore: Include all the stroke attributes in the style diff comparison, the visited links ones were missing. Test: svg/animations/animate-stroke-crasher.html * rendering/style/SVGRenderStyle.cpp: (WebCore::SVGRenderStyle::diff): LayoutTests: Add testcase from bug with small adjustments. * svg/animations/animate-stroke-crasher-expected.txt: Added. * svg/animations/animate-stroke-crasher.html: Added. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153914 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I71ff999dab89127600b4a57b5cee58a6fa4687fd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Quality in toDataURL only applies to JPEGs nowVivin Paliath2015-12-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to the fix, quality would default to 100 irrespective of the image type, if an explicit quality-argument was not provided, or if the quality was outside the valid range. In the case where toDataURL is called without any arguments, the image type defaults to "image/png" and quality eventually defaults to 100. However, quality in the context of a PNG applies to the quality of compression and not the quality of the image. Since PNG is a lossless format, compression only affects the size of the image and not its quality. This resulted in PNG images of a large size, with no compression at all. The same behavior could be observed when toDataURL is called with the image type explicitly set to "image/png", without a quality argument. The expected behavior is only observed if toDataURL is called with the image type set to "image/png" and the quality set to 0, since this provides the highest level of compression. According to section 4.12.4.4 of the HTML5 spec, the quality argument should only apply to images of type "image/jpeg", and if quality is not provided, the user-agent should use a default value. This means that the spec was being violated, since the quality was set to 100 regardless of the image type. The fix was to consider the quality argument (along with the associated sanity-checks) only if the image type is "jpeg"; otherwise quality is set to -1. This change results in PNG images being encoded to properly-sized base64 strings. [ChangeLog][WebKit][Behavior Change] The quality parameter in canvas.toDataURL only applies to JPEG images now, in accordance with section 4.12.4.4 of the HTML5 spec. Change-Id: Ie87a32ec368e70e7736d4d2e684e2528ce37f745 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * % unit heights don't work if parent block height is set in vhKonstantin Tokarev2015-12-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118516 Patch by Gurpreet Kaur <k.gurpreet@samsung.com> on 2013-12-04 Reviewed by Simon Fraser. From Blink r156449 by <srinivasa.ragavan.venkateswaran@intel.com> Source/WebCore: An element having height as percentage needs to have the containingblock's height or availableheight to calculate its own height. The containing block having a height set in vh unit was not being considered for calculating the child's height. * rendering/RenderBox.cpp: (WebCore::RenderBox::computePercentageLogicalHeight): Correct child's height(in pecentage) was not being calculated incase of parent having height set in vh unit. Added condition to calculate the containing block height in terms of viewport size. Change-Id: Id0158323c6d1b5a43b267133bfe0c7ce5fe4b472 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Changes for 5.6.0Konstantin Tokarev2015-11-301-0/+42
| | | | | | | | | | | | | | | | | | | | Change-Id: I4cc8c77871530f6578c95cc53d794b61f5c05f5e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-173-7/+7
| | | |\ | | | | | | | | | | | | | | | Change-Id: If31212a273bc60692eb21169f24d136763409ead
| | | | * Check QT_NO_SSL for QtWebKit user agent.5.5Florian Bruhin2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QT_NO_OPENSSL is checked, the user agent says "no SSL support" even when there *is* SSL support via Secure Transport on OS X. Change-Id: Idb8bf3ee95689f60adab332b3cbac7b6bdf6a738 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | | | * Check QT_NO_SSL in SocketStreamHandleQt.Florian Bruhin2015-11-052-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.5, Secure Transport is used instead of OpenSSL on OS X. This means secure websockets (wss://) were disabled on OS X despite QSslSocket being available. Change-Id: Ic584a6ed81b625c84a85e54dba84c8fc920b861a Task-number: QTBUG-49027 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| | | | * Check m_socket in SocketStreamHandlePrivate::close.Florian Bruhin2015-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_socket can be set to 0 in the constructor, e.g. when Qt is compiled without SSL support. Change-Id: Ic3bb18f6c801d463e2277b4c19ef2c790216bf69 Task-number: QTBUG-49027 Reviewed-by: Richard J. Moore <rich@kde.org>
| | | * | Fix link error in MSVCKai Koehne2015-11-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since qtbase/e88334e0 we must not put MSVC linker flags into LIBS or LIBS_PRIVATE. QMAKE_LFLAGS is the right place. This fixes a build error with MSVC: LINK : fatal error LNK1181: cannot open input file '\OPT:REF.obj' A similar fix was already applied to qtwebengine (295a915b5ae66). Change-Id: I7972651cd6e61ef3ecd413be290e49baec29a770 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | | Fix linking with libpthreadAllan Sandfeld Jensen2016-02-221-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit use libpthread directly but is depending on other qt modules causing it to be linked against, which might break unless -lpthread is last. Instead just add it explicitly after the static libraries. Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / / | | | | | | | | | Change-Id: I3cece3d2291ff65078ada4a035b72eb9ae35eb9d