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

Side by Side Diff: Source/core/paint/DeprecatedPaintLayerClipper.cpp

Issue 1213353003: More fixes for position:fixed with root layer scrolling. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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/layout/LayoutBox.cpp ('k') | no next file » | 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ASSERT(view); 74 ASSERT(view);
75 if (clipRects.fixed() && context.rootLayer->layoutObject() == view) 75 if (clipRects.fixed() && context.rootLayer->layoutObject() == view)
76 offset -= toIntSize(view->frameView()->scrollPosition()); 76 offset -= toIntSize(view->frameView()->scrollPosition());
77 77
78 if (layoutObject.hasOverflowClip()) { 78 if (layoutObject.hasOverflowClip()) {
79 ClipRect newOverflowClip = toLayoutBox(layoutObject).overflowClipRect(of fset, context.scrollbarRelevancy); 79 ClipRect newOverflowClip = toLayoutBox(layoutObject).overflowClipRect(of fset, context.scrollbarRelevancy);
80 newOverflowClip.setHasRadius(layoutObject.style()->hasBorderRadius()); 80 newOverflowClip.setHasRadius(layoutObject.style()->hasBorderRadius());
81 clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.ov erflowClipRect())); 81 clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.ov erflowClipRect()));
82 if (layoutObject.isPositioned()) 82 if (layoutObject.isPositioned())
83 clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.pos ClipRect())); 83 clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.pos ClipRect()));
84 if (layoutObject.isLayoutView())
85 clipRects.setFixedClipRect(intersection(newOverflowClip, clipRects.f ixedClipRect()));
84 } 86 }
85 87
86 if (layoutObject.hasClip()) { 88 if (layoutObject.hasClip()) {
87 LayoutRect newClip = toLayoutBox(layoutObject).clipRect(offset); 89 LayoutRect newClip = toLayoutBox(layoutObject).clipRect(offset);
88 clipRects.setPosClipRect(intersection(newClip, clipRects.posClipRect())) ; 90 clipRects.setPosClipRect(intersection(newClip, clipRects.posClipRect())) ;
89 clipRects.setOverflowClipRect(intersection(newClip, clipRects.overflowCl ipRect())); 91 clipRects.setOverflowClipRect(intersection(newClip, clipRects.overflowCl ipRect()));
90 clipRects.setFixedClipRect(intersection(newClip, clipRects.fixedClipRect ())); 92 clipRects.setFixedClipRect(intersection(newClip, clipRects.fixedClipRect ()));
91 } 93 }
92 } 94 }
93 95
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 if (context.respectOverflowClip == IgnoreOverflowClip) 382 if (context.respectOverflowClip == IgnoreOverflowClip)
381 return false; 383 return false;
382 384
383 if (layer->isRootLayer() && context.respectOverflowClipForViewport == Ignore OverflowClip) 385 if (layer->isRootLayer() && context.respectOverflowClipForViewport == Ignore OverflowClip)
384 return false; 386 return false;
385 387
386 return true; 388 return true;
387 } 389 }
388 390
389 } // namespace blink 391 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698