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

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

Issue 686633002: First pass at removing position:fixed. (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 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 197
198 if (!paintInvalidationContainer && mode & UseTransforms && shouldUseTransfor mFromContainer(0)) { 198 if (!paintInvalidationContainer && mode & UseTransforms && shouldUseTransfor mFromContainer(0)) {
199 TransformationMatrix t; 199 TransformationMatrix t;
200 getTransformFromContainer(0, LayoutSize(), t); 200 getTransformFromContainer(0, LayoutSize(), t);
201 transformState.applyTransform(t); 201 transformState.applyTransform(t);
202 } 202 }
203 } 203 }
204 204
205 const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap& geometryMap) const 205 const RenderObject* RenderView::pushMappingToContainer(const RenderLayerModelObj ect* ancestorToStopAt, RenderGeometryMap& geometryMap) const
206 { 206 {
207 // FIXME(sky): Can we remove offsetForFixedPosition?
208 LayoutSize offsetForFixedPosition;
209 LayoutSize offset; 207 LayoutSize offset;
210 RenderObject* container = 0; 208 RenderObject* container = 0;
211 209
212 // If a container was specified, and was not 0 or the RenderView, then we 210 // If a container was specified, and was not 0 or the RenderView, then we
213 // should have found it by now unless we're traversing to a parent document. 211 // should have found it by now unless we're traversing to a parent document.
214 ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this | | container); 212 ASSERT_ARG(ancestorToStopAt, !ancestorToStopAt || ancestorToStopAt == this | | container);
215 213
216 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont ainer)) { 214 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont ainer)) {
217 TransformationMatrix t; 215 TransformationMatrix t;
218 getTransformFromContainer(container, LayoutSize(), t); 216 getTransformFromContainer(container, LayoutSize(), t);
219 geometryMap.push(this, t, false, false, false, true, offsetForFixedPosit ion); 217 geometryMap.push(this, t, false, false, true);
220 } else { 218 } else {
221 geometryMap.push(this, offset, false, false, false, false, offsetForFixe dPosition); 219 geometryMap.push(this, offset, false, false, false);
222 } 220 }
223 221
224 return container; 222 return container;
225 } 223 }
226 224
227 void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformStat e& transformState) const 225 void RenderView::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformStat e& transformState) const
228 { 226 {
229 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) { 227 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
230 TransformationMatrix t; 228 TransformationMatrix t;
231 getTransformFromContainer(0, LayoutSize(), t); 229 getTransformFromContainer(0, LayoutSize(), t);
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 return viewWidth(IncludeScrollbars) / scale; 792 return viewWidth(IncludeScrollbars) / scale;
795 } 793 }
796 794
797 double RenderView::layoutViewportHeight() const 795 double RenderView::layoutViewportHeight() const
798 { 796 {
799 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 797 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
800 return viewHeight(IncludeScrollbars) / scale; 798 return viewHeight(IncludeScrollbars) / scale;
801 } 799 }
802 800
803 } // namespace blink 801 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | sky/engine/core/rendering/compositing/CompositingInputsUpdater.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698