Avoid calling updateAllLifecyclePhasesExceptPaint in SVGImage if not needed.

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 320 matching lines @@
     if (!m_page)
         return;
 
     drawInternal(canvas, paint, dstRect, srcRect, shouldRespectImageOrientation, clampMode, KURL());
 }
 
 void SVGImage::drawInternal(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect,
     RespectImageOrientationEnum, ImageClampingMode, const KURL& url)
 {
     FrameView* view = frameView();
-    view->resize(containerSize());
+    bool needsLifecycleUpdateForResize = view->resize(containerSize());
 
     // Always call processUrlFragment, even if the url is empty, because
     // there may have been a previous url/fragment that needs to be reset.
-    view->processUrlFragment(url);
+    bool needsLifecycleUpdateForUrl = view->processUrlFragment(url);
+
+    bool needsLifecycleUpdate = needsLifecycleUpdateForResize || needsLifecycleUpdateForUrl;
+
+    // This is the lifecycle for the SVG document, not what HTML document might contain it.
+    if (needsLifecycleUpdate)
+        view->updateAllLifecyclePhasesExceptPaint();

[fs, 2016/05/23 21:25:56]

Maybe add some assert too to verify lifecycle assumptions before/after? (At
least after.)

 
     SkPictureBuilder imagePicture(dstRect);
     {
         ClipRecorder clipRecorder(imagePicture.context(), imagePicture, DisplayItem::ClipNodeImage, LayoutRect(enclosingIntRect(dstRect)));
 
         // We can only draw the entire frame, clipped to the rect we want. So compute where the top left
         // of the image would be if we were drawing without clipping, and translate accordingly.
         FloatSize scale(dstRect.width() / srcRect.width(), dstRect.height() / srcRect.height());
         FloatSize topLeftOffset(srcRect.location().x() * scale.width(), srcRect.location().y() * scale.height());
         FloatPoint destOffset = dstRect.location() - topLeftOffset;
         AffineTransform transform = AffineTransform::translation(destOffset.x(), destOffset.y());
         transform.scale(scale.width(), scale.height());
         TransformRecorder transformRecorder(imagePicture.context(), imagePicture, transform);
 
-        view->updateAllLifecyclePhasesExceptPaint();
         view->paint(imagePicture.context(), CullRect(enclosingIntRect(srcRect)));
         ASSERT(!view->needsLayout());
     }
 
     {
         SkAutoCanvasRestore ar(canvas, false);
         if (drawNeedsLayer(paint)) {
             SkRect layerRect = dstRect;
             canvas->saveLayer(&layerRect, &paint);
         }
@@ skipping 164 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink