Hoist layout update out of SVGGraphicsElement::GetBBox and overrides

third_party/WebKit/Source/core/dom/ResizeObservation.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/ResizeObservation.h"
 
 #include "core/dom/ResizeObserver.h"
 #include "core/layout/LayoutBox.h"
 #include "core/svg/SVGElement.h"
 #include "core/svg/SVGGraphicsElement.h"
@@ skipping 20 matching lines @@
 
 size_t ResizeObservation::TargetDepth() {
   unsigned depth = 0;
   for (Element* parent = target_; parent; parent = parent->parentElement())
     ++depth;
   return depth;
 }
 
 LayoutSize ResizeObservation::ComputeTargetSize() const {
   if (target_) {
-    if (target_->IsSVGElement() &&
-        ToSVGElement(target_)->IsSVGGraphicsElement()) {
-      SVGGraphicsElement& svg = ToSVGGraphicsElement(*target_);
-      return LayoutSize(svg.GetBBox().Size());
+    if (LayoutObject* layout_object = target_->GetLayoutObject()) {
+      if (target_->IsSVGElement() &&
+          ToSVGElement(target_)->IsSVGGraphicsElement()) {
+        SVGGraphicsElement& svg = ToSVGGraphicsElement(*target_);
+        return LayoutSize(svg.GetBBox().Size());
+      }
+      if (layout_object->IsBox())
+        return ToLayoutBox(layout_object)->ContentSize();
     }
-    LayoutBox* layout = target_->GetLayoutBox();
-    if (layout)
-      return layout->ContentSize();
   }
   return LayoutSize();
 }
 
 LayoutPoint ResizeObservation::ComputeTargetLocation() const {
   if (target_ && !target_->IsSVGElement()) {
     if (LayoutBox* layout = target_->GetLayoutBox())
       return LayoutPoint(layout->PaddingLeft(), layout->PaddingTop());
   }
   return LayoutPoint();
 }
 
 void ResizeObservation::ElementSizeChanged() {
   element_size_changed_ = true;
   observer_->ElementSizeChanged();
 }
 
 DEFINE_TRACE(ResizeObservation) {
   visitor->Trace(target_);
   visitor->Trace(observer_);
 }
 
 }  // namespace blink