| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1704 // URL bar will expose area outside the current LayoutView so we need to | 1704 // URL bar will expose area outside the current LayoutView so we need to |
| 1705 // paint additional background. If RLS is on, we've already invalidated | 1705 // paint additional background. If RLS is on, we've already invalidated |
| 1706 // above. | 1706 // above. |
| 1707 LayoutViewItem lvi = GetLayoutViewItem(); | 1707 LayoutViewItem lvi = GetLayoutViewItem(); |
| 1708 DCHECK(!lvi.IsNull()); | 1708 DCHECK(!lvi.IsNull()); |
| 1709 if (lvi.DocumentRect().Height() < lvi.ViewRect().Height()) | 1709 if (lvi.DocumentRect().Height() < lvi.ViewRect().Height()) |
| 1710 lvi.SetShouldDoFullPaintInvalidation(); | 1710 lvi.SetShouldDoFullPaintInvalidation(); |
| 1711 } | 1711 } |
| 1712 } | 1712 } |
| 1713 | 1713 |
| 1714 if (!HasViewportConstrainedObjects()) | 1714 if (GetFrame().GetDocument() && !IsInPerformLayout()) |
| 1715 MarkViewportConstrainedObjectsForLayout(width_changed, height_changed); |
| 1716 } |
| 1717 |
| 1718 void FrameView::MarkViewportConstrainedObjectsForLayout(bool width_changed, |
| 1719 bool height_changed) { |
| 1720 if (!HasViewportConstrainedObjects() || !(width_changed || height_changed)) |
| 1715 return; | 1721 return; |
| 1716 | 1722 |
| 1717 for (const auto& viewport_constrained_object : | 1723 for (const auto& viewport_constrained_object : |
| 1718 *viewport_constrained_objects_) { | 1724 *viewport_constrained_objects_) { |
| 1719 LayoutObject* layout_object = viewport_constrained_object; | 1725 LayoutObject* layout_object = viewport_constrained_object; |
| 1720 const ComputedStyle& style = layout_object->StyleRef(); | 1726 const ComputedStyle& style = layout_object->StyleRef(); |
| 1721 if (width_changed) { | 1727 if (width_changed) { |
| 1722 if (style.Width().IsFixed() && | 1728 if (style.Width().IsFixed() && |
| 1723 (style.Left().IsAuto() || style.Right().IsAuto())) | 1729 (style.Left().IsAuto() || style.Right().IsAuto())) |
| 1724 layout_object->SetNeedsPositionedMovementLayout(); | 1730 layout_object->SetNeedsPositionedMovementLayout(); |
| (...skipping 3663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5388 void FrameView::SetAnimationHost( | 5394 void FrameView::SetAnimationHost( |
| 5389 std::unique_ptr<CompositorAnimationHost> host) { | 5395 std::unique_ptr<CompositorAnimationHost> host) { |
| 5390 animation_host_ = std::move(host); | 5396 animation_host_ = std::move(host); |
| 5391 } | 5397 } |
| 5392 | 5398 |
| 5393 LayoutUnit FrameView::CaretWidth() const { | 5399 LayoutUnit FrameView::CaretWidth() const { |
| 5394 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); | 5400 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); |
| 5395 } | 5401 } |
| 5396 | 5402 |
| 5397 } // namespace blink | 5403 } // namespace blink |
| OLD | NEW |