ForeignObject content is zoomed two times
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 25 Mar 2012 04:08:06 +0000 (04:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 25 Mar 2012 04:08:06 +0000 (04:08 +0000)
commit91057d623a4c8392f2659b6c31e0a6374fcd463d
treed7dcb589a09973e5077d409995ad13b9a475d23a
parentde51d4b6b8abda133260415a5c89dd2232a4d1e6
ForeignObject content is zoomed two times
https://bugs.webkit.org/show_bug.cgi?id=76282

Patch by Florin Malita <fmalita@google.com> on 2012-03-24
Reviewed by Nikolas Zimmermann.

Source/WebCore:

Test: svg/zoom/page/zoom-foreign-content.svg

Reset the effective zoom property for FO-nested content to avoid
having the zoom factor applied multiple times (zooming is handled by
the top level SVG root element).

* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::adjustRenderStyle):

LayoutTests:

* platform/chromium-linux/svg/zoom/page/zoom-foreignObject-expected.png:
* platform/chromium-linux/svg/zoom/text/zoom-foreignObject-expected.png:
* platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt:
* platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt:
Rebaseline cr-linux expectations.

* platform/chromium/test_expectations.txt:
* platform/mac/test_expectations.txt:
Updated zoom-foreignObject.svg expectations, pending rebaseline.

* svg/zoom/page/zoom-foreign-content-expected.png: Added.
* svg/zoom/page/zoom-foreign-content-expected.txt: Added.
* svg/zoom/page/zoom-foreign-content.svg: Added.

* svg/zoom/page/zoom-foreignObject.svg:
* svg/zoom/text/zoom-foreignObject.svg:
Updated test to cover SVG FO text.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112022 268f45cc-cd09-0410-ab3c-d52691b4dbfc
14 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/chromium-linux/svg/zoom/page/zoom-foreignObject-expected.png
LayoutTests/platform/chromium-linux/svg/zoom/text/zoom-foreignObject-expected.png
LayoutTests/platform/chromium-win/svg/zoom/page/zoom-foreignObject-expected.txt
LayoutTests/platform/chromium-win/svg/zoom/text/zoom-foreignObject-expected.txt
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/mac/test_expectations.txt
LayoutTests/svg/zoom/page/zoom-foreign-content-expected.png [new file with mode: 0644]
LayoutTests/svg/zoom/page/zoom-foreign-content-expected.txt [new file with mode: 0644]
LayoutTests/svg/zoom/page/zoom-foreign-content.svg [new file with mode: 0644]
LayoutTests/svg/zoom/page/zoom-foreignObject.svg
LayoutTests/svg/zoom/text/zoom-foreignObject.svg
Source/WebCore/ChangeLog
Source/WebCore/css/CSSStyleSelector.cpp