Chromium Code Reviews| Index: Source/core/rendering/RenderBoxModelObject.cpp |
| diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp |
| index 86c16367ea4b217751e49bf6b0564437d1c4d482..6ea0e0b30213ae001079cb8bb2e94bcee7f08980 100644 |
| --- a/Source/core/rendering/RenderBoxModelObject.cpp |
| +++ b/Source/core/rendering/RenderBoxModelObject.cpp |
| @@ -57,8 +57,8 @@ namespace blink { |
| // 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 =
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 matte
sof
2015/02/04 08:44:31
Reverted the use of OwnPtr<> & back to 10de152d4's
|
| void RenderBoxModelObject::setSelectionState(SelectionState state) |
| { |
| @@ -472,7 +472,7 @@ 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) |