ChangeArbiter/SceneChange: use id as change subject

Instead of having a QNode* or QObservable as the subject of a change, we use
it's unique NodeId instead. That will prevent the ChangeArbiter from trying to
distribute changes by looking at a QNode/QObservable id when the
QNode/QObservable might have been destroyed in the meantime.

Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf
Task-number: QTBUG-44628
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp
index 89f831f0b..3fa5d0308 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/frontend/qrenderpass.cpp
@@ -101,7 +101,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram)
     if (d->m_shader != shaderProgram) {
 
         if (d->m_shader != Q_NULLPTR && d->m_changeArbiter != Q_NULLPTR) {
-            QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, this));
+            QScenePropertyChangePtr e(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
             e->setPropertyName("shaderProgram");
             e->setValue(QVariant::fromValue(d->m_shader->id()));
             d->notifyObservers(e);
@@ -118,7 +118,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram)
             shaderProgram->setParent(this);
 
         if (d->m_changeArbiter != Q_NULLPTR) {
-            QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, this));
+            QScenePropertyChangePtr e(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
             e->setPropertyName("shaderProgram");
             e->setValue(QVariant::fromValue(shaderProgram->id()));
             d->notifyObservers(e);
@@ -146,7 +146,7 @@ void QRenderPass::addAnnotation(QAnnotation *annotation)
             annotation->setParent(this);
 
         if (d->m_changeArbiter != Q_NULLPTR) {
-            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
+            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
             change->setPropertyName("annotation");
             change->setValue(QVariant::fromValue(annotation->id()));
             d->notifyObservers(change);
@@ -158,7 +158,7 @@ void QRenderPass::removeAnnotation(QAnnotation *annotation)
 {
     Q_D(QRenderPass);
     if (d->m_changeArbiter != Q_NULLPTR) {
-        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
+        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
         change->setPropertyName("annotation");
         change->setValue(QVariant::fromValue(annotation->id()));
         d->notifyObservers(change);
@@ -182,7 +182,7 @@ void QRenderPass::addBinding(QParameterMapping *binding)
             binding->setParent(this);
 
         if (d->m_changeArbiter != Q_NULLPTR) {
-            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
+            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
             change->setPropertyName("binding");
             change->setValue(QVariant::fromValue(QNode::clone(binding)));
             d->notifyObservers(change);
@@ -194,7 +194,7 @@ void QRenderPass::removeBinding(QParameterMapping *binding)
 {
     Q_D(QRenderPass);
     if (d->m_changeArbiter != Q_NULLPTR) {
-        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
+        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
         change->setPropertyName("binding");
         change->setValue(QVariant::fromValue(binding->id()));
         d->notifyObservers(change);
@@ -219,7 +219,7 @@ void QRenderPass::addRenderState(QRenderState *state)
             state->setParent(this);
 
         if (d->m_changeArbiter != Q_NULLPTR) {
-            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
+            QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
             change->setPropertyName("renderState");
             change->setValue(QVariant::fromValue(QNode::clone(state)));
             d->notifyObservers(change);
@@ -231,7 +231,7 @@ void QRenderPass::removeRenderState(QRenderState *state)
 {
     Q_D(QRenderPass);
     if (d->m_changeArbiter != Q_NULLPTR) {
-        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, this));
+        QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
         change->setPropertyName("renderState");
         change->setValue(QVariant::fromValue(state->id()));
         d->notifyObservers(change);