| 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 | 278 |
| 279 public: | 279 public: |
| 280 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false); | 280 virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool = false); |
| 281 protected: | 281 protected: |
| 282 virtual void addOverflowFromChildren(); | 282 virtual void addOverflowFromChildren(); |
| 283 void addOverflowFromPositionedObjects(); | 283 void addOverflowFromPositionedObjects(); |
| 284 void addOverflowFromBlockChildren(); | 284 void addOverflowFromBlockChildren(); |
| 285 | 285 |
| 286 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition
alOffset, const RenderLayerModelObject* paintContainer = 0) const override; | 286 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition
alOffset, const RenderLayerModelObject* paintContainer = 0) const override; |
| 287 | 287 |
| 288 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint&
layerOffset) const override; | |
| 289 | |
| 290 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox*
); | 288 void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox*
); |
| 291 | 289 |
| 292 virtual bool isInlineBlock() const override final { return isInline() && isR
eplaced(); } | 290 virtual bool isInlineBlock() const override final { return isInline() && isR
eplaced(); } |
| 293 | 291 |
| 294 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override; | 292 virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override; |
| 295 | 293 |
| 296 private: | 294 private: |
| 297 virtual RenderObjectChildList* virtualChildren() override final { return chi
ldren(); } | 295 virtual RenderObjectChildList* virtualChildren() override final { return chi
ldren(); } |
| 298 virtual const RenderObjectChildList* virtualChildren() const override final
{ return children(); } | 296 virtual const RenderObjectChildList* virtualChildren() const override final
{ return children(); } |
| 299 | 297 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 401 // FIXME: This is temporary as we move code that accesses block flow | 399 // FIXME: This is temporary as we move code that accesses block flow |
| 402 // member variables out of RenderBlock and into RenderBlockFlow. | 400 // member variables out of RenderBlock and into RenderBlockFlow. |
| 403 friend class RenderBlockFlow; | 401 friend class RenderBlockFlow; |
| 404 }; | 402 }; |
| 405 | 403 |
| 406 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); | 404 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlock, isRenderBlock()); |
| 407 | 405 |
| 408 } // namespace blink | 406 } // namespace blink |
| 409 | 407 |
| 410 #endif // RenderBlock_h | 408 #endif // RenderBlock_h |
| OLD | NEW |