Change PaintLayer::m_layoutObject to a reference.

third_party/WebKit/Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  *               (http://www.torchmobile.com/)
@@ skipping 967 matching lines @@
     return IntRect();
 
   IntRect result = rects[0];
   for (size_t i = 1; i < n; ++i)
     result.unite(rects[i]);
   return result;
 }
 
 IntRect LayoutObject::absoluteElementBoundingBoxRect() const {
   Vector<LayoutRect> rects;
-  const LayoutBoxModelObject* container = enclosingLayer()->layoutObject();
+  const LayoutBoxModelObject& container = enclosingLayer()->layoutObject();
   addElementVisualOverflowRects(
-      rects, LayoutPoint(localToAncestorPoint(FloatPoint(), container)));
-  return container->localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))))
+      rects, LayoutPoint(localToAncestorPoint(FloatPoint(), &container)));
+  return container.localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))))
       .enclosingBoundingBox();
 }
 
 FloatRect LayoutObject::absoluteBoundingBoxRectForRange(const Range* range) {
   if (!range || !range->startContainer())
     return FloatRect();
 
   range->ownerDocument().updateStyleAndLayout();
 
   Vector<FloatQuad> quads;
@@ skipping 46 matching lines @@
 const LayoutBoxModelObject* LayoutObject::enclosingCompositedContainer() const {
   LayoutBoxModelObject* container = nullptr;
   // FIXME: CompositingState is not necessarily up to date for many callers of
   // this function.
   DisableCompositingQueryAsserts disabler;
 
   if (PaintLayer* paintingLayer = this->paintingLayer()) {
     if (PaintLayer* compositingLayer =
             paintingLayer
                 ->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())
-      container = compositingLayer->layoutObject();
+      container = &compositingLayer->layoutObject();
   }
   return container;
 }
 
 String LayoutObject::decoratedName() const {
   StringBuilder name;
   name.append(this->name());
 
   if (isAnonymous())
     name.append(" (anonymous)");
@@ skipping 109 matching lines @@
     mapToVisualRectInAncestorSpace(view(), selectionRect);
   return selectionRect;
 }
 
 PaintInvalidationReason LayoutObject::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   DCHECK(&paintInvalidationState.currentObject() == this);
 
   if (styleRef().hasOutline()) {
     PaintLayer& layer = paintInvalidationState.paintingLayer();
-    if (layer.layoutObject() != this)
+    if (&layer.layoutObject() != this)
       layer.setNeedsPaintPhaseDescendantOutlines();
   }
 
   LayoutView* v = view();
   if (v->document().printing())
     return PaintInvalidationNone;  // Don't invalidate paints if we're printing.
 
   PaintInvalidatorContextAdapter context(paintInvalidationState);
 
   const LayoutBoxModelObject& paintInvalidationContainer =
@@ skipping 1156 matching lines @@
   // Figure out what layer our container is in. Any offset (or new layer) for
   // this layoutObject within it's container will be applied in
   // addLayerHitTestRects.
   LayoutPoint layerOffset;
   const PaintLayer* currentLayer = nullptr;
 
   if (!hasLayer()) {
     LayoutObject* container = this->container();
     currentLayer = container->enclosingLayer();
     if (container && currentLayer->layoutObject() != container) {
-      layerOffset.move(
-          container->offsetFromAncestorContainer(currentLayer->layoutObject()));
+      layerOffset.move(container->offsetFromAncestorContainer(
+          &currentLayer->layoutObject()));
       // If the layer itself is scrolled, we have to undo the subtraction of its
       // scroll offset since we want the offset relative to the scrolling
       // content, not the element itself.
-      if (currentLayer->layoutObject()->hasOverflowClip())
+      if (currentLayer->layoutObject().hasOverflowClip())
         layerOffset.move(currentLayer->layoutBox()->scrolledContentOffset());
     }
   }
 
   this->addLayerHitTestRects(layerRects, currentLayer, layerOffset,
                              LayoutRect());
 }
 
 void LayoutObject::addLayerHitTestRects(LayerHitTestRects& layerRects,
                                         const PaintLayer* currentLayer,
@@ skipping 1114 matching lines @@
     const blink::LayoutObject* root = object1;
     while (root->parent())
       root = root->parent();
     root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
   } else {
     WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
   }
 }
 
 #endif