Refactor/simplify bounding box update in LayoutSVGImage

The |needs_boundaries_update_| flag isn't really used for anything since
we always update the boundaries/object bounding box regardless. Hence it
doesn't add anything that the return value of UpdateBoundingBox()
doesn't already convey. In ImageChanged() only check if the image
dimensions changed without updating the oBB, but rather leave that to
the layout that will be triggered.

Bug: 1028061
Change-Id: I418e49952bbd808ceecc44bfa27b7ce07f8d698d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532459Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#826308}

third_party/blink/renderer/core/layout/svg/layout_svg_image.cc

@@ -50,7 +50,6 @@ namespace blink {
 
 LayoutSVGImage::LayoutSVGImage(SVGImageElement* impl)
     : LayoutSVGModelObject(impl),
-      needs_boundaries_update_(true),
       needs_transform_update_(true),
       transform_uses_reference_box_(false),
       image_resource_(MakeGarbageCollected<LayoutImageResource>()) {
@@ -152,11 +151,7 @@ bool LayoutSVGImage::UpdateBoundingBox() {
   if (style.Width().IsAuto() || style.Height().IsAuto())
     object_bounding_box_.SetSize(CalculateObjectSize());
 
-  if (old_object_bounding_box != object_bounding_box_) {
-    SetShouldDoFullPaintInvalidation(PaintInvalidationReason::kImage);
-    needs_boundaries_update_ = true;
-  }
-  return old_object_bounding_box.Size() != object_bounding_box_.Size();
+  return old_object_bounding_box != object_bounding_box_;
 }
 
 void LayoutSVGImage::UpdateLayout() {
@@ -164,16 +159,14 @@ void LayoutSVGImage::UpdateLayout() {
   DCHECK(NeedsLayout());
   LayoutAnalyzer::Scope analyzer(*this);
 
-  FloatPoint old_bbox_location = object_bounding_box_.Location();
-  bool bbox_changed = UpdateBoundingBox() ||
-                      old_bbox_location != object_bounding_box_.Location();
-
-  // Invalidate all resources of this client if our reference box changed.
-  if (EverHadLayout() && bbox_changed)
-    SVGResourceInvalidator(*this).InvalidateEffects();
+  const bool bbox_changed = UpdateBoundingBox();
+  if (bbox_changed) {
+    SetShouldDoFullPaintInvalidation(PaintInvalidationReason::kImage);
 
-  bool update_parent_boundaries = needs_boundaries_update_;
-  needs_boundaries_update_ = false;
+    // Invalidate all resources of this client if our reference box changed.
+    if (EverHadLayout())
+      SVGResourceInvalidator(*this).InvalidateEffects();
+  }
 
   if (!needs_transform_update_ && transform_uses_reference_box_) {
     needs_transform_update_ = CheckForImplicitTransformChange(bbox_changed);
@@ -181,6 +174,7 @@ void LayoutSVGImage::UpdateLayout() {
       SetNeedsPaintPropertyUpdate();
   }
 
+  bool update_parent_boundaries = bbox_changed;
   if (needs_transform_update_) {
     local_transform_ = CalculateLocalTransform();
     needs_transform_update_ = false;
@@ -191,7 +185,6 @@ void LayoutSVGImage::UpdateLayout() {
   if (update_parent_boundaries)
     LayoutSVGModelObject::SetNeedsBoundariesUpdate();
 
-  DCHECK(!needs_boundaries_update_);
   DCHECK(!needs_transform_update_);
 
   if (auto* svg_image_element = DynamicTo<SVGImageElement>(GetElement())) {
@@ -252,7 +245,7 @@ void LayoutSVGImage::ImageChanged(WrappedImagePtr, CanDeferInvalidation defer) {
                                                                          false);
 
   if (StyleRef().Width().IsAuto() || StyleRef().Height().IsAuto()) {
-    if (UpdateBoundingBox())
+    if (CalculateObjectSize() != object_bounding_box_.Size())
       SetNeedsLayout(layout_invalidation_reason::kSizeChanged);
   }
 

third_party/blink/renderer/core/layout/svg/layout_svg_image.h

@@ -36,10 +36,7 @@ class LayoutSVGImage final : public LayoutSVGModelObject {
   explicit LayoutSVGImage(SVGImageElement*);
   ~LayoutSVGImage() override;
 
-  void SetNeedsBoundariesUpdate() override {
-    NOT_DESTROYED();
-    needs_boundaries_update_ = true;
-  }
+  void SetNeedsBoundariesUpdate() override { NOT_DESTROYED(); }
   void SetNeedsTransformUpdate() override {
     NOT_DESTROYED();
     needs_transform_update_ = true;
@@ -104,7 +101,6 @@ class LayoutSVGImage final : public LayoutSVGModelObject {
   FloatSize CalculateObjectSize() const;
   bool HasOverriddenIntrinsicSize() const;
 
-  bool needs_boundaries_update_ : 1;
   bool needs_transform_update_ : 1;
   bool transform_uses_reference_box_ : 1;
   AffineTransform local_transform_;