-
commit-queue@webkit.org authored
https://bugs.webkit.org/show_bug.cgi?id=124680 Patch by Rob Buis <rob.buis@samsung.com> on 2013-12-06 Reviewed by Dirk Schulze. Source/WebCore: Do not take the writing-mode property on the float into account for shape-outside. Add a virtual method writingMode() in order to do this for shape-outside but keep old behavior (element writingMode) for shape-inside. Change existing test floats/shape-outside-floats-different-writing-modes.html to test the new behavior. * rendering/shapes/ShapeInfo.cpp: (WebCore::::computedShape): * rendering/shapes/ShapeInfo.h: (WebCore::ShapeInfo::writingMode): * rendering/shapes/ShapeOutsideInfo.cpp: (WebCore::ShapeOutsideInfo::writingMode): * rendering/shapes/ShapeOutsideInfo.h: LayoutTests: Make sure the writing-mode property on the float is not taken into account for shape-outside. Adapt highlight-shape-outside.html so it sets the writing-mode on the container div, not the float. However because of earlier unreliability in EFL/GTK, skip the test for now. * TestExpectations: * fast/shapes/shape-outside-floats/shape-outside-floats-different-writing-modes.html: * inspector-protocol/model/highlight-shape-outside-expected.txt: * inspector-protocol/model/highlight-shape-outside.html: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160243 268f45cc-cd09-0410-ab3c-d52691b4dbfc
3b5bb143