Revert of Revert of Don't check for layout in a canvas if it it's already needed

Source/core/rendering/RenderHTMLCanvas.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 53 matching lines @@
         return;
 
     setIntrinsicSize(zoomedSize);
 
     if (!parent())
         return;
 
     if (!preferredLogicalWidthsDirty())
         setPreferredLogicalWidthsDirty();
 
+    if (selfNeedsLayout())
+        return;
+
     LayoutSize oldSize = size();
     updateLogicalWidth();
     updateLogicalHeight();
     if (oldSize == size())
         return;
 
-    if (!selfNeedsLayout())
-        setNeedsLayout();
+    setNeedsLayout();
 }
 
 CompositingReasons RenderHTMLCanvas::additionalCompositingReasons() const
 {
     HTMLCanvasElement* canvas = toHTMLCanvasElement(node());
     if (canvas->renderingContext() && canvas->renderingContext()->isAccelerated())
         return CompositingReasonCanvas;
 
     return CompositingReasonNone;
 }
 
 } // namespace blink