| 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 3652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3663 m_horizontalScrollbarMode : m_verticalScrollbarMode; | 3663 m_horizontalScrollbarMode : m_verticalScrollbarMode; |
| 3664 | 3664 |
| 3665 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; | 3665 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; |
| 3666 } | 3666 } |
| 3667 | 3667 |
| 3668 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const | 3668 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const |
| 3669 { | 3669 { |
| 3670 return false; | 3670 return false; |
| 3671 } | 3671 } |
| 3672 | 3672 |
| 3673 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro
llAlignment& alignX, const ScrollAlignment& alignY) | 3673 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro
llAlignment& alignX, const ScrollAlignment& alignY, ScrollType scrollType) |
| 3674 { | 3674 { |
| 3675 LayoutRect viewRect(visibleContentRect()); | 3675 LayoutRect viewRect(visibleContentRect()); |
| 3676 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon
tent, alignX, alignY); | 3676 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon
tent, alignX, alignY); |
| 3677 | 3677 |
| 3678 double xOffset = exposeRect.x(); | 3678 double xOffset = exposeRect.x(); |
| 3679 double yOffset = exposeRect.y(); | 3679 double yOffset = exposeRect.y(); |
| 3680 | 3680 |
| 3681 setScrollPosition(DoublePoint(xOffset, yOffset), ProgrammaticScroll); | 3681 setScrollPosition(DoublePoint(xOffset, yOffset), scrollType); |
| 3682 | 3682 |
| 3683 // Scrolling the FrameView cannot change the input rect's location relative
to the document. | 3683 // Scrolling the FrameView cannot change the input rect's location relative
to the document. |
| 3684 return rectInContent; | 3684 return rectInContent; |
| 3685 } | 3685 } |
| 3686 | 3686 |
| 3687 IntRect FrameView::scrollCornerRect() const | 3687 IntRect FrameView::scrollCornerRect() const |
| 3688 { | 3688 { |
| 3689 IntRect cornerRect; | 3689 IntRect cornerRect; |
| 3690 | 3690 |
| 3691 if (hasOverlayScrollbars()) | 3691 if (hasOverlayScrollbars()) |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3933 | 3933 |
| 3934 if (!graphicsLayer) | 3934 if (!graphicsLayer) |
| 3935 return; | 3935 return; |
| 3936 | 3936 |
| 3937 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); | 3937 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL
ayoutObject(), paintInvalidationContainer, viewRect); |
| 3938 | 3938 |
| 3939 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); | 3939 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web
Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing
IntRect(viewRect))); |
| 3940 } | 3940 } |
| 3941 | 3941 |
| 3942 } // namespace blink | 3942 } // namespace blink |
| OLD | NEW |