Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved. | 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 272 virtual LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit visibleLeftEdge, La youtUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool&); | 272 virtual LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit visibleLeftEdge, La youtUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool&); |
| 273 | 273 |
| 274 #if ENABLE(ASSERT) | 274 #if ENABLE(ASSERT) |
| 275 void setHasBadParent(); | 275 void setHasBadParent(); |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 int expansion() const { return m_bitfields.expansion(); } | 278 int expansion() const { return m_bitfields.expansion(); } |
| 279 | 279 |
| 280 bool visibleToHitTestRequest(const HitTestRequest& request) const { return l ayoutObject().visibleToHitTestRequest(request); } | 280 bool visibleToHitTestRequest(const HitTestRequest& request) const { return l ayoutObject().visibleToHitTestRequest(request); } |
| 281 | 281 |
| 282 EVerticalAlign verticalAlign() const { return layoutObject().style(m_bitfiel ds.firstLine())->verticalAlign(); } | 282 EVerticalAlign verticalAlign() const { return layoutObject().isText() ? layo utObject().styleRef().initialVerticalAlign() : layoutObject().style(m_bitfields. firstLine())->verticalAlign(); } |
|
mstensho (USE GERRIT)
2015/06/10 11:40:41
initialVerticalAlign() is static, so you don't nee
| |
| 283 | 283 |
| 284 // Use with caution! The type is not checked! | 284 // Use with caution! The type is not checked! |
| 285 LayoutBoxModelObject* boxModelObject() const | 285 LayoutBoxModelObject* boxModelObject() const |
| 286 { | 286 { |
| 287 if (!layoutObject().isText()) | 287 if (!layoutObject().isText()) |
| 288 return toLayoutBoxModelObject(&layoutObject()); | 288 return toLayoutBoxModelObject(&layoutObject()); |
| 289 return 0; | 289 return 0; |
| 290 } | 290 } |
| 291 | 291 |
| 292 LayoutPoint locationIncludingFlipping(); | 292 LayoutPoint locationIncludingFlipping(); |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 450 | 450 |
| 451 } // namespace blink | 451 } // namespace blink |
| 452 | 452 |
| 453 #ifndef NDEBUG | 453 #ifndef NDEBUG |
| 454 // Outside the WebCore namespace for ease of invocation from gdb. | 454 // Outside the WebCore namespace for ease of invocation from gdb. |
| 455 void showTree(const blink::InlineBox*); | 455 void showTree(const blink::InlineBox*); |
| 456 void showLineTree(const blink::InlineBox*); | 456 void showLineTree(const blink::InlineBox*); |
| 457 #endif | 457 #endif |
| 458 | 458 |
| 459 #endif // InlineBox_h | 459 #endif // InlineBox_h |
| OLD | NEW |