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

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

Issue 2623213002: Expand PaintLayer clip to account for hidden URL bar with document.rootScroller (Closed)
Patch Set: Rebase Created 3 years, 11 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 3678 matching lines...) Expand 10 before | Expand all | Expand 10 after
3689 3689
3690 // We need to perform this const_cast since maximumScrollOffsetInt is a const 3690 // We need to perform this const_cast since maximumScrollOffsetInt is a const
3691 // method but we can't make layoutViewportScrollableArea const since it can 3691 // method but we can't make layoutViewportScrollableArea const since it can
3692 // return |this|. Once root-layer-scrolls ships layoutViewportScrollableArea 3692 // return |this|. Once root-layer-scrolls ships layoutViewportScrollableArea
3693 // can be made const. 3693 // can be made const.
3694 const ScrollableArea* layoutViewport = 3694 const ScrollableArea* layoutViewport =
3695 const_cast<FrameView*>(this)->layoutViewportScrollableArea(); 3695 const_cast<FrameView*>(this)->layoutViewportScrollableArea();
3696 TopDocumentRootScrollerController& controller = 3696 TopDocumentRootScrollerController& controller =
3697 host->globalRootScrollerController(); 3697 host->globalRootScrollerController();
3698 if (layoutViewport == controller.rootScrollerArea()) 3698 if (layoutViewport == controller.rootScrollerArea())
3699 visibleSize = controller.rootScrollerVisibleArea(); 3699 visibleSize = controller.visibleContentRect(ExcludeScrollbars).size();
3700 3700
3701 IntSize maximumOffset = 3701 IntSize maximumOffset =
3702 toIntSize(-scrollOrigin() + (contentBounds - visibleSize)); 3702 toIntSize(-scrollOrigin() + (contentBounds - visibleSize));
3703 return maximumOffset.expandedTo(minimumScrollOffsetInt()); 3703 return maximumOffset.expandedTo(minimumScrollOffsetInt());
3704 } 3704 }
3705 3705
3706 void FrameView::addChild(Widget* child) { 3706 void FrameView::addChild(Widget* child) {
3707 ASSERT(child != this && !child->parent()); 3707 ASSERT(child != this && !child->parent());
3708 child->setParent(this); 3708 child->setParent(this);
3709 m_children.add(child); 3709 m_children.add(child);
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
4998 // This is the top-level frame, so no mapping necessary. 4998 // This is the top-level frame, so no mapping necessary.
4999 if (m_frame->isMainFrame()) 4999 if (m_frame->isMainFrame())
5000 return; 5000 return;
5001 5001
5002 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); 5002 LayoutRect viewportIntersectionRect(remoteViewportIntersection());
5003 transformState.move( 5003 transformState.move(
5004 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); 5004 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y()));
5005 } 5005 }
5006 5006
5007 } // namespace blink 5007 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698