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

Side by Side Diff: Source/core/rendering/RenderLayerScrollableArea.cpp

Issue 23819019: Refactor fixed layout mode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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
« no previous file with comments | « Source/core/rendering/RenderLayerScrollableArea.h ('k') | Source/core/rendering/RenderView.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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 } 388 }
389 389
390 IntPoint RenderLayerScrollableArea::maximumScrollPosition() const 390 IntPoint RenderLayerScrollableArea::maximumScrollPosition() const
391 { 391 {
392 if (!m_box->hasOverflowClip()) 392 if (!m_box->hasOverflowClip())
393 return -scrollOrigin(); 393 return -scrollOrigin();
394 394
395 return -scrollOrigin() + enclosingIntRect(m_overflowRect).size() - enclosing IntRect(m_box->clientBoxRect()).size(); 395 return -scrollOrigin() + enclosingIntRect(m_overflowRect).size() - enclosing IntRect(m_box->clientBoxRect()).size();
396 } 396 }
397 397
398 IntRect RenderLayerScrollableArea::visibleContentRect(VisibleContentRectIncludes Scrollbars scrollbarInclusion) const 398 IntRect RenderLayerScrollableArea::visibleContentRect(IncludeScrollbarsInRect sc rollbarInclusion) const
399 { 399 {
400 int verticalScrollbarWidth = 0; 400 int verticalScrollbarWidth = 0;
401 int horizontalScrollbarHeight = 0; 401 int horizontalScrollbarHeight = 0;
402 if (scrollbarInclusion == IncludeScrollbars) { 402 if (scrollbarInclusion == IncludeScrollbars) {
403 verticalScrollbarWidth = (verticalScrollbar() && !verticalScrollbar()->i sOverlayScrollbar()) ? verticalScrollbar()->width() : 0; 403 verticalScrollbarWidth = (verticalScrollbar() && !verticalScrollbar()->i sOverlayScrollbar()) ? verticalScrollbar()->width() : 0;
404 horizontalScrollbarHeight = (horizontalScrollbar() && !horizontalScrollb ar()->isOverlayScrollbar()) ? horizontalScrollbar()->height() : 0; 404 horizontalScrollbarHeight = (horizontalScrollbar() && !horizontalScrollb ar()->isOverlayScrollbar()) ? horizontalScrollbar()->height() : 0;
405 } 405 }
406 406
407 return IntRect(IntPoint(scrollXOffset(), scrollYOffset()), 407 return IntRect(IntPoint(scrollXOffset(), scrollYOffset()),
408 IntSize(max(0, layer()->size().width() - verticalScrollbarWidth), max(0, layer()->size().height() - horizontalScrollbarHeight))); 408 IntSize(max(0, layer()->size().width() - verticalScrollbarWidth), max(0, layer()->size().height() - horizontalScrollbarHeight)));
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 baseHeight = baseHeight / zoomFactor; 1264 baseHeight = baseHeight / zoomFactor;
1265 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX); 1265 element->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX);
1266 } 1266 }
1267 1267
1268 document.updateLayout(); 1268 document.updateLayout();
1269 1269
1270 // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view. 1270 // FIXME (Radar 4118564): We should also autoscroll the window as necessary to keep the point under the cursor in view.
1271 } 1271 }
1272 1272
1273 } // Namespace WebCore 1273 } // Namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerScrollableArea.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698