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

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

Issue 882683003: Normalize top controls offset to (0, 1), Blink-side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename to shownratio 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
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3068 matching lines...) Expand 10 before | Expand all | Expand 10 after
3079 { 3079 {
3080 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3080 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3081 if (AXObjectCache* cache = axObjectCache()) { 3081 if (AXObjectCache* cache = axObjectCache()) {
3082 cache->remove(scrollbar); 3082 cache->remove(scrollbar);
3083 cache->handleScrollbarUpdate(this); 3083 cache->handleScrollbarUpdate(this);
3084 } 3084 }
3085 } 3085 }
3086 3086
3087 void FrameView::setTopControlsViewportAdjustment(float adjustment) 3087 void FrameView::setTopControlsViewportAdjustment(float adjustment)
3088 { 3088 {
3089 #if !OS(ANDROID)
3090 // The adjustment is done only for top controls which are android only.
3091 ASSERT(!adjustment);
3092 #endif
3093 m_topControlsViewportAdjustment = adjustment; 3089 m_topControlsViewportAdjustment = adjustment;
3094 } 3090 }
3095 3091
3096 IntPoint FrameView::maximumScrollPosition() const 3092 IntPoint FrameView::maximumScrollPosition() const
3097 { 3093 {
3098 // Make the same calculation as in CC's LayerImpl::MaxScrollOffset() 3094 // Make the same calculation as in CC's LayerImpl::MaxScrollOffset()
3099 // FIXME: We probably shouldn't be storing the bounds in a float. crbug.com/ 422331. 3095 // FIXME: We probably shouldn't be storing the bounds in a float. crbug.com/ 422331.
3100 FloatSize visibleSize = unscaledVisibleContentSize(ExcludeScrollbars); 3096 FloatSize visibleSize = unscaledVisibleContentSize(ExcludeScrollbars);
3101 visibleSize.expand(0, m_topControlsViewportAdjustment); 3097 visibleSize.expand(0, m_topControlsViewportAdjustment);
3102 3098
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
4038 { 4034 {
4039 Settings* settings = frame().settings(); 4035 Settings* settings = frame().settings();
4040 if (!settings || !settings->rootLayerScrolls()) 4036 if (!settings || !settings->rootLayerScrolls())
4041 return this; 4037 return this;
4042 4038
4043 RenderView* renderView = this->renderView(); 4039 RenderView* renderView = this->renderView();
4044 return renderView ? renderView->scrollableArea() : nullptr; 4040 return renderView ? renderView->scrollableArea() : nullptr;
4045 } 4041 }
4046 4042
4047 } // namespace blink 4043 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698