diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:59:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-18 09:59:57 +0200 |
commit | bbd3a98a7aeb4872d9bcb120306173ef975b3f8f (patch) | |
tree | 2606756f750cb72262b0661c5cfa83ca47419242 | |
parent | 9cbcd93cfe0ba6f7531574f7784e8978bd723110 (diff) | |
parent | 586bdc38324dfaeec65389bf7646c82cb35db017 (diff) | |
download | qtwebkit-bbd3a98a7aeb4872d9bcb120306173ef975b3f8f.tar.gz |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: I5bacbd4ac254149e45003fea759855df598a2f36
-rw-r--r-- | Source/WebCore/html/ImageDocument.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/platform/Length.h | 5 | ||||
-rw-r--r-- | dist/changes-5.4.2 | 54 |
3 files changed, 63 insertions, 2 deletions
diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp index 7d9bcc589..594ccad90 100644 --- a/Source/WebCore/html/ImageDocument.cpp +++ b/Source/WebCore/html/ImageDocument.cpp @@ -135,6 +135,8 @@ void ImageDocumentParser::appendBytes(DocumentWriter*, const char*, size_t) return; CachedImage* cachedImage = document()->cachedImage(); + if (!cachedImage) + return; RefPtr<ResourceBuffer> resourceData = frame->loader()->documentLoader()->mainResourceData(); cachedImage->addDataBuffer(resourceData.get()); @@ -143,8 +145,8 @@ void ImageDocumentParser::appendBytes(DocumentWriter*, const char*, size_t) void ImageDocumentParser::finish() { - if (!isStopped() && document()->imageElement()) { - CachedImage* cachedImage = document()->cachedImage(); + CachedImage* cachedImage = 0; + if (!isStopped() && document()->imageElement() && (cachedImage = document()->cachedImage())) { RefPtr<ResourceBuffer> data = document()->frame()->loader()->documentLoader()->mainResourceData(); // If this is a multipart image, make a copy of the current part, since the resource data diff --git a/Source/WebCore/platform/Length.h b/Source/WebCore/platform/Length.h index 2f91550da..72263b045 100644 --- a/Source/WebCore/platform/Length.h +++ b/Source/WebCore/platform/Length.h @@ -233,6 +233,11 @@ public: Length blend(const Length& from, double progress) const { // Blend two lengths to produce a new length that is in between them. Used for animation. + if (from.isUndefined()) + return *this; + if (isUndefined()) + return from; + if (from.type() == Calculated || type() == Calculated) return blendMixedTypes(from, progress); diff --git a/dist/changes-5.4.2 b/dist/changes-5.4.2 new file mode 100644 index 000000000..913001e3e --- /dev/null +++ b/dist/changes-5.4.2 @@ -0,0 +1,54 @@ +Qt 5.4.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.4.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.4 + +The Qt version 5.4 series is binary compatible with the 5.3.x series. +Applications compiled for 5.3 will continue to run with 5.4. + +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 +-------- + - Fixed privacy breaking icon database usage in private browsing mode. + - Fixed possible OpenGL crashes on exit. + - [QTBUG-44475] Improved performance of initializing large JSON objects. + - [QTBUG-44829] Fixed g++5 builds. + - [QTBUG-44912] Fixed crash on loading svg.js + - [QTBUG-44524] Fixed possible out-of-memory crash and performance issues + on some pages caused by very large accelerated layers. + - [QTBUG-45299] Fixed segmentation fault in JSC::DFG::prepareOSREntry. + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Windows +------- + - [QTBUG-44401,QTBUG-42588,QTBUG-43024] Forwarding show and hide events so + videos in non-visible widgets are hidden. + +ARM +------- + - [QTBUG-44700] Fixed JavaScript crash caused by misbehaving gold linker. + - [QTBUG-44740] Fixed alignment issue in WebKit2 IPC. + +Linux +------- + - [QTBUG-44245] Fixed crash on some HTML5 videos caused by invalid + frame-data from GStreamer. + - [QTBUG-44714] Fixed linking with glib 2.43 and newer. |