*** 2428,2437 **** --- 2428,2439 ---- surfaceData = surfaceData.getReplacement(); if (surfaceData == null) { surfaceData = NullSurfaceData.theInstance; } + invalidatePipe(); + // this will recalculate the composite clip setDevClip(surfaceData.getBounds()); if (paintState <= PAINT_ALPHACOLOR) { validateColor();