From b47f584d07aec2d78ea4a5a5ccf2c761f44f5585 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 1 Oct 2019 20:15:25 +0300 Subject: Import QtWebKit commit 45c329ee23a9b898fe8e6f0b0ccef8680aab3098 Change-Id: Iebca31394d29eed00a48980825fdd70d93f04d86 Reviewed-by: Konstantin Tokarev --- Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 6bf343087..72db3ebaf 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -1600,7 +1600,7 @@ void GraphicsContext::set3DTransform(const TransformationMatrix& transform) void GraphicsContext::setURLForRect(const URL& url, const IntRect& rect) { -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) && !defined(QT_NO_PDF) if (paintingDisabled()) return; -- cgit v1.2.1 From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 8 Oct 2019 01:20:22 +0300 Subject: Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ce Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 Reviewed-by: Konstantin Tokarev --- Source/WebCore/dom/Document.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 1bca2d0a6..19355f166 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) unsigned i = 0; UChar32 c; - U16_NEXT(characters, i, length, c) + U16_NEXT(characters, i, length, c); if (!isValidNameStart(c)) return false; while (i < length) { - U16_NEXT(characters, i, length, c) + U16_NEXT(characters, i, length, c); if (!isValidNamePart(c)) return false; } @@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S for (unsigned i = 0; i < length;) { UChar32 c; - U16_NEXT(qualifiedName, i, length, c) + U16_NEXT(qualifiedName, i, length, c); if (c == ':') { if (sawColon) { ec = NAMESPACE_ERR; -- cgit v1.2.1