| 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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 // is called the same number of times. | 342 // is called the same number of times. |
| 343 // finishDelayUpdateScrollInfo returns true when it marked something for lay
out. | 343 // finishDelayUpdateScrollInfo returns true when it marked something for lay
out. |
| 344 // It will also return a map of saved scroll positions that the caller shoul
d restore | 344 // It will also return a map of saved scroll positions that the caller shoul
d restore |
| 345 // on the given scrollable areas after performing the layout. | 345 // on the given scrollable areas after performing the layout. |
| 346 // This can be necessary because Flexbox's multi-pass layout can lose the sc
roll position. | 346 // This can be necessary because Flexbox's multi-pass layout can lose the sc
roll position. |
| 347 // TODO(cbiesinger): This is a temporary hack. The right solution is to dela
y the scroll | 347 // TODO(cbiesinger): This is a temporary hack. The right solution is to dela
y the scroll |
| 348 // clamping that currently happens in PaintLayerScrollableArea::updateAfterL
ayout to only | 348 // clamping that currently happens in PaintLayerScrollableArea::updateAfterL
ayout to only |
| 349 // happen after all layout is done, i.e. during updateLayerPositionsAfterLay
out. However, | 349 // happen after all layout is done, i.e. during updateLayerPositionsAfterLay
out. However, |
| 350 // that currently fails a layout test. To fix this bug in time for M50, we u
se this temporary | 350 // that currently fails a layout test. To fix this bug in time for M50, we u
se this temporary |
| 351 // hack. The real fix is tracked in crbug.com/600036 | 351 // hack. The real fix is tracked in crbug.com/600036 |
| 352 typedef WTF::HashMap<PaintLayerScrollableArea*, DoublePoint> ScrollPositionM
ap; | 352 typedef PersistentHeapHashMap<Member<PaintLayerScrollableArea>, DoublePoint>
ScrollPositionMap; |
| 353 static void startDelayUpdateScrollInfo(); | 353 static void startDelayUpdateScrollInfo(); |
| 354 static bool finishDelayUpdateScrollInfo(SubtreeLayoutScope*, ScrollPositionM
ap*); | 354 static bool finishDelayUpdateScrollInfo(SubtreeLayoutScope*, ScrollPositionM
ap*); |
| 355 | 355 |
| 356 void updateScrollInfoAfterLayout(); | 356 void updateScrollInfoAfterLayout(); |
| 357 | 357 |
| 358 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid
e; | 358 void styleWillChange(StyleDifference, const ComputedStyle& newStyle) overrid
e; |
| 359 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override
; | 359 void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override
; |
| 360 void updateFromStyle() override; | 360 void updateFromStyle() override; |
| 361 | 361 |
| 362 // Returns true if non-visible overflow should be respected. Otherwise hasOv
erflowClip() will be | 362 // Returns true if non-visible overflow should be respected. Otherwise hasOv
erflowClip() will be |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 // FIXME: This is temporary as we move code that accesses block flow | 519 // FIXME: This is temporary as we move code that accesses block flow |
| 520 // member variables out of LayoutBlock and into LayoutBlockFlow. | 520 // member variables out of LayoutBlock and into LayoutBlockFlow. |
| 521 friend class LayoutBlockFlow; | 521 friend class LayoutBlockFlow; |
| 522 }; | 522 }; |
| 523 | 523 |
| 524 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); | 524 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); |
| 525 | 525 |
| 526 } // namespace blink | 526 } // namespace blink |
| 527 | 527 |
| 528 #endif // LayoutBlock_h | 528 #endif // LayoutBlock_h |
| OLD | NEW |