| Index: Source/WebCore/rendering/RenderLayer.cpp | 
| =================================================================== | 
| --- Source/WebCore/rendering/RenderLayer.cpp	(revision 145111) | 
| +++ Source/WebCore/rendering/RenderLayer.cpp	(working copy) | 
| @@ -3754,7 +3754,7 @@ | 
| } | 
|  | 
| // Paint the background. | 
| -            PaintInfo paintInfo(context, pixelSnappedIntRect(damageRect.rect()), PaintPhaseBlockBackground, paintBehavior, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintInfo.rootLayer->renderer()); | 
| +            PaintInfo paintInfo(context, pixelSnappedIntRect(damageRect.rect()), PaintPhaseBlockBackground, paintBehavior, paintingRootForRenderer, localPaintingInfo.region); | 
| renderer()->paint(paintInfo, paintOffset); | 
|  | 
| if (useClipRect) { | 
| @@ -3781,8 +3781,7 @@ | 
|  | 
| PaintInfo paintInfo(context, pixelSnappedIntRect(clipRectToApply.rect()), | 
| selectionOnly ? PaintPhaseSelection : PaintPhaseChildBlockBackgrounds, | 
| -                                forceBlackText ? (PaintBehavior)PaintBehaviorForceBlackText : paintBehavior, paintingRootForRenderer, localPaintingInfo.region, | 
| -                                0, 0, localPaintInfo.rootLayer->renderer()); | 
| +                                forceBlackText ? (PaintBehavior)PaintBehaviorForceBlackText : paintBehavior, paintingRootForRenderer, localPaintingInfo.region); | 
| renderer()->paint(paintInfo, paintOffset); | 
| if (!selectionOnly) { | 
| paintInfo.phase = PaintPhaseFloat; | 
| @@ -3802,7 +3801,7 @@ | 
|  | 
| if (shouldPaintOutline && !outlineRect.isEmpty()) { | 
| // Paint our own outline | 
| -            PaintInfo paintInfo(context, pixelSnappedIntRect(outlineRect.rect()), PaintPhaseSelfOutline, paintBehavior, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintInfo.rootLayer->renderer()); | 
| +            PaintInfo paintInfo(context, pixelSnappedIntRect(outlineRect.rect()), PaintPhaseSelfOutline, paintBehavior, paintingRootForRenderer, localPaintingInfo.region); | 
| clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, outlineRect, DoNotIncludeSelfForBorderRadius); | 
| renderer()->paint(paintInfo, paintOffset); | 
| restoreClip(context, localPaintingInfo.paintDirtyRect, outlineRect); | 
| @@ -3838,7 +3837,7 @@ | 
| clipToRect(localPaintingInfo.rootLayer, context, localPaintingInfo.paintDirtyRect, damageRect, DoNotIncludeSelfForBorderRadius); // Mask painting will handle clipping to self. | 
|  | 
| // Paint the mask. | 
| -        PaintInfo paintInfo(context, pixelSnappedIntRect(damageRect.rect()), PaintPhaseMask, PaintBehaviorNormal, paintingRootForRenderer, localPaintingInfo.region, 0, 0, localPaintInfo.rootLayer->renderer()); | 
| +        PaintInfo paintInfo(context, pixelSnappedIntRect(damageRect.rect()), PaintPhaseMask, PaintBehaviorNormal, paintingRootForRenderer, localPaintingInfo.region); | 
| renderer()->paint(paintInfo, paintOffset); | 
|  | 
| if (useClipRect) { | 
|  |