Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 if (hasColumns()) | 223 if (hasColumns()) |
| 224 gColumnInfoMap->take(this); | 224 gColumnInfoMap->take(this); |
| 225 if (gPercentHeightDescendantsMap) | 225 if (gPercentHeightDescendantsMap) |
| 226 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); | 226 removeBlockFromDescendantAndContainerMaps(this, gPercentHeightDescendant sMap, gPercentHeightContainerMap); |
| 227 if (gPositionedDescendantsMap) | 227 if (gPositionedDescendantsMap) |
| 228 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); | 228 removeBlockFromDescendantAndContainerMaps(this, gPositionedDescendantsMa p, gPositionedContainerMap); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void RenderBlock::willBeDestroyed() | 231 void RenderBlock::willBeDestroyed() |
| 232 { | 232 { |
| 233 // Hits in compositing/squashing/squash-onto-nephew.html. | |
| 234 DisableCompositingQueryAsserts disabler; | |
|
abarth-chromium
2014/04/17 17:29:51
Where is the access to composited state? I don't
ajuma
2014/04/17 19:24:44
It's actually in ~CompositedLayerMapping(). I've m
| |
| 235 | |
| 233 // Mark as being destroyed to avoid trouble with merges in removeChild(). | 236 // Mark as being destroyed to avoid trouble with merges in removeChild(). |
| 234 m_beingDestroyed = true; | 237 m_beingDestroyed = true; |
| 235 | 238 |
| 236 // Make sure to destroy anonymous children first while they are still connec ted to the rest of the tree, so that they will | 239 // Make sure to destroy anonymous children first while they are still connec ted to the rest of the tree, so that they will |
| 237 // properly dirty line boxes that they are removed from. Effects that do :be fore/:after only on hover could crash otherwise. | 240 // properly dirty line boxes that they are removed from. Effects that do :be fore/:after only on hover could crash otherwise. |
| 238 children()->destroyLeftoverChildren(); | 241 children()->destroyLeftoverChildren(); |
| 239 | 242 |
| 240 // Destroy our continuation before anything other than anonymous children. | 243 // Destroy our continuation before anything other than anonymous children. |
| 241 // The reason we don't destroy it before anonymous children is that they may | 244 // The reason we don't destroy it before anonymous children is that they may |
| 242 // have continuations of their own that are anonymous children of our contin uation. | 245 // have continuations of their own that are anonymous children of our contin uation. |
| (...skipping 4664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4907 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const | 4910 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const |
| 4908 { | 4911 { |
| 4909 showRenderObject(); | 4912 showRenderObject(); |
| 4910 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) | 4913 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) |
| 4911 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); | 4914 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); |
| 4912 } | 4915 } |
| 4913 | 4916 |
| 4914 #endif | 4917 #endif |
| 4915 | 4918 |
| 4916 } // namespace WebCore | 4919 } // namespace WebCore |
| OLD | NEW |