| 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 3420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3431 const IntRect& parentRect) const { | 3431 const IntRect& parentRect) const { |
| 3432 if (const FrameView* parentView = toFrameView(parent())) { | 3432 if (const FrameView* parentView = toFrameView(parent())) { |
| 3433 // Get our layoutObject in the parent view | 3433 // Get our layoutObject in the parent view |
| 3434 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); | 3434 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); |
| 3435 if (layoutItem.isNull()) | 3435 if (layoutItem.isNull()) |
| 3436 return parentRect; | 3436 return parentRect; |
| 3437 | 3437 |
| 3438 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); | 3438 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); |
| 3439 // Subtract borders and padding | 3439 // Subtract borders and padding |
| 3440 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), | 3440 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), |
| 3441 (-layoutItem.borderTop() - layoutItem.paddingTop().toInt())); | 3441 (-layoutItem.borderTop() - layoutItem.paddingTop()).toInt()); |
| 3442 return rect; | 3442 return rect; |
| 3443 } | 3443 } |
| 3444 | 3444 |
| 3445 return parentRect; | 3445 return parentRect; |
| 3446 } | 3446 } |
| 3447 | 3447 |
| 3448 IntPoint FrameView::convertToContainingWidget( | 3448 IntPoint FrameView::convertToContainingWidget( |
| 3449 const IntPoint& localPoint) const { | 3449 const IntPoint& localPoint) const { |
| 3450 if (const FrameView* parentView = toFrameView(parent())) { | 3450 if (const FrameView* parentView = toFrameView(parent())) { |
| 3451 // Get our layoutObject in the parent view | 3451 // Get our layoutObject in the parent view |
| (...skipping 1566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5018 std::unique_ptr<CompositorAnimationTimeline> timeline) { | 5018 std::unique_ptr<CompositorAnimationTimeline> timeline) { |
| 5019 m_animationTimeline = std::move(timeline); | 5019 m_animationTimeline = std::move(timeline); |
| 5020 } | 5020 } |
| 5021 | 5021 |
| 5022 void FrameView::setAnimationHost( | 5022 void FrameView::setAnimationHost( |
| 5023 std::unique_ptr<CompositorAnimationHost> host) { | 5023 std::unique_ptr<CompositorAnimationHost> host) { |
| 5024 m_animationHost = std::move(host); | 5024 m_animationHost = std::move(host); |
| 5025 } | 5025 } |
| 5026 | 5026 |
| 5027 } // namespace blink | 5027 } // namespace blink |
| OLD | NEW |