Attachment #157770 for bug #93730

View Details Raw Unified Return to Bug 93730



2012-08-10  Ojan Vafai  <ojan@chromium.org>

        Remove unnecessary null checks from pseudoStyleForElement and adjustRenderStyle
        https://bugs.webkit.org/show_bug.cgi?id=93730

        Reviewed by NOBODY (OOPS!).

        All the callers of both methods make sure to pass in a non-null parentStyle.

        No change in behavior.

        * css/StyleResolver.cpp:
        * css/StyleResolver.h:

2012-08-10  Ojan Vafai  <ojan@chromium.org>

        Wrap INLINE_FLEX in a #if ENABLE(CSS3_FLEXBOX).
        Unreviewed build fix.


Lines 1907-1912 void StyleResolver::keyframeStylesForAnimation(Element* e, const RenderStyle* el a/Source/WebCore/css/StyleResolver.cpp_sec1
- a/Source/WebCore/css/StyleResolver.cpp -4 / +5 lines
1907		1907
1908	PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle)	1908	PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle)
1909	{	1909	{
		1910	ASSERT(m_parentStyle);
1910	if (!e)	1911	if (!e)
1911	return 0;	1912	return 0;
1912		1913
Lines 1914-1922 PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(PseudoId pseudo, El a/Source/WebCore/css/StyleResolver.cpp_sec2
1914		1915
1915	initForStyleResolve(e, parentStyle, pseudo);	1916	initForStyleResolve(e, parentStyle, pseudo);
1916	m_style = RenderStyle::create();	1917	m_style = RenderStyle::create();
1917		1918	m_style->inheritFrom(m_parentStyle);
1918	if (m_parentStyle)
1919	m_style->inheritFrom(m_parentStyle);
1920		1919
1921	// Since we don't use pseudo-elements in any of our quirk/print user agent rules, don't waste time walking	1920	// Since we don't use pseudo-elements in any of our quirk/print user agent rules, don't waste time walking
1922	// those rules.	1921	// those rules.
Lines 2069-2074 static bool doesNotInheritTextDecoration(RenderStyle* style, Element* e) a/Source/WebCore/css/StyleResolver.cpp_sec3
2069		2068
2070	void StyleResolver::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)	2069	void StyleResolver::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)
2071	{	2070	{
		2071	ASSERT(parentStyle);
		2072
2072	// Cache our original display.	2073	// Cache our original display.
2073	style->setOriginalDisplay(style->display());	2074	style->setOriginalDisplay(style->display());
2074		2075
Lines 2128-2134 void StyleResolver::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty a/Source/WebCore/css/StyleResolver.cpp_sec4
2128		2129
2129	// FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely	2130	// FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely
2130	// clear how that should work.	2131	// clear how that should work.
2131	if (style->display() == INLINE && style->styleType() == NOPSEUDO && parentStyle && style->writingMode() != parentStyle->writingMode())	2132	if (style->display() == INLINE && style->styleType() == NOPSEUDO && style->writingMode() != parentStyle->writingMode())
2132	style->setDisplay(INLINE_BLOCK);	2133	style->setDisplay(INLINE_BLOCK);
2133		2134
2134	// After performing the display mutation, check table rows. We do not honor position:relative on	2135	// After performing the display mutation, check table rows. We do not honor position:relative on

Lines 141-147 public: a/Source/WebCore/css/StyleResolver.h_sec1
- a/Source/WebCore/css/StyleResolver.h -1 / +1 lines
141		141
142	void keyframeStylesForAnimation(Element, const RenderStyle, KeyframeList&);	142	void keyframeStylesForAnimation(Element, const RenderStyle, KeyframeList&);
143		143
144	PassRefPtr<RenderStyle> pseudoStyleForElement(PseudoId, Element, RenderStyle parentStyle = 0);	144	PassRefPtr<RenderStyle> pseudoStyleForElement(PseudoId, Element, RenderStyle parentStyle);
145		145
146	PassRefPtr<RenderStyle> styleForPage(int pageIndex);	146	PassRefPtr<RenderStyle> styleForPage(int pageIndex);
147		147

Return to Bug 93730

Lines 1-5 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
1	2012-08-10 Ojan Vafai <ojan@chromium.org>	1	2012-08-10 Ojan Vafai <ojan@chromium.org>
2		2
		3	Remove unnecessary null checks from pseudoStyleForElement and adjustRenderStyle
		4	https://bugs.webkit.org/show_bug.cgi?id=93730
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	All the callers of both methods make sure to pass in a non-null parentStyle.
		9
		10	No change in behavior.
		11
		12	* css/StyleResolver.cpp:
		13	* css/StyleResolver.h:
		14
		15	2012-08-10 Ojan Vafai <ojan@chromium.org>
		16
3	Wrap INLINE_FLEX in a #if ENABLE(CSS3_FLEXBOX).	17	Wrap INLINE_FLEX in a #if ENABLE(CSS3_FLEXBOX).
4	Unreviewed build fix.	18	Unreviewed build fix.
5		19