CanvasGraphics, CairoGraphics: set private static graphics to null be…

…fore returning from hitTest()

It can look like a memory leak, when a Graphics object and its owner are held in a static variable. Another hitTest() should clear it, but best to allow GC sooner rather than later.

src/openfl/display/_internal/CairoGraphics.hx

@@ -226,6 +226,7 @@ class CairoGraphics
 
 		if (graphics.__commands.length == 0 || bounds == null || bounds.width == 0 || bounds.height == 0 || !bounds.contains(x, y))
 		{
+			CairoGraphics.graphics = null;
 			return false;
 		}
 		else
@@ -303,6 +304,7 @@ class CairoGraphics
 						if (hasFill && cairo.inFill(x, y))
 						{
 							data.destroy();
+							CairoGraphics.graphics = null;
 							return true;
 						}
 
@@ -311,6 +313,7 @@ class CairoGraphics
 						if (hasStroke && cairo.inStroke(x, y))
 						{
 							data.destroy();
+							CairoGraphics.graphics = null;
 							return true;
 						}
 
@@ -323,6 +326,7 @@ class CairoGraphics
 						if (hasFill && cairo.inFill(x, y))
 						{
 							data.destroy();
+							CairoGraphics.graphics = null;
 							return true;
 						}
 
@@ -331,6 +335,7 @@ class CairoGraphics
 						if (hasStroke && cairo.inStroke(x, y))
 						{
 							data.destroy();
+							CairoGraphics.graphics = null;
 							return true;
 						}
 
@@ -418,6 +423,7 @@ class CairoGraphics
 
 			data.destroy();
 
+			CairoGraphics.graphics = null;
 			return hitTest;
 		}
 		#end
@@ -1154,7 +1160,11 @@ class CairoGraphics
 
 		graphics.__update(renderer.__worldTransform, pixelRatio);
 
-		if (!graphics.__softwareDirty || graphics.__managed) return;
+		if (!graphics.__softwareDirty || graphics.__managed)
+		{
+			CairoGraphics.graphics = null;
+			return;
+		}
 
 		bounds = graphics.__bounds;
 
@@ -1437,6 +1447,7 @@ class CairoGraphics
 
 		graphics.__softwareDirty = false;
 		graphics.__dirty = false;
+		CairoGraphics.graphics = null;
 		#end
 	}
 

src/openfl/display/_internal/CanvasGraphics.hx

@@ -248,6 +248,7 @@ class CanvasGraphics
 
 		if (graphics.__commands.length == 0 || bounds == null || bounds.width <= 0 || bounds.height <= 0)
 		{
+			CanvasGraphics.graphics = null;
 			return false;
 		}
 		else
@@ -331,6 +332,7 @@ class CanvasGraphics
 							data.destroy();
 							graphics.__canvas = cacheCanvas;
 							graphics.__context = cacheContext;
+							CanvasGraphics.graphics = null;
 							return true;
 						}
 
@@ -341,6 +343,7 @@ class CanvasGraphics
 							data.destroy();
 							graphics.__canvas = cacheCanvas;
 							graphics.__context = cacheContext;
+							CanvasGraphics.graphics = null;
 							return true;
 						}
 
@@ -355,6 +358,7 @@ class CanvasGraphics
 							data.destroy();
 							graphics.__canvas = cacheCanvas;
 							graphics.__context = cacheContext;
+							CanvasGraphics.graphics = null;
 							return true;
 						}
 
@@ -365,6 +369,7 @@ class CanvasGraphics
 							data.destroy();
 							graphics.__canvas = cacheCanvas;
 							graphics.__context = cacheContext;
+							CanvasGraphics.graphics = null;
 							return true;
 						}
 
@@ -452,6 +457,7 @@ class CanvasGraphics
 
 			graphics.__canvas = cacheCanvas;
 			graphics.__context = cacheContext;
+			CanvasGraphics.graphics = null;
 			return hitTest;
 		}
 		#end
@@ -1460,6 +1466,7 @@ class CanvasGraphics
 
 			graphics.__softwareDirty = false;
 			graphics.__dirty = false;
+			CanvasGraphics.graphics = null;
 		}
 		#end
 	}