Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I0ec164ce6e8099e6e4d6b40a3c7340737473ef4b

3 files changed, 21 insertions, 14 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
index 5cc2043cb1..75cbc9eba1 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.cpp
@@ -230,7 +230,12 @@ void QV4Debugger::leavingFunction(const QV4::ReturnedValue &retVal)
     QMutexLocker locker(&m_lock);
 
     if (m_stepping != NotStepping && m_currentContext.asManaged()->d() == m_engine->current) {
-        m_currentContext.set(m_engine, *m_engine->parentContext(m_engine->currentContext));
+        if (QV4::ExecutionContext *parentContext
+                = m_engine->parentContext(m_engine->currentContext)) {
+            m_currentContext.set(m_engine, *parentContext);
+        } else {
+            m_currentContext.clear();
+        }
         m_stepping = StepOver;
         m_returnedValue.set(m_engine, retVal);
     }
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.cpp b/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.cpp
index dd630c776f..df47e920af 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.cpp
+++ b/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.cpp
@@ -94,7 +94,7 @@ void QSGOpenVGFontGlyphCache::populate(const QVector<quint32> &glyphs)
         referencedGlyphs.insert(glyphIndex);
 
 
-        if (!m_cachedGlyphs.contains(glyphIndex)) {
+        if (!m_glyphReferences.contains(glyphIndex)) {
             newGlyphs.insert(glyphIndex);
         }
     }
@@ -119,17 +119,9 @@ void QSGOpenVGFontGlyphCache::requestGlyphs(const QSet<quint32> &glyphs)
 {
     VGfloat origin[2];
     VGfloat escapement[2];
-    QRectF metrics;
     QRawFont rawFont = m_referenceFont;
 
-    // Before adding any new glyphs, remove any unused glyphs
-    for (auto glyph : qAsConst(m_unusedGlyphs)) {
-        vgClearGlyph(m_font, glyph);
-    }
-
     for (auto glyph : glyphs) {
-         m_cachedGlyphs.insert(glyph);
-
         // Calculate the path for the glyph and cache it.
         QPainterPath path = rawFont.pathForGlyph(glyph);
         VGPath vgPath;
@@ -151,12 +143,23 @@ void QSGOpenVGFontGlyphCache::requestGlyphs(const QSet<quint32> &glyphs)
 
 void QSGOpenVGFontGlyphCache::referenceGlyphs(const QSet<quint32> &glyphs)
 {
-    m_unusedGlyphs -= glyphs;
+    for (auto glyph : glyphs) {
+        if (m_glyphReferences.contains(glyph))
+            m_glyphReferences[glyph] += 1;
+        else
+            m_glyphReferences.insert(glyph, 1);
+    }
 }
 
 void QSGOpenVGFontGlyphCache::releaseGlyphs(const QSet<quint32> &glyphs)
 {
-    m_unusedGlyphs += glyphs;
+    for (auto glyph : glyphs) {
+        int references = m_glyphReferences[glyph] -= 1;
+        if (references == 0) {
+            vgClearGlyph(m_font, glyph);
+            m_glyphReferences.remove(glyph);
+        }
+    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.h b/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.h
index a88d28b0fe..107ec0c892 100644
--- a/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.h
+++ b/src/plugins/scenegraph/openvg/qsgopenvgfontglyphcache.h
@@ -87,8 +87,7 @@ private:
     int m_glyphCount;
 
     VGFont m_font;
-    QSet<quint32> m_cachedGlyphs;
-    QSet<quint32> m_unusedGlyphs;
+    QHash<quint32, int> m_glyphReferences;
 };