Attachment #127082 for bug #77772

View Details Raw Unified Return to Bug 77772

| Differences between



2012-02-14  Ojan Vafai  <ojan@chromium.org>

        implement display: -webkit-inline-flexbox
        https://bugs.webkit.org/show_bug.cgi?id=77772

        Reviewed by NOBODY (OOPS!).

        Tests: css3/flexbox/inline-flexbox-expected.html
               css3/flexbox/inline-flexbox.html

        * rendering/style/RenderStyle.h:
        -Add INLINE_FLEXBOX to the list of replaced display types.
        -Restructure the isDisplayInline methods to avoid code duplication.

2012-02-14  Joshua Bell  <jsbell@chromium.org>

        IndexedDB: Invalid dates should not be valid keys




    StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;

    bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
    bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
    bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
    }

    bool isDisplayInlineType() const
    {
        return display() == INLINE || isDisplayReplacedType();
    }

    bool isOriginalDisplayInlineType() const
    {
        return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK
            || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
    }

    void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }


        return isHorizontalWritingMode() ? getImageVerticalOutsets(image, logicalTop, logicalBottom) : getImageHorizontalOutsets(image, logicalTop, logicalBottom);
    }

    bool isDisplayReplacedType(EDisplay display) const
    {
        return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEXBOX || display == INLINE_TABLE;
    }
    bool isDisplayInlineType(EDisplay display) const { return display == INLINE || isDisplayReplacedType(display); }

    // Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
    const Color& invalidColor() const { static Color invalid; return invalid; }
    const Color& borderLeftColor() const { return surround->border.left().color(); }



2012-02-14  Ojan Vafai  <ojan@chromium.org>

        implement display: -webkit-inline-flexbox
        https://bugs.webkit.org/show_bug.cgi?id=77772

        Reviewed by NOBODY (OOPS!).

        * css3/flexbox/inline-flexbox-expected.html: Added.
        * css3/flexbox/inline-flexbox.html: Added.

2012-02-14  Joshua Bell  <jsbell@chromium.org>

        IndexedDB: Invalid dates should not be valid keys

Line 0 a/LayoutTests/css3/flexbox/inline-flexbox-expected.html_sec1
- a/LayoutTests/css3/flexbox/inline-flexbox-expected.html +4 lines
	1	<!DOCTYPE html>
	2	<span>foo</span>
	3	<span>flex item 1</span><span>flex item 2</span>
	4	<span>baz</span>

Line 0 a/LayoutTests/css3/flexbox/inline-flexbox.html_sec1
- a/LayoutTests/css3/flexbox/inline-flexbox.html +7 lines
	1	<!DOCTYPE html>
	2	<span>foo</span>
	3	<div style="display:-webkit-inline-flexbox">
	4	<div>flex item 1</div>
	5	<div>flex item 2</div>
	6	</div>
	7	<span>baz</span>

Return to Bug 77772

Lines 1435-1455 public: a/Source/WebCore/rendering/style/RenderStyle.h_sec1
- a/Source/WebCore/rendering/style/RenderStyle.h -15 / +9 lines
1435		1435
1436	StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;	1436	StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
1437		1437
1438	bool isDisplayReplacedType() const	1438	bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
1439	{	1439	bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
1440	return display() == INLINE_BLOCK \|\| display() == INLINE_BOX \|\| display() == INLINE_TABLE;	1440	bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
1441	}
1442
1443	bool isDisplayInlineType() const
1444	{
1445	return display() == INLINE \|\| isDisplayReplacedType();
1446	}
1447
1448	bool isOriginalDisplayInlineType() const
1449	{
1450	return originalDisplay() == INLINE \|\| originalDisplay() == INLINE_BLOCK
1451	\|\| originalDisplay() == INLINE_BOX \|\| originalDisplay() == INLINE_TABLE;
1452	}
1453		1441
1454	void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }	1442	void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
1455		1443
Lines 1692-1697 private: a/Source/WebCore/rendering/style/RenderStyle.h_sec2
1692	return isHorizontalWritingMode() ? getImageVerticalOutsets(image, logicalTop, logicalBottom) : getImageHorizontalOutsets(image, logicalTop, logicalBottom);	1680	return isHorizontalWritingMode() ? getImageVerticalOutsets(image, logicalTop, logicalBottom) : getImageHorizontalOutsets(image, logicalTop, logicalBottom);
1693	}	1681	}
1694		1682
		1683	bool isDisplayReplacedType(EDisplay display) const
		1684	{
		1685	return display == INLINE_BLOCK \|\| display == INLINE_BOX \|\| display == INLINE_FLEXBOX \|\| display == INLINE_TABLE;
		1686	}
		1687	bool isDisplayInlineType(EDisplay display) const { return display == INLINE \|\| isDisplayReplacedType(display); }
		1688
1695	// Color accessors are all private to make sure callers use visitedDependentColor instead to access them.	1689	// Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
1696	const Color& invalidColor() const { static Color invalid; return invalid; }	1690	const Color& invalidColor() const { static Color invalid; return invalid; }
1697	const Color& borderLeftColor() const { return surround->border.left().color(); }	1691	const Color& borderLeftColor() const { return surround->border.left().color(); }

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +14 lines
		1	2012-02-14 Ojan Vafai <ojan@chromium.org>
		2
		3	implement display: -webkit-inline-flexbox
		4	https://bugs.webkit.org/show_bug.cgi?id=77772
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Tests: css3/flexbox/inline-flexbox-expected.html
		9	css3/flexbox/inline-flexbox.html
		10
		11	* rendering/style/RenderStyle.h:
		12	-Add INLINE_FLEXBOX to the list of replaced display types.
		13	-Restructure the isDisplayInline methods to avoid code duplication.
		14
1	2012-02-14 Joshua Bell <jsbell@chromium.org>	15	2012-02-14 Joshua Bell <jsbell@chromium.org>
2		16
3	IndexedDB: Invalid dates should not be valid keys	17	IndexedDB: Invalid dates should not be valid keys

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +10 lines
		1	2012-02-14 Ojan Vafai <ojan@chromium.org>
		2
		3	implement display: -webkit-inline-flexbox
		4	https://bugs.webkit.org/show_bug.cgi?id=77772
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* css3/flexbox/inline-flexbox-expected.html: Added.
		9	* css3/flexbox/inline-flexbox.html: Added.
		10
1	2012-02-14 Joshua Bell <jsbell@chromium.org>	11	2012-02-14 Joshua Bell <jsbell@chromium.org>
2		12
3	IndexedDB: Invalid dates should not be valid keys	13	IndexedDB: Invalid dates should not be valid keys