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

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: Add bug link 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
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.cpp ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 computedValues.m_position = logicalLeft(); 1956 computedValues.m_position = logicalLeft();
1957 computedValues.m_margins.m_start = marginStart(); 1957 computedValues.m_margins.m_start = marginStart();
1958 computedValues.m_margins.m_end = marginEnd(); 1958 computedValues.m_margins.m_end = marginEnd();
1959 1959
1960 if (isOutOfFlowPositioned()) { 1960 if (isOutOfFlowPositioned()) {
1961 computePositionedLogicalWidth(computedValues); 1961 computePositionedLogicalWidth(computedValues);
1962 return; 1962 return;
1963 } 1963 }
1964 1964
1965 // If layout is limited to a subtree, the subtree root's logical width does not change. 1965 // If layout is limited to a subtree, the subtree root's logical width does not change.
1966 if (node() && view()->frameView() && view()->frameView()->layoutRoot(true) = = this) 1966 if (node() && view()->frameView() && view()->frameView()->isLayoutRoot(*this ))
1967 return; 1967 return;
1968 1968
1969 // The parent box is flexing us, so it has increased or decreased our 1969 // The parent box is flexing us, so it has increased or decreased our
1970 // width. Use the width from the style context. 1970 // width. Use the width from the style context.
1971 // FIXME: Account for writing-mode in flexible boxes. 1971 // FIXME: Account for writing-mode in flexible boxes.
1972 // https://bugs.webkit.org/show_bug.cgi?id=46418 1972 // https://bugs.webkit.org/show_bug.cgi?id=46418
1973 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) { 1973 if (hasOverrideWidth() && parent()->isFlexibleBoxIncludingDeprecated()) {
1974 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth(); 1974 computedValues.m_extent = overrideLogicalContentWidth() + borderAndPaddi ngLogicalWidth();
1975 return; 1975 return;
1976 } 1976 }
(...skipping 2664 matching lines...) Expand 10 before | Expand all | Expand 10 after
4641 } 4641 }
4642 4642
4643 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst 4643 void LayoutBox::invalidateDisplayItemClients(DisplayItemList* displayItemList) c onst
4644 { 4644 {
4645 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList); 4645 LayoutBoxModelObject::invalidateDisplayItemClients(displayItemList);
4646 if (LayerScrollableArea* area = scrollableArea()) 4646 if (LayerScrollableArea* area = scrollableArea())
4647 displayItemList->invalidate(area->displayItemClient()); 4647 displayItemList->invalidate(area->displayItemClient());
4648 } 4648 }
4649 4649
4650 } // namespace blink 4650 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.cpp ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698