Source/core/css/resolver/StyleResolver.cpp - Issue 17836006: Merge 153078 "Unprefix Flexbox"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 17836006: Merge 153078 "Unprefix Flexbox" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/

Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/css/resolver/StyleResolver.cpp

===================================================================

--- Source/core/css/resolver/StyleResolver.cpp (revision 153087)

+++ Source/core/css/resolver/StyleResolver.cpp (working copy)

@@ -2629,8 +2629,8 @@

case CSSPropertyWebkitBorderRadius:

case CSSPropertyWebkitColumns:

case CSSPropertyWebkitColumnRule:

- case CSSPropertyWebkitFlex:

- case CSSPropertyWebkitFlexFlow:

+ case CSSPropertyFlex:

+ case CSSPropertyFlexFlow:

case CSSPropertyGridColumn:

case CSSPropertyGridRow:

case CSSPropertyGridArea:

@@ -3165,16 +3165,16 @@

case CSSPropertyWebkitColumnRuleWidth:

case CSSPropertyWebkitColumnSpan:

case CSSPropertyWebkitColumnWidth:

- case CSSPropertyWebkitAlignContent:

- case CSSPropertyWebkitAlignItems:

- case CSSPropertyWebkitAlignSelf:

- case CSSPropertyWebkitFlexBasis:

- case CSSPropertyWebkitFlexDirection:

- case CSSPropertyWebkitFlexGrow:

- case CSSPropertyWebkitFlexShrink:

- case CSSPropertyWebkitFlexWrap:

- case CSSPropertyWebkitJustifyContent:

- case CSSPropertyWebkitOrder:

+ case CSSPropertyAlignContent:

+ case CSSPropertyAlignItems:

+ case CSSPropertyAlignSelf:

+ case CSSPropertyFlexBasis:

+ case CSSPropertyFlexDirection:

+ case CSSPropertyFlexGrow:

+ case CSSPropertyFlexShrink:

+ case CSSPropertyFlexWrap:

+ case CSSPropertyJustifyContent:

+ case CSSPropertyOrder:

case CSSPropertyWebkitFlowFrom:

case CSSPropertyWebkitFlowInto:

case CSSPropertyWebkitFontKerning:

« no previous file with comments | « Source/core/css/StylePropertyShorthand.cpp ('k') | Source/core/html/shadow/TextFieldDecorationElement.cpp » ('j') | no next file with comments »