Make the compositing assert disabler for paint invalidation more targeted.

Source/core/rendering/RenderImage.cpp

Index: Source/core/rendering/RenderImage.cpp
diff --git a/Source/core/rendering/RenderImage.cpp b/Source/core/rendering/RenderImage.cpp
index c46e8f0897192af236d61e1663e6f467b39afc4e..a82d073125fbed22c8d42dd936e999d3568567f6 100644
--- a/Source/core/rendering/RenderImage.cpp
+++ b/Source/core/rendering/RenderImage.cpp
@@ -42,6 +42,7 @@
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/PaintInfo.h"
+#include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextRunConstructor.h"
 #include "core/svg/graphics/SVGImage.h"
@@ -251,6 +252,7 @@ void RenderImage::paintInvalidationOrMarkForLayout(bool imageSizeChangedToAccomo
     {
         // FIXME: We should not be allowing paint invalidations during layout. crbug.com/339584
         AllowPaintInvalidationScope scoper(frameView());
+        DisableCompositingQueryAsserts disabler;
         invalidatePaintRectangle(paintInvalidationRect);
     }
 
@@ -435,7 +437,7 @@ void RenderImage::areaElementFocusChanged(HTMLAreaElement* areaElement)
     paintInvalidationRect.moveBy(-absoluteContentBox().location());
     paintInvalidationRect.inflate(outlineWidth);
 
-    invalidatePaintRectangle(paintInvalidationRect);
+    paintInvalidationOrMarkForLayout(false, &paintInvalidationRect);
 }
 
 void RenderImage::paintIntoRect(GraphicsContext* context, const LayoutRect& rect)