Oilpan: move RenderObjects off heap.

Source/core/rendering/RenderBoxModelObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 39 matching lines @@
 
 namespace blink {
 
 // The HashMap for storing continuation pointers.
 // An inline can be split with blocks occuring in between the inline content.
 // When this occurs we need a pointer to the next object. We can basically be
 // split into a sequence of inlines and blocks. The continuation will either be
 // an anonymous block (that houses other blocks) or it will be an inline flow.
 // <b><i><p>Hello</p></i></b>. In this example the <i> will have a block as
 // its continuation but the <b> will just have an inline as its continuation.
-typedef WillBeHeapHashMap<RawPtrWillBeMember<const RenderBoxModelObject>, RawPtrWillBeMember<RenderBoxModelObject> > ContinuationMap;
-static OwnPtrWillBePersistent<ContinuationMap>* continuationMap = 0;
+typedef HashMap<const RenderBoxModelObject*, RenderBoxModelObject*> ContinuationMap;
+static OwnPtr<ContinuationMap>* continuationMap = 0;

[tkent, 2015/02/04 00:50:44]

This should be |ContinuationMap* continuationMap = nullptr|. We don't need to
use OwnPtr.
Also, (*continuationMap)->foo() should be continuationMap->foo().

[haraken, 2015/02/04 05:48:56]

Can we use DEFINE_STATIC_LOCAL?

[sof, 2015/02/04 08:44:31]

Possibly, but lazy initialization appears to matter here, so I'd very much
prefer not to do co-tidying in this CL.

[sof, 2015/02/04 08:44:31]

Reverted the use of OwnPtr<> & back to 10de152d4's representation of
continuationMap.

 
 void RenderBoxModelObject::setSelectionState(SelectionState state)
 {
     if (state == SelectionInside && selectionState() != SelectionNone)
         return;
 
     if ((state == SelectionStart && selectionState() == SelectionEnd)
         || (state == SelectionEnd && selectionState() == SelectionStart))
         RenderObject::setSelectionState(SelectionBoth);
     else
@@ skipping 393 matching lines @@
 {
     if (!continuationMap)
         return 0;
     return (*continuationMap)->get(this);
 }
 
 void RenderBoxModelObject::setContinuation(RenderBoxModelObject* continuation)
 {
     if (continuation) {
         if (!continuationMap)
-            continuationMap = new OwnPtrWillBePersistent<ContinuationMap>(adoptPtrWillBeNoop(new ContinuationMap));
+            continuationMap = new OwnPtr<ContinuationMap>(adoptPtr(new ContinuationMap));
         (*continuationMap)->set(this, continuation);
     } else {
         if (continuationMap)
             (*continuationMap)->remove(this);
     }
 }
 
 void RenderBoxModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) const
 {
     RenderLayerModelObject::computeLayerHitTestRects(rects);
@@ skipping 169 matching lines @@
     ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
     for (RenderObject* child = startChild; child && child != endChild; ) {
         // Save our next sibling as moveChildTo will clear it.
         RenderObject* nextSibling = child->nextSibling();
         moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
         child = nextSibling;
     }
 }
 
 } // namespace blink