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

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

Issue 751573002: Use viewportConstrainedVisibleContentRect() to get the scrolling offset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed the 'DEPRECATED' comment Created 6 years 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/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerClipper.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/BoxPainter.h" 6 #include "core/paint/BoxPainter.h"
7 7
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/frame/Settings.h" 9 #include "core/frame/Settings.h"
10 #include "core/html/HTMLFrameOwnerElement.h" 10 #include "core/html/HTMLFrameOwnerElement.h"
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 } else { 692 } else {
693 positioningAreaSize = pixelSnappedIntSize(paintRect.size() - LayoutS ize(left + right, top + bottom), paintRect.location()); 693 positioningAreaSize = pixelSnappedIntSize(paintRect.size() - LayoutS ize(left + right, top + bottom), paintRect.location());
694 } 694 }
695 } else { 695 } else {
696 geometry.setHasNonLocalGeometry(); 696 geometry.setHasNonLocalGeometry();
697 697
698 IntRect viewportRect = pixelSnappedIntRect(obj.viewRect()); 698 IntRect viewportRect = pixelSnappedIntRect(obj.viewRect());
699 if (fixedBackgroundPaintsInLocalCoordinates(obj)) 699 if (fixedBackgroundPaintsInLocalCoordinates(obj))
700 viewportRect.setLocation(IntPoint()); 700 viewportRect.setLocation(IntPoint());
701 else if (FrameView* frameView = obj.view()->frameView()) 701 else if (FrameView* frameView = obj.view()->frameView())
702 viewportRect.setLocation(IntPoint(frameView->scrollOffsetForFixedPos ition())); 702 viewportRect.setLocation(IntPoint(frameView->scrollOffsetForViewport ConstrainedObjects()));
703 703
704 if (paintContainer) { 704 if (paintContainer) {
705 IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->l ocalToAbsolute(FloatPoint())); 705 IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->l ocalToAbsolute(FloatPoint()));
706 viewportRect.moveBy(-absoluteContainerOffset); 706 viewportRect.moveBy(-absoluteContainerOffset);
707 } 707 }
708 708
709 geometry.setDestRect(pixelSnappedIntRect(viewportRect)); 709 geometry.setDestRect(pixelSnappedIntRect(viewportRect));
710 positioningAreaSize = geometry.destRect().size(); 710 positioningAreaSize = geometry.destRect().size();
711 } 711 }
712 712
(...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after
2173 2173
2174 FloatPoint secondQuad[4]; 2174 FloatPoint secondQuad[4];
2175 secondQuad[0] = quad[0]; 2175 secondQuad[0] = quad[0];
2176 secondQuad[1] = FloatPoint(quad[0].x() - r1 * cx, quad[0].y() - r1 * cy); 2176 secondQuad[1] = FloatPoint(quad[0].x() - r1 * cx, quad[0].y() - r1 * cy);
2177 secondQuad[2] = quad[2]; 2177 secondQuad[2] = quad[2];
2178 secondQuad[3] = quad[3]; 2178 secondQuad[3] = quad[3];
2179 graphicsContext->clipPolygon(4, secondQuad, !secondEdgeMatches); 2179 graphicsContext->clipPolygon(4, secondQuad, !secondEdgeMatches);
2180 } 2180 }
2181 2181
2182 } // namespace blink 2182 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698