Merge pull request #145 from zero01101/fix-addon-black-screen

Generally fix black when outpainting using some firefox addons

index.html

@@ -354,7 +354,7 @@
 			src="js/ui/tool/generic.js?v=2bcd36d"
 			type="text/javascript"></script>
 
-		<script src="js/ui/tool/dream.js?v=0e12874" type="text/javascript"></script>
+		<script src="js/ui/tool/dream.js?v=a68bed9" type="text/javascript"></script>
 		<script
 			src="js/ui/tool/maskbrush.js?v=1e8a893"
 			type="text/javascript"></script>

js/ui/tool/dream.js

@@ -835,16 +835,21 @@ const dream_generate_callback = async (bb, resolution, state) => {
 		bbCanvas.height = bb.h;
 		const bbCtx = bbCanvas.getContext("2d");
 
-		const reqCanvas = document.createElement("canvas");
-		reqCanvas.width = request.width;
-		reqCanvas.height = request.height;
-		const reqCtx = reqCanvas.getContext("2d");
+		const maskCanvas = document.createElement("canvas");
+		maskCanvas.width = request.width;
+		maskCanvas.height = request.height;
+		const maskCtx = maskCanvas.getContext("2d");
+
+		const initCanvas = document.createElement("canvas");
+		initCanvas.width = request.width;
+		initCanvas.height = request.height;
+		const initCtx = initCanvas.getContext("2d");
 
 		bbCtx.fillStyle = "#000F";
 
 		// Get init image
-		reqCtx.fillRect(0, 0, request.width, request.height);
-		reqCtx.drawImage(
+		initCtx.fillRect(0, 0, request.width, request.height);
+		initCtx.drawImage(
 			visibleCanvas,
 			0,
 			0,
@@ -855,7 +860,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
 			request.width,
 			request.height
 		);
-		request.init_images = [reqCanvas.toDataURL()];
+		request.init_images = [initCanvas.toDataURL()];
 
 		// Get mask image
 		bbCtx.fillStyle = "#000F";
@@ -909,8 +914,8 @@ const dream_generate_callback = async (bb, resolution, state) => {
 		bbCtx.fillStyle = "#FFFF";
 		bbCtx.fillRect(0, 0, bb.w, bb.h);
 
-		reqCtx.clearRect(0, 0, reqCanvas.width, reqCanvas.height);
-		reqCtx.drawImage(
+		maskCtx.clearRect(0, 0, maskCanvas.width, maskCanvas.height);
+		maskCtx.drawImage(
 			bbCanvas,
 			0,
 			0,
@@ -921,7 +926,7 @@ const dream_generate_callback = async (bb, resolution, state) => {
 			request.width,
 			request.height
 		);
-		request.mask = reqCanvas.toDataURL();
+		request.mask = maskCanvas.toDataURL();
 
 		// Dream
 		_generate("img2img", request, bb, {