Currently 'flex-wrap' has the default 'none', not 'nowrap' as stated in the stanndard. Also, 'flex-flow' doesn't support 'nowrap'.
That is, please revert Bug 78772.
Created attachment 169971 [details]
There were some conflict markers in LayoutTests/ChangeLog from http://trac.webkit.org/changeset/132089 that I also cleaned up.
Comment on attachment 169971 [details]
Clearing flags on attachment: 169971
Committed r132136: <http://trac.webkit.org/changeset/132136>
All reviewed patches have been landed. Closing bug.