Changeset 103465 in webkit


Ignore:
Timestamp:
Dec 21, 2011 3:26:02 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Improper handling of foreignobjects nested in svg groups
​https://bugs.webkit.org/show_bug.cgi?id=69762

Patch by Florin Malita <​fmalita@google.com> on 2011-12-21
Reviewed by Nikolas Zimmermann.

Source/WebCore:

Tests: svg/foreignObject/repaint-rect-coordinates-expected.html

svg/foreignObject/repaint-rect-coordinates.html

  • rendering/svg/RenderSVGForeignObject.h:

(WebCore::RenderSVGForeignObject::objectBoundingBox):
(WebCore::RenderSVGForeignObject::strokeBoundingBox):
(WebCore::RenderSVGForeignObject::repaintRectInLocalCoordinates):
Return local coordinates.

LayoutTests:

Rebaseline after changing
RenderSVGForeignObject::{objectBoundingBox,strokeBoundingBox,repaintRectInLocalCoordinates}
to return local coordinates.

  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
  • platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
  • platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
  • platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
  • platform/gtk/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
  • platform/gtk/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
  • platform/gtk/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
  • platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt:
  • platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
  • platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
  • platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
  • platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
  • platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt:
  • platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
  • platform/qt/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
  • platform/qt/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
  • platform/qt/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
  • platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
  • platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt:
  • svg/foreignObject/multiple-foreign-objects-expected.txt:
  • svg/foreignObject/repaint-rect-coordinates-expected.html: Added.
  • svg/foreignObject/repaint-rect-coordinates.html: Added.
Location:
trunk
Files:
2 added
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r103463 r103465  
     12011-12-21  Florin Malita  <fmalita@google.com>
     2
     3        Improper handling of foreignobjects nested in svg groups
     4        https://bugs.webkit.org/show_bug.cgi?id=69762
     5
     6        Reviewed by Nikolas Zimmermann.
     7
     8        Rebaseline after changing
     9        RenderSVGForeignObject::{objectBoundingBox,strokeBoundingBox,repaintRectInLocalCoordinates}
     10        to return local coordinates.
     11
     12        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
     13        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
     14        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
     15        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
     16        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
     17        * platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
     18        * platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
     19        * platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt:
     20        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
     21        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
     22        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
     23        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
     24        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
     25        * platform/gtk/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
     26        * platform/gtk/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
     27        * platform/gtk/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
     28        * platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt:
     29        * platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt:
     30        * platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
     31        * platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
     32        * platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
     33        * platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
     34        * platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
     35        * platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
     36        * platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
     37        * platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
     38        * platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt:
     39        * platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt:
     40        * platform/qt/svg/custom/use-on-disallowed-foreign-object-1-expected.txt:
     41        * platform/qt/svg/custom/use-on-disallowed-foreign-object-2-expected.txt:
     42        * platform/qt/svg/custom/use-on-disallowed-foreign-object-3-expected.txt:
     43        * platform/qt/svg/custom/use-on-disallowed-foreign-object-4-expected.txt:
     44        * platform/qt/svg/custom/use-on-disallowed-foreign-object-5-expected.txt:
     45        * platform/qt/svg/custom/use-on-disallowed-foreign-object-6-expected.txt:
     46        * platform/qt/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt:
     47        * platform/qt/svg/custom/use-on-non-svg-namespaced-element-expected.txt:
     48        * platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
     49        * platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt:
     50        * svg/foreignObject/multiple-foreign-objects-expected.txt:
     51        * svg/foreignObject/repaint-rect-coordinates-expected.html: Added.
     52        * svg/foreignObject/repaint-rect-coordinates.html: Added.
     53
    1542011-12-21  Simon Fraser  <simon.fraser@apple.com>
    255

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-1-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x20

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-2-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x20

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-3-expected.txt

    r101409 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    66      RenderBlock {xhtml:div} at (0,0) size 580x20

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-4-expected.txt

    r101409 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x20

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-5-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-disallowed-foreign-object-6-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGViewportContainer {svg} at (86,87) size 714x513
     6      RenderSVGViewportContainer {svg} at (43,43) size 757x557
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x20

  • trunk/LayoutTests/platform/chromium-win/svg/custom/use-on-non-svg-namespaced-element-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x20

  • trunk/LayoutTests/platform/chromium-win/svg/foreignObject/svg-document-as-direct-child-expected.txt

    r103407 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (0,0) size 300x400
     4  RenderSVGRoot {svg} at (0,0) size 300x250
    55    RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
    66      RenderSVGRoot {svg} at (0,5) size 32x19

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-1-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x18

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-2-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-3-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    66      RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-4-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-5-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-disallowed-foreign-object-6-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGViewportContainer {svg} at (86,87) size 714x513
     6      RenderSVGViewportContainer {svg} at (43,43) size 757x557
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt

    r78583 r103465  
    44  RenderSVGRoot {svg} at (25,25) size 75x75
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGContainer {g} at (0,0) size 600x400
     6      RenderSVGContainer {g} at (0,0) size 590x390
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88        RenderSVGImage {image} at (0,0) size 75x75

  • trunk/LayoutTests/platform/gtk/svg/custom/use-on-non-svg-namespaced-element-expected.txt

    r101371 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x18

  • trunk/LayoutTests/platform/gtk/svg/foreignObject/svg-document-as-direct-child-expected.txt

    r103407 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (0,0) size 300x400
     4  RenderSVGRoot {svg} at (0,0) size 300x250
    55    RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
    66      RenderSVGRoot {svg} at (0,5) size 34x19

  • trunk/LayoutTests/platform/gtk/svg/overflow/overflow-on-foreignObject-expected.txt

    r99756 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 500x500
    4   RenderSVGRoot {svg} at (200,200) size 300x300
     4  RenderSVGRoot {svg} at (100,100) size 300x300
    55    RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
    66layer at (0,0) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-1-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x18

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-2-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-3-expected.txt

    r101342 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    66      RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-4-expected.txt

    r101342 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-5-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-disallowed-foreign-object-6-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGViewportContainer {svg} at (86,87) size 714x513
     6      RenderSVGViewportContainer {svg} at (43,43) size 757x557
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x18

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt

    r75351 r103465  
    44  RenderSVGRoot {svg} at (25,25) size 75x75
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGContainer {g} at (0,0) size 600x400
     6      RenderSVGContainer {g} at (0,0) size 590x390
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88        RenderSVGImage {image} at (0,0) size 75x75

  • trunk/LayoutTests/platform/mac/svg/custom/use-on-non-svg-namespaced-element-expected.txt

    r75351 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x18

  • trunk/LayoutTests/platform/mac/svg/foreignObject/svg-document-as-direct-child-expected.txt

    r103407 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (0,0) size 300x400
     4  RenderSVGRoot {svg} at (0,0) size 300x250
    55    RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
    66      RenderSVGRoot {svg} at (0,6) size 33x18

  • trunk/LayoutTests/platform/mac/svg/overflow/overflow-on-foreignObject-expected.txt

    r99731 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 500x500
    4   RenderSVGRoot {svg} at (200,200) size 300x300
     4  RenderSVGRoot {svg} at (100,100) size 300x300
    55    RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
    66layer at (0,0) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-1-expected.txt

    r98072 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x21

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-2-expected.txt

    r98072 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x21

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-3-expected.txt

    r101344 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    66      RenderBlock {xhtml:div} at (0,0) size 580x21

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-4-expected.txt

    r101344 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
    5     RenderSVGContainer {g} at (108,109) size 692x491
    6       RenderSVGContainer {g} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
     5    RenderSVGContainer {g} at (54,54) size 746x546
     6      RenderSVGContainer {g} at (54,54) size 746x546
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x21

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-5-expected.txt

    r98072 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    66    RenderSVGForeignObject {foreignObject} at (10,10) size 580x380

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-disallowed-foreign-object-6-expected.txt

    r98072 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGViewportContainer {svg} at (86,87) size 714x513
     6      RenderSVGViewportContainer {svg} at (43,43) size 757x557
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88          RenderBlock {xhtml:div} at (0,0) size 580x21

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-g-containing-foreignObject-and-image-expected.txt

    r79044 r103465  
    44  RenderSVGRoot {svg} at (25,25) size 75x75
    55    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
    6       RenderSVGContainer {g} at (0,0) size 600x400
     6      RenderSVGContainer {g} at (0,0) size 590x390
    77        RenderSVGForeignObject {foreignObject} at (10,10) size 580x380
    88        RenderSVGImage {image} at (0,0) size 75x75

  • trunk/LayoutTests/platform/qt/svg/custom/use-on-non-svg-namespaced-element-expected.txt

    r98072 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (108,109) size 692x491
     4  RenderSVGRoot {svg} at (54,54) size 746x546
    55    RenderSVGForeignObject {foreignObject} at (10,10) size 480x360
    66      RenderBlock {xhtml:div} at (0,0) size 480x21

  • trunk/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt

    r103407 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 800x600
    4   RenderSVGRoot {svg} at (0,0) size 300x400
     4  RenderSVGRoot {svg} at (0,0) size 300x250
    55    RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
    66      RenderSVGRoot {svg} at (0,4) size 39x21

  • trunk/LayoutTests/platform/qt/svg/overflow/overflow-on-foreignObject-expected.txt

    r99756 r103465  
    22  RenderView at (0,0) size 800x600
    33layer at (0,0) size 500x500
    4   RenderSVGRoot {svg} at (200,200) size 300x300
     4  RenderSVGRoot {svg} at (100,100) size 300x300
    55    RenderSVGForeignObject {foreignObject} at (100,100) size 300x300
    66layer at (0,0) size 6006x6006 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600

  • trunk/LayoutTests/svg/foreignObject/multiple-foreign-objects-expected.txt

    r100465 r103465  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (0,0) size 800x600
    6       RenderSVGRoot {svg} at (0,0) size 400x100
     6      RenderSVGRoot {svg} at (0,0) size 250x100
    77        RenderSVGForeignObject {foreignObject} at (0,0) size 100x100
    88          RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]

  • trunk/Source/WebCore/ChangeLog

    r103462 r103465  
     12011-12-21  Florin Malita  <fmalita@google.com>
     2
     3        Improper handling of foreignobjects nested in svg groups
     4        https://bugs.webkit.org/show_bug.cgi?id=69762
     5
     6        Reviewed by Nikolas Zimmermann.
     7
     8        Tests: svg/foreignObject/repaint-rect-coordinates-expected.html
     9               svg/foreignObject/repaint-rect-coordinates.html
     10
     11        * rendering/svg/RenderSVGForeignObject.h:
     12        (WebCore::RenderSVGForeignObject::objectBoundingBox):
     13        (WebCore::RenderSVGForeignObject::strokeBoundingBox):
     14        (WebCore::RenderSVGForeignObject::repaintRectInLocalCoordinates):
     15        Return local coordinates.
     16
    1172011-12-21  Anders Carlsson  <andersca@apple.com>
    218

  • trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h

    r101342 r103465  
    2525#include "AffineTransform.h"
    2626#include "FloatPoint.h"
     27#include "FloatRect.h"
    2728#include "RenderSVGBlock.h"
    2829
    … …  
    4647    virtual void layout();
    4748
    48     virtual FloatRect objectBoundingBox() const { return m_viewport; }
    49     virtual FloatRect strokeBoundingBox() const { return m_viewport; }
    50     virtual FloatRect repaintRectInLocalCoordinates() const { return m_viewport; }
     49    virtual FloatRect objectBoundingBox() const { return FloatRect(FloatPoint(), m_viewport.size()); }
     50    virtual FloatRect strokeBoundingBox() const { return FloatRect(FloatPoint(), m_viewport.size()); }
     51    virtual FloatRect repaintRectInLocalCoordinates() const { return FloatRect(FloatPoint(), m_viewport.size()); }
    5152
    5253    virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction);
Note: See TracChangeset for help on using the changeset viewer.