| 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 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r
ights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 protected: | 548 protected: |
| 549 virtual void addOverflowFromChildren(); | 549 virtual void addOverflowFromChildren(); |
| 550 void addOverflowFromFloats(); | 550 void addOverflowFromFloats(); |
| 551 void addOverflowFromPositionedObjects(); | 551 void addOverflowFromPositionedObjects(); |
| 552 void addOverflowFromBlockChildren(); | 552 void addOverflowFromBlockChildren(); |
| 553 void addOverflowFromInlineChildren(); | 553 void addOverflowFromInlineChildren(); |
| 554 void addVisualOverflowFromTheme(); | 554 void addVisualOverflowFromTheme(); |
| 555 | 555 |
| 556 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition
alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; | 556 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition
alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; |
| 557 | 557 |
| 558 virtual void computeOwnHitTestRects(Vector<IntRect>&, const LayoutPoint& lay
erOffset) const OVERRIDE; |
| 559 |
| 558 // Only used by RenderSVGText, which explicitly overrides RenderBlock::layou
tBlock(), do NOT use for anything else. | 560 // Only used by RenderSVGText, which explicitly overrides RenderBlock::layou
tBlock(), do NOT use for anything else. |
| 559 void forceLayoutInlineChildren() | 561 void forceLayoutInlineChildren() |
| 560 { | 562 { |
| 561 LayoutUnit repaintLogicalTop = 0; | 563 LayoutUnit repaintLogicalTop = 0; |
| 562 LayoutUnit repaintLogicalBottom = 0; | 564 LayoutUnit repaintLogicalBottom = 0; |
| 563 clearFloats(); | 565 clearFloats(); |
| 564 layoutInlineChildren(true, repaintLogicalTop, repaintLogicalBottom); | 566 layoutInlineChildren(true, repaintLogicalTop, repaintLogicalBottom); |
| 565 } | 567 } |
| 566 | 568 |
| 567 bool updateRegionsAndShapesLogicalSize(RenderFlowThread*); | 569 bool updateRegionsAndShapesLogicalSize(RenderFlowThread*); |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 static String string(const int value); | 1326 static String string(const int value); |
| 1325 }; | 1327 }; |
| 1326 template<> struct ValueToString<RenderBlock::FloatingObject*> { | 1328 template<> struct ValueToString<RenderBlock::FloatingObject*> { |
| 1327 static String string(const RenderBlock::FloatingObject*); | 1329 static String string(const RenderBlock::FloatingObject*); |
| 1328 }; | 1330 }; |
| 1329 #endif | 1331 #endif |
| 1330 | 1332 |
| 1331 } // namespace WebCore | 1333 } // namespace WebCore |
| 1332 | 1334 |
| 1333 #endif // RenderBlock_h | 1335 #endif // RenderBlock_h |
| OLD | NEW |