Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(668)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1365853003: LayoutBox::scrollRectToVisible doesn't respect overflow:hidden property. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed typos Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3633 matching lines...) Expand 10 before | Expand all | Expand 10 after
3644 m_horizontalScrollbarMode : m_verticalScrollbarMode; 3644 m_horizontalScrollbarMode : m_verticalScrollbarMode;
3645 3645
3646 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; 3646 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn;
3647 } 3647 }
3648 3648
3649 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const 3649 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const
3650 { 3650 {
3651 return false; 3651 return false;
3652 } 3652 }
3653 3653
3654 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro llAlignment& alignX, const ScrollAlignment& alignY) 3654 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro llAlignment& alignX, const ScrollAlignment& alignY, ScrollType scrollType)
3655 { 3655 {
3656 LayoutRect viewRect(visibleContentRect()); 3656 LayoutRect viewRect(visibleContentRect());
3657 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon tent, alignX, alignY); 3657 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon tent, alignX, alignY);
3658 3658
3659 double xOffset = exposeRect.x(); 3659 double xOffset = exposeRect.x();
3660 double yOffset = exposeRect.y(); 3660 double yOffset = exposeRect.y();
3661 3661
3662 setScrollPosition(DoublePoint(xOffset, yOffset), ProgrammaticScroll); 3662 setScrollPosition(DoublePoint(xOffset, yOffset), scrollType);
3663 3663
3664 // Scrolling the FrameView cannot change the input rect's location relative to the document. 3664 // Scrolling the FrameView cannot change the input rect's location relative to the document.
3665 return rectInContent; 3665 return rectInContent;
3666 } 3666 }
3667 3667
3668 IntRect FrameView::scrollCornerRect() const 3668 IntRect FrameView::scrollCornerRect() const
3669 { 3669 {
3670 IntRect cornerRect; 3670 IntRect cornerRect;
3671 3671
3672 if (hasOverlayScrollbars()) 3672 if (hasOverlayScrollbars())
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
3914 3914
3915 if (!graphicsLayer) 3915 if (!graphicsLayer)
3916 return; 3916 return;
3917 3917
3918 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 3918 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
3919 3919
3920 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3920 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3921 } 3921 }
3922 3922
3923 } // namespace blink 3923 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698