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

Side by Side Diff: Source/WebCore/css/StyleResolver.cpp

Issue 11853004: Merge 138908 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 | « LayoutTests/fast/block/sticky-position-containing-block-crash-expected.txt ('k') | no next file » | 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1956 1956
1957 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display. 1957 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display.
1958 if (style->hasOutOfFlowPosition() || style->isFloating() || (e && e->doc ument()->documentElement() == e)) 1958 if (style->hasOutOfFlowPosition() || style->isFloating() || (e && e->doc ument()->documentElement() == e))
1959 style->setDisplay(equivalentBlockDisplay(style->display(), style->is Floating(), m_checker.strictParsing())); 1959 style->setDisplay(equivalentBlockDisplay(style->display(), style->is Floating(), m_checker.strictParsing()));
1960 1960
1961 // FIXME: Don't support this mutation for pseudo styles like first-lette r or first-line, since it's not completely 1961 // FIXME: Don't support this mutation for pseudo styles like first-lette r or first-line, since it's not completely
1962 // clear how that should work. 1962 // clear how that should work.
1963 if (style->display() == INLINE && style->styleType() == NOPSEUDO && styl e->writingMode() != parentStyle->writingMode()) 1963 if (style->display() == INLINE && style->styleType() == NOPSEUDO && styl e->writingMode() != parentStyle->writingMode())
1964 style->setDisplay(INLINE_BLOCK); 1964 style->setDisplay(INLINE_BLOCK);
1965 1965
1966 // After performing the display mutation, check table rows. We do not ho nor position:relative on 1966 // After performing the display mutation, check table rows. We do not ho nor position:relative or position:sticky on
1967 // table rows or cells. This has been established in CSS2.1 (and caused a crash in containingBlock() 1967 // table rows or cells. This has been established for position:relative in CSS2.1 (and caused a crash in containingBlock()
1968 // on some sites). 1968 // on some sites).
1969 if ((style->display() == TABLE_HEADER_GROUP || style->display() == TABLE _ROW_GROUP 1969 if ((style->display() == TABLE_HEADER_GROUP || style->display() == TABLE _ROW_GROUP
1970 || style->display() == TABLE_FOOTER_GROUP || style->display() == TA BLE_ROW) 1970 || style->display() == TABLE_FOOTER_GROUP || style->display() == TAB LE_ROW)
1971 && style->position() == RelativePosition) 1971 && style->hasInFlowPosition())
1972 style->setPosition(StaticPosition); 1972 style->setPosition(StaticPosition);
1973 1973
1974 // writing-mode does not apply to table row groups, table column groups, table rows, and table columns. 1974 // writing-mode does not apply to table row groups, table column groups, table rows, and table columns.
1975 // FIXME: Table cells should be allowed to be perpendicular or flipped w ith respect to the table, though. 1975 // FIXME: Table cells should be allowed to be perpendicular or flipped w ith respect to the table, though.
1976 if (style->display() == TABLE_COLUMN || style->display() == TABLE_COLUMN _GROUP || style->display() == TABLE_FOOTER_GROUP 1976 if (style->display() == TABLE_COLUMN || style->display() == TABLE_COLUMN _GROUP || style->display() == TABLE_FOOTER_GROUP
1977 || style->display() == TABLE_HEADER_GROUP || style->display() == TAB LE_ROW || style->display() == TABLE_ROW_GROUP 1977 || style->display() == TABLE_HEADER_GROUP || style->display() == TAB LE_ROW || style->display() == TABLE_ROW_GROUP
1978 || style->display() == TABLE_CELL) 1978 || style->display() == TABLE_CELL)
1979 style->setWritingMode(parentStyle->writingMode()); 1979 style->setWritingMode(parentStyle->writingMode());
1980 1980
1981 // FIXME: Since we don't support block-flow on flexible boxes yet, disal low setting 1981 // FIXME: Since we don't support block-flow on flexible boxes yet, disal low setting
(...skipping 3349 matching lines...) Expand 10 before | Expand all | Expand 10 after
5331 info.addMember(m_scopeResolver); 5331 info.addMember(m_scopeResolver);
5332 5332
5333 // FIXME: move this to a place where it would be called only once? 5333 // FIXME: move this to a place where it would be called only once?
5334 info.addMember(defaultStyle); 5334 info.addMember(defaultStyle);
5335 info.addMember(defaultQuirksStyle); 5335 info.addMember(defaultQuirksStyle);
5336 info.addMember(defaultPrintStyle); 5336 info.addMember(defaultPrintStyle);
5337 info.addMember(defaultViewSourceStyle); 5337 info.addMember(defaultViewSourceStyle);
5338 } 5338 }
5339 5339
5340 } // namespace WebCore 5340 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/block/sticky-position-containing-block-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698