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 3470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3481 const IntRect& parentRect) const { | 3481 const IntRect& parentRect) const { |
3482 if (const FrameView* parentView = toFrameView(parent())) { | 3482 if (const FrameView* parentView = toFrameView(parent())) { |
3483 // Get our layoutObject in the parent view | 3483 // Get our layoutObject in the parent view |
3484 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); | 3484 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); |
3485 if (layoutItem.isNull()) | 3485 if (layoutItem.isNull()) |
3486 return parentRect; | 3486 return parentRect; |
3487 | 3487 |
3488 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); | 3488 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); |
3489 // Subtract borders and padding | 3489 // Subtract borders and padding |
3490 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), | 3490 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), |
3491 (-layoutItem.borderTop() - layoutItem.paddingTop().toInt())); | 3491 (-layoutItem.borderTop() - layoutItem.paddingTop()).toInt()); |
3492 return rect; | 3492 return rect; |
3493 } | 3493 } |
3494 | 3494 |
3495 return parentRect; | 3495 return parentRect; |
3496 } | 3496 } |
3497 | 3497 |
3498 IntPoint FrameView::convertToContainingWidget( | 3498 IntPoint FrameView::convertToContainingWidget( |
3499 const IntPoint& localPoint) const { | 3499 const IntPoint& localPoint) const { |
3500 if (const FrameView* parentView = toFrameView(parent())) { | 3500 if (const FrameView* parentView = toFrameView(parent())) { |
3501 // Get our layoutObject in the parent view | 3501 // Get our layoutObject in the parent view |
(...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5101 std::unique_ptr<CompositorAnimationTimeline> timeline) { | 5101 std::unique_ptr<CompositorAnimationTimeline> timeline) { |
5102 m_animationTimeline = std::move(timeline); | 5102 m_animationTimeline = std::move(timeline); |
5103 } | 5103 } |
5104 | 5104 |
5105 void FrameView::setAnimationHost( | 5105 void FrameView::setAnimationHost( |
5106 std::unique_ptr<CompositorAnimationHost> host) { | 5106 std::unique_ptr<CompositorAnimationHost> host) { |
5107 m_animationHost = std::move(host); | 5107 m_animationHost = std::move(host); |
5108 } | 5108 } |
5109 | 5109 |
5110 } // namespace blink | 5110 } // namespace blink |
OLD | NEW |