Hoist layout update out of SVGGraphicsElement::GetBBox and overrides

third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2014 Google, Inc.
  *
  * 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.
  *
@@ skipping 155 matching lines @@
   SVGElement* farthest = 0;
   for (Element* current = ParentOrShadowHostElement(); current;
        current = current->ParentOrShadowHostElement()) {
     if (IsViewportElement(*current))
       farthest = ToSVGElement(current);
   }
   return farthest;
 }
 
 FloatRect SVGGraphicsElement::GetBBox() {
-  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
-
-  // FIXME: Eventually we should support getBBox for detached elements.
-  if (!GetLayoutObject())
-    return FloatRect();
-
+  DCHECK(GetLayoutObject());
   return GetLayoutObject()->ObjectBoundingBox();
 }
 
 SVGRectTearOff* SVGGraphicsElement::getBBoxFromJavascript() {
-  return SVGRectTearOff::Create(SVGRect::Create(GetBBox()), 0,
+  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
+
+  // FIXME: Eventually we should support getBBox for detached elements.
+  FloatRect boundingBox;
+  if (GetLayoutObject())
+    boundingBox = GetBBox();
+  return SVGRectTearOff::Create(SVGRect::Create(boundingBox), 0,
                                 kPropertyIsNotAnimVal);
 }
 
 }  // namespace blink