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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 927773002: Keep track of multiple layout roots (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address concerns. Created 5 years, 10 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 * (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, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1941 computedValues.m_position = logicalLeft(); 1941 computedValues.m_position = logicalLeft();
1942 computedValues.m_margins.m_start = marginStart(); 1942 computedValues.m_margins.m_start = marginStart();
1943 computedValues.m_margins.m_end = marginEnd(); 1943 computedValues.m_margins.m_end = marginEnd();
1944 1944
1945 if (isOutOfFlowPositioned()) { 1945 if (isOutOfFlowPositioned()) {
1946 computePositionedLogicalWidth(computedValues); 1946 computePositionedLogicalWidth(computedValues);
1947 return; 1947 return;
1948 } 1948 }
1949 1949
1950 // If layout is limited to a subtree, the subtree root's logical width does not change. 1950 // If layout is limited to a subtree, the subtree root's logical width does not change.
1951 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) = = this) 1951 if (node() && view()->frameView() && view()->frameView()->isLayoutRoot(this) )
1952 return; 1952 return;
1953 1953
1954 // The parent box is flexing us, so it has increased or decreased our 1954 // The parent box is flexing us, so it has increased or decreased our
1955 // width. Use the width from the style context. 1955 // width. Use the width from the style context.
1956 // FIXME: Account for writing-mode in flexible boxes. 1956 // FIXME: Account for writing-mode in flexible boxes.
1957 // https://bugs.webkit.org/show_bug.cgi?id=46418 1957 // https://bugs.webkit.org/show_bug.cgi?id=46418
1958 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) { 1958 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) {
1959 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth(); 1959 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth();
1960 return; 1960 return;
1961 } 1961 }
(...skipping 2643 matching lines...) Expand 10 before | Expand all | Expand 10 after
4605 } 4605 }
4606 4606
4607 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst 4607 void RenderBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst
4608 { 4608 {
4609 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); 4609 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList);
4610 if (LayerScrollableArea* area = scrollableArea()) 4610 if (LayerScrollableArea* area = scrollableArea())
4611 displayItemList->invalidate(area->displayItemClient()); 4611 displayItemList->invalidate(area->displayItemClient());
4612 } 4612 }
4613 4613
4614 } // namespace blink 4614 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698