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

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

Issue 911083002: Carry out a resize even if no layout has been performed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added comment to unit test Created 5 years, 10 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 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 m_verticalScrollbar->setElasticOverscroll(elasticOverscroll.height() ); 1599 m_verticalScrollbar->setElasticOverscroll(elasticOverscroll.height() );
1600 scrollAnimator()->notifyContentAreaScrolled(FloatSize(0, delta)); 1600 scrollAnimator()->notifyContentAreaScrolled(FloatSize(0, delta));
1601 if (!m_scrollbarsSuppressed) 1601 if (!m_scrollbarsSuppressed)
1602 m_verticalScrollbar->invalidate(); 1602 m_verticalScrollbar->invalidate();
1603 } 1603 }
1604 } 1604 }
1605 } 1605 }
1606 1606
1607 IntSize FrameView::layoutSize(IncludeScrollbarsInRect scrollbarInclusion) const 1607 IntSize FrameView::layoutSize(IncludeScrollbarsInRect scrollbarInclusion) const
1608 { 1608 {
1609 return scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_layoutS ize) : m_layoutSize; 1609 IntSize ret = scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_ layoutSize) : m_layoutSize;
1610 if (m_frame->settings()->forceZeroLayoutHeight())
1611 ret.setHeight(0);
1612 return ret;
1610 } 1613 }
1611 1614
1612 void FrameView::setLayoutSize(const IntSize& size) 1615 void FrameView::setLayoutSize(const IntSize& size)
1613 { 1616 {
1614 ASSERT(!layoutSizeFixedToFrameSize()); 1617 ASSERT(!layoutSizeFixedToFrameSize());
1615 1618
1616 setLayoutSizeInternal(size); 1619 setLayoutSizeInternal(size);
1617 } 1620 }
1618 1621
1619 void FrameView::scrollPositionChanged() 1622 void FrameView::scrollPositionChanged()
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after
3059 3062
3060 void FrameView::setLayoutSizeInternal(const IntSize& size) 3063 void FrameView::setLayoutSizeInternal(const IntSize& size)
3061 { 3064 {
3062 if (m_layoutSize == size) 3065 if (m_layoutSize == size)
3063 return; 3066 return;
3064 3067
3065 m_layoutSize = size; 3068 m_layoutSize = size;
3066 contentsResized(); 3069 contentsResized();
3067 } 3070 }
3068 3071
3072 void FrameView::didChangeForceLayoutHeightMode()
3073 {
3074 contentsResized();
3075 }
3076
3069 void FrameView::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orien tation) 3077 void FrameView::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orien tation)
3070 { 3078 {
3071 ScrollableArea::didAddScrollbar(scrollbar, orientation); 3079 ScrollableArea::didAddScrollbar(scrollbar, orientation);
3072 if (AXObjectCache* cache = axObjectCache()) 3080 if (AXObjectCache* cache = axObjectCache())
3073 cache->handleScrollbarUpdate(this); 3081 cache->handleScrollbarUpdate(this);
3074 } 3082 }
3075 3083
3076 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3084 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3077 { 3085 {
3078 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3086 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
4032 { 4040 {
4033 Settings* settings = frame().settings(); 4041 Settings* settings = frame().settings();
4034 if (!settings || !settings->rootLayerScrolls()) 4042 if (!settings || !settings->rootLayerScrolls())
4035 return this; 4043 return this;
4036 4044
4037 RenderView* renderView = this->renderView(); 4045 RenderView* renderView = this->renderView();
4038 return renderView ? renderView->scrollableArea() : nullptr; 4046 return renderView ? renderView->scrollableArea() : nullptr;
4039 } 4047 }
4040 4048
4041 } // namespace blink 4049 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698