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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutView.cpp

Issue 2173963002: Ensure that we consistently check contains: paint for fixed position containment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove trailing whitespace Created 4 years, 4 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
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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 355 }
356 } 356 }
357 357
358 // If a container was specified, and was not 0 or the LayoutView, then we 358 // If a container was specified, and was not 0 or the LayoutView, then we
359 // should have found it by now unless we're traversing to a parent document. 359 // should have found it by now unless we're traversing to a parent document.
360 DCHECK(!ancestorToStopAt || ancestorToStopAt == this || container); 360 DCHECK(!ancestorToStopAt || ancestorToStopAt == this || container);
361 361
362 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont ainer)) { 362 if ((!ancestorToStopAt || container) && shouldUseTransformFromContainer(cont ainer)) {
363 TransformationMatrix t; 363 TransformationMatrix t;
364 getTransformFromContainer(container, LayoutSize(), t); 364 getTransformFromContainer(container, LayoutSize(), t);
365 geometryMap.push(this, t, HasTransform, offsetForFixedPosition); 365 geometryMap.push(this, t, ContainsFixedPosition, offsetForFixedPosition) ;
366 } else { 366 } else {
367 geometryMap.push(this, offset, 0, offsetForFixedPosition); 367 geometryMap.push(this, offset, 0, offsetForFixedPosition);
368 } 368 }
369 369
370 return container; 370 return container;
371 } 371 }
372 372
373 void LayoutView::mapAncestorToLocal(const LayoutBoxModelObject* ancestor, Transf ormState& transformState, MapCoordinatesFlags mode) const 373 void LayoutView::mapAncestorToLocal(const LayoutBoxModelObject* ancestor, Transf ormState& transformState, MapCoordinatesFlags mode) const
374 { 374 {
375 if (this == ancestor) 375 if (this == ancestor)
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1000 // of this override. All frame scrolling should be handled by 1000 // of this override. All frame scrolling should be handled by
1001 // ViewportScrollCallback. 1001 // ViewportScrollCallback.
1002 1002
1003 if (!frameView()) 1003 if (!frameView())
1004 return ScrollResult(false, false, delta.width(), delta.height()); 1004 return ScrollResult(false, false, delta.width(), delta.height());
1005 1005
1006 return frameView()->getScrollableArea()->userScroll(granularity, delta); 1006 return frameView()->getScrollableArea()->userScroll(granularity, delta);
1007 } 1007 }
1008 1008
1009 } // namespace blink 1009 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698