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

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: nits 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 3663 matching lines...) Expand 10 before | Expand all | Expand 10 after
3674 m_horizontalScrollbarMode : m_verticalScrollbarMode; 3674 m_horizontalScrollbarMode : m_verticalScrollbarMode;
3675 3675
3676 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn; 3676 return mode == ScrollbarAuto || mode == ScrollbarAlwaysOn;
3677 } 3677 }
3678 3678
3679 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const 3679 bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const
3680 { 3680 {
3681 return false; 3681 return false;
3682 } 3682 }
3683 3683
3684 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro llAlignment& alignX, const ScrollAlignment& alignY) 3684 LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro llAlignment& alignX, const ScrollAlignment& alignY, ScrollType scrollType)
3685 { 3685 {
3686 LayoutRect viewRect(visibleContentRect()); 3686 LayoutRect viewRect(visibleContentRect());
3687 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon tent, alignX, alignY); 3687 LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInCon tent, alignX, alignY);
3688 3688
3689 double xOffset = exposeRect.x(); 3689 double xOffset = exposeRect.x();
3690 double yOffset = exposeRect.y(); 3690 double yOffset = exposeRect.y();
3691 3691
3692 setScrollPosition(DoublePoint(xOffset, yOffset), ProgrammaticScroll); 3692 setScrollPosition(DoublePoint(xOffset, yOffset), scrollType);
3693 3693
3694 // Scrolling the FrameView cannot change the input rect's location relative to the document. 3694 // Scrolling the FrameView cannot change the input rect's location relative to the document.
3695 return rectInContent; 3695 return rectInContent;
3696 } 3696 }
3697 3697
3698 IntRect FrameView::scrollCornerRect() const 3698 IntRect FrameView::scrollCornerRect() const
3699 { 3699 {
3700 IntRect cornerRect; 3700 IntRect cornerRect;
3701 3701
3702 if (hasOverlayScrollbars()) 3702 if (hasOverlayScrollbars())
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
3944 3944
3945 if (!graphicsLayer) 3945 if (!graphicsLayer)
3946 return; 3946 return;
3947 3947
3948 PaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObjec t(), paintInvalidationContainer, viewRect); 3948 PaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObjec t(), paintInvalidationContainer, viewRect);
3949 3949
3950 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 3950 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
3951 } 3951 }
3952 3952
3953 } // namespace blink 3953 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698