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

Side by Side Diff: Source/core/layout/LayoutBox.cpp

Issue 927773002: Keep track of multiple layout roots (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove bool Created 5 years, 9 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 1932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1943 computedValues.m_position = logicalLeft(); 1943 computedValues.m_position = logicalLeft();
1944 computedValues.m_margins.m_start = marginStart(); 1944 computedValues.m_margins.m_start = marginStart();
1945 computedValues.m_margins.m_end = marginEnd(); 1945 computedValues.m_margins.m_end = marginEnd();
1946 1946
1947 if (isOutOfFlowPositioned()) { 1947 if (isOutOfFlowPositioned()) {
1948 computePositionedLogicalWidth(computedValues); 1948 computePositionedLogicalWidth(computedValues);
1949 return; 1949 return;
1950 } 1950 }
1951 1951
1952 // If layout is limited to a subtree, the subtree root's logical width does not change. 1952 // If layout is limited to a subtree, the subtree root's logical width does not change.
1953 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) = = this) 1953 if (node() && view()->frameView() && view()->frameView()->isLayoutRoot(*this ))
1954 return; 1954 return;
1955 1955
1956 // The parent box is flexing us, so it has increased or decreased our 1956 // The parent box is flexing us, so it has increased or decreased our
1957 // width. Use the width from the style context. 1957 // width. Use the width from the style context.
1958 // FIXME: Account for writing-mode in flexible boxes. 1958 // FIXME: Account for writing-mode in flexible boxes.
1959 // https://bugs.webkit.org/show_bug.cgi?id=46418 1959 // https://bugs.webkit.org/show_bug.cgi?id=46418
1960 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) { 1960 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) {
1961 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth(); 1961 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth();
1962 return; 1962 return;
1963 } 1963 }
(...skipping 2663 matching lines...) Expand 10 before | Expand all | Expand 10 after
4627 } 4627 }
4628 4628
4629 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst 4629 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst
4630 { 4630 {
4631 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); 4631 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList);
4632 if (LayerScrollableArea* area = scrollableArea()) 4632 if (LayerScrollableArea* area = scrollableArea())
4633 displayItemList->invalidate(area->displayItemClient()); 4633 displayItemList->invalidate(area->displayItemClient());
4634 } 4634 }
4635 4635
4636 } // namespace blink 4636 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698