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

Side by Side Diff: sky/engine/core/rendering/RenderBoxModelObject.cpp

Issue 681023002: Remove a bunch of frame-level scrolling machinery. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 left += marginLeft(); 876 left += marginLeft();
877 top += marginTop(); 877 top += marginTop();
878 } else 878 } else
879 positioningAreaSize = pixelSnappedIntSize(paintRect.size() - LayoutS ize(left + right, top + bottom), paintRect.location()); 879 positioningAreaSize = pixelSnappedIntSize(paintRect.size() - LayoutS ize(left + right, top + bottom), paintRect.location());
880 } else { 880 } else {
881 geometry.setHasNonLocalGeometry(); 881 geometry.setHasNonLocalGeometry();
882 882
883 IntRect viewportRect = pixelSnappedIntRect(viewRect()); 883 IntRect viewportRect = pixelSnappedIntRect(viewRect());
884 if (fixedBackgroundPaintsInLocalCoordinates()) 884 if (fixedBackgroundPaintsInLocalCoordinates())
885 viewportRect.setLocation(IntPoint()); 885 viewportRect.setLocation(IntPoint());
886 else if (FrameView* frameView = view()->frameView())
887 viewportRect.setLocation(IntPoint(frameView->scrollOffsetForFixedPos ition()));
888 886
889 if (paintContainer) { 887 if (paintContainer) {
890 IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->l ocalToAbsolute(FloatPoint())); 888 IntPoint absoluteContainerOffset = roundedIntPoint(paintContainer->l ocalToAbsolute(FloatPoint()));
891 viewportRect.moveBy(-absoluteContainerOffset); 889 viewportRect.moveBy(-absoluteContainerOffset);
892 } 890 }
893 891
894 geometry.setDestRect(pixelSnappedIntRect(viewportRect)); 892 geometry.setDestRect(pixelSnappedIntRect(viewportRect));
895 positioningAreaSize = geometry.destRect().size(); 893 positioningAreaSize = geometry.destRect().size();
896 } 894 }
897 895
(...skipping 1742 matching lines...) Expand 10 before | Expand all | Expand 10 after
2640 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2638 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2641 for (RenderObject* child = startChild; child && child != endChild; ) { 2639 for (RenderObject* child = startChild; child && child != endChild; ) {
2642 // Save our next sibling as moveChildTo will clear it. 2640 // Save our next sibling as moveChildTo will clear it.
2643 RenderObject* nextSibling = child->nextSibling(); 2641 RenderObject* nextSibling = child->nextSibling();
2644 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2642 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2645 child = nextSibling; 2643 child = nextSibling;
2646 } 2644 }
2647 } 2645 }
2648 2646
2649 } // namespace blink 2647 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderLayerClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698