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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 3114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3125 | 3125 |
| 3126 bool RenderObject::canUpdateSelectionOnRootLineBoxes() | 3126 bool RenderObject::canUpdateSelectionOnRootLineBoxes() |
| 3127 { | 3127 { |
| 3128 if (needsLayout()) | 3128 if (needsLayout()) |
| 3129 return false; | 3129 return false; |
| 3130 | 3130 |
| 3131 RenderBlock* containingBlock = this->containingBlock(); | 3131 RenderBlock* containingBlock = this->containingBlock(); |
| 3132 return containingBlock ? !containingBlock->needsLayout() : true; | 3132 return containingBlock ? !containingBlock->needsLayout() : true; |
| 3133 } | 3133 } |
| 3134 | 3134 |
| 3135 bool RenderObject::canDOMChildrenHaveRenderParent() const | |
| 3136 { | |
| 3137 return m_parent ? m_parent->canDOMChildrenHaveRenderParent() : false; | |
|
esprehn
2013/06/17 21:41:02
m_parent && m_parent->....; No need for the ternar
| |
| 3138 } | |
| 3139 | |
| 3135 // We only create "generated" child renderers like one for first-letter if: | 3140 // We only create "generated" child renderers like one for first-letter if: |
| 3136 // - the firstLetterBlock can have children in the DOM and | 3141 // - the firstLetterBlock can have children in the DOM and |
| 3137 // - the block doesn't have any special assumption on its text children. | 3142 // - the block doesn't have any special assumption on its text children. |
| 3138 // This correctly prevents form controls from having such renderers. | 3143 // This correctly prevents form controls from having such renderers. |
| 3139 bool RenderObject::canHaveGeneratedChildren() const | 3144 bool RenderObject::canHaveGeneratedChildren() const |
| 3140 { | 3145 { |
| 3141 return canHaveChildren(); | 3146 return canHaveChildren(); |
| 3142 } | 3147 } |
| 3143 | 3148 |
| 3144 bool RenderObject::canBeReplacedWithInlineRunIn() const | 3149 bool RenderObject::canBeReplacedWithInlineRunIn() const |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3233 { | 3238 { |
| 3234 if (object1) { | 3239 if (object1) { |
| 3235 const WebCore::RenderObject* root = object1; | 3240 const WebCore::RenderObject* root = object1; |
| 3236 while (root->parent()) | 3241 while (root->parent()) |
| 3237 root = root->parent(); | 3242 root = root->parent(); |
| 3238 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3243 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3239 } | 3244 } |
| 3240 } | 3245 } |
| 3241 | 3246 |
| 3242 #endif | 3247 #endif |
| OLD | NEW |