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 1955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1966 if (!layoutViewItem.isNull()) | 1966 if (!layoutViewItem.isNull()) |
1967 layoutViewItem.layer()->setNeedsCompositingInputsUpdate(); | 1967 layoutViewItem.layer()->setNeedsCompositingInputsUpdate(); |
1968 } | 1968 } |
1969 } | 1969 } |
1970 | 1970 |
1971 bool FrameView::computeCompositedSelection(LocalFrame& frame, | 1971 bool FrameView::computeCompositedSelection(LocalFrame& frame, |
1972 CompositedSelection& selection) { | 1972 CompositedSelection& selection) { |
1973 if (!frame.view() || frame.view()->shouldThrottleRendering()) | 1973 if (!frame.view() || frame.view()->shouldThrottleRendering()) |
1974 return false; | 1974 return false; |
1975 | 1975 |
1976 const VisibleSelection& visibleSelection = frame.selection().selection(); | 1976 const VisibleSelection& visibleSelection = |
| 1977 frame.selection().computeVisibleSelectionInDOMTree(); |
1977 if (visibleSelection.isNone() || !frame.selection().isHandleVisible()) | 1978 if (visibleSelection.isNone() || !frame.selection().isHandleVisible()) |
1978 return false; | 1979 return false; |
1979 | 1980 |
1980 // Non-editable caret selections lack any kind of UI affordance, and | 1981 // Non-editable caret selections lack any kind of UI affordance, and |
1981 // needn't be tracked by the client. | 1982 // needn't be tracked by the client. |
1982 if (visibleSelection.isCaret() && !visibleSelection.isContentEditable()) | 1983 if (visibleSelection.isCaret() && !visibleSelection.isContentEditable()) |
1983 return false; | 1984 return false; |
1984 | 1985 |
1985 VisiblePosition visibleStart(visibleSelection.visibleStart()); | 1986 VisiblePosition visibleStart(visibleSelection.visibleStart()); |
1986 RenderedPosition renderedStart(visibleStart); | 1987 RenderedPosition renderedStart(visibleStart); |
(...skipping 3114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5101 std::unique_ptr<CompositorAnimationTimeline> timeline) { | 5102 std::unique_ptr<CompositorAnimationTimeline> timeline) { |
5102 m_animationTimeline = std::move(timeline); | 5103 m_animationTimeline = std::move(timeline); |
5103 } | 5104 } |
5104 | 5105 |
5105 void FrameView::setAnimationHost( | 5106 void FrameView::setAnimationHost( |
5106 std::unique_ptr<CompositorAnimationHost> host) { | 5107 std::unique_ptr<CompositorAnimationHost> host) { |
5107 m_animationHost = std::move(host); | 5108 m_animationHost = std::move(host); |
5108 } | 5109 } |
5109 | 5110 |
5110 } // namespace blink | 5111 } // namespace blink |
OLD | NEW |