| 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 3462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3473 const IntRect& parentRect) const { | 3473 const IntRect& parentRect) const { |
| 3474 if (const FrameView* parentView = toFrameView(parent())) { | 3474 if (const FrameView* parentView = toFrameView(parent())) { |
| 3475 // Get our layoutObject in the parent view | 3475 // Get our layoutObject in the parent view |
| 3476 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); | 3476 LayoutPartItem layoutItem = m_frame->ownerLayoutItem(); |
| 3477 if (layoutItem.isNull()) | 3477 if (layoutItem.isNull()) |
| 3478 return parentRect; | 3478 return parentRect; |
| 3479 | 3479 |
| 3480 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); | 3480 IntRect rect = parentView->convertToLayoutItem(layoutItem, parentRect); |
| 3481 // Subtract borders and padding | 3481 // Subtract borders and padding |
| 3482 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), | 3482 rect.move((-layoutItem.borderLeft() - layoutItem.paddingLeft()).toInt(), |
| 3483 (-layoutItem.borderTop() - layoutItem.paddingTop().toInt())); | 3483 (-layoutItem.borderTop() - layoutItem.paddingTop()).toInt()); |
| 3484 return rect; | 3484 return rect; |
| 3485 } | 3485 } |
| 3486 | 3486 |
| 3487 return parentRect; | 3487 return parentRect; |
| 3488 } | 3488 } |
| 3489 | 3489 |
| 3490 IntPoint FrameView::convertToContainingWidget( | 3490 IntPoint FrameView::convertToContainingWidget( |
| 3491 const IntPoint& localPoint) const { | 3491 const IntPoint& localPoint) const { |
| 3492 if (const FrameView* parentView = toFrameView(parent())) { | 3492 if (const FrameView* parentView = toFrameView(parent())) { |
| 3493 // Get our layoutObject in the parent view | 3493 // Get our layoutObject in the parent view |
| (...skipping 1590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5084 std::unique_ptr<CompositorAnimationTimeline> timeline) { | 5084 std::unique_ptr<CompositorAnimationTimeline> timeline) { |
| 5085 m_animationTimeline = std::move(timeline); | 5085 m_animationTimeline = std::move(timeline); |
| 5086 } | 5086 } |
| 5087 | 5087 |
| 5088 void FrameView::setAnimationHost( | 5088 void FrameView::setAnimationHost( |
| 5089 std::unique_ptr<CompositorAnimationHost> host) { | 5089 std::unique_ptr<CompositorAnimationHost> host) { |
| 5090 m_animationHost = std::move(host); | 5090 m_animationHost = std::move(host); |
| 5091 } | 5091 } |
| 5092 | 5092 |
| 5093 } // namespace blink | 5093 } // namespace blink |
| OLD | NEW |