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

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

Issue 11853003: Merge 138908 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
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 1895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 1906
1907 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display. 1907 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display.
1908 if (style->hasOutOfFlowPosition() || style->isFloating() || (e && e->doc ument()->documentElement() == e)) 1908 if (style->hasOutOfFlowPosition() || style->isFloating() || (e && e->doc ument()->documentElement() == e))
1909 style->setDisplay(equivalentBlockDisplay(style->display(), style->is Floating(), m_checker.strictParsing())); 1909 style->setDisplay(equivalentBlockDisplay(style->display(), style->is Floating(), m_checker.strictParsing()));
1910 1910
1911 // FIXME: Don't support this mutation for pseudo styles like first-lette r or first-line, since it's not completely 1911 // FIXME: Don't support this mutation for pseudo styles like first-lette r or first-line, since it's not completely
1912 // clear how that should work. 1912 // clear how that should work.
1913 if (style->display() == INLINE && style->styleType() == NOPSEUDO && styl e->writingMode() != parentStyle->writingMode()) 1913 if (style->display() == INLINE && style->styleType() == NOPSEUDO && styl e->writingMode() != parentStyle->writingMode())
1914 style->setDisplay(INLINE_BLOCK); 1914 style->setDisplay(INLINE_BLOCK);
1915 1915
1916 // After performing the display mutation, check table rows. We do not ho nor position:relative on 1916 // After performing the display mutation, check table rows. We do not ho nor position:relative or position:sticky on
1917 // table rows or cells. This has been established in CSS2.1 (and caused a crash in containingBlock() 1917 // table rows or cells. This has been established for position:relative in CSS2.1 (and caused a crash in containingBlock()
1918 // on some sites). 1918 // on some sites).
1919 if ((style->display() == TABLE_HEADER_GROUP || style->display() == TABLE _ROW_GROUP 1919 if ((style->display() == TABLE_HEADER_GROUP || style->display() == TABLE _ROW_GROUP
1920 || style->display() == TABLE_FOOTER_GROUP || style->display() == TA BLE_ROW) 1920 || style->display() == TABLE_FOOTER_GROUP || style->display() == TAB LE_ROW)
1921 && style->position() == RelativePosition) 1921 && style->hasInFlowPosition())
1922 style->setPosition(StaticPosition); 1922 style->setPosition(StaticPosition);
1923 1923
1924 // writing-mode does not apply to table row groups, table column groups, table rows, and table columns. 1924 // writing-mode does not apply to table row groups, table column groups, table rows, and table columns.
1925 // FIXME: Table cells should be allowed to be perpendicular or flipped w ith respect to the table, though. 1925 // FIXME: Table cells should be allowed to be perpendicular or flipped w ith respect to the table, though.
1926 if (style->display() == TABLE_COLUMN || style->display() == TABLE_COLUMN _GROUP || style->display() == TABLE_FOOTER_GROUP 1926 if (style->display() == TABLE_COLUMN || style->display() == TABLE_COLUMN _GROUP || style->display() == TABLE_FOOTER_GROUP
1927 || style->display() == TABLE_HEADER_GROUP || style->display() == TAB LE_ROW || style->display() == TABLE_ROW_GROUP 1927 || style->display() == TABLE_HEADER_GROUP || style->display() == TAB LE_ROW || style->display() == TABLE_ROW_GROUP
1928 || style->display() == TABLE_CELL) 1928 || style->display() == TABLE_CELL)
1929 style->setWritingMode(parentStyle->writingMode()); 1929 style->setWritingMode(parentStyle->writingMode());
1930 1930
1931 // FIXME: Since we don't support block-flow on flexible boxes yet, disal low setting 1931 // FIXME: Since we don't support block-flow on flexible boxes yet, disal low setting
(...skipping 3250 matching lines...) Expand 10 before | Expand all | Expand 10 after
5182 info.addMember(m_scopeResolver); 5182 info.addMember(m_scopeResolver);
5183 5183
5184 // FIXME: move this to a place where it would be called only once? 5184 // FIXME: move this to a place where it would be called only once?
5185 info.addMember(defaultStyle); 5185 info.addMember(defaultStyle);
5186 info.addMember(defaultQuirksStyle); 5186 info.addMember(defaultQuirksStyle);
5187 info.addMember(defaultPrintStyle); 5187 info.addMember(defaultPrintStyle);
5188 info.addMember(defaultViewSourceStyle); 5188 info.addMember(defaultViewSourceStyle);
5189 } 5189 }
5190 5190
5191 } // namespace WebCore 5191 } // 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