Merge 105978 - crash in WebCore::RenderSVGContainer::paint

Source/WebCore/rendering/svg/SVGImageBufferTools.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 69 matching lines @@
     ASSERT(item);
     ASSERT(image);
     ASSERT(image->context());
 
     PaintInfo info(image->context(), PaintInfo::infiniteRect(), PaintPhaseForeground, 0, 0, 0, 0);
 
     AffineTransform& contentTransformation = currentContentTransformation();
     AffineTransform savedContentTransformation = contentTransformation;
     contentTransformation = subtreeContentTransformation * contentTransformation;
 
-    item->layoutIfNeeded();
+    ASSERT(!item->needsLayout());
     item->paint(info, IntPoint());
 
     contentTransformation = savedContentTransformation;
 }
 
 void SVGImageBufferTools::clipToImageBuffer(GraphicsContext* context, const AffineTransform& absoluteTransform, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>& imageBuffer)
 {
     ASSERT(context);
     ASSERT(imageBuffer);
 
@@ skipping 31 matching lines @@
 {
     AffineTransform::DecomposedType decomposition;
     transform.decompose(decomposition);
     decomposition.angle = 0;
     transform.recompose(decomposition);
 }
 
 }
 
 #endif // ENABLE(SVG)