Bug 655877 - Part 33: Allow new SVG text frames in clip paths. r=longsonr
authorCameron McCormack <cam@mcc.id.au>
Mon, 11 Feb 2013 17:22:17 +1100
changeset 121493 9bc717b46687dec44940b912c56b757eb2a5d11e
parent 121492 0e81334f73d1137a7d412e5216d80888ba42d03f
child 121494 37efcc78e70e5dacee7ab9c31a02c7acba2d8462
push id24291
push userryanvm@gmail.com
push dateMon, 11 Feb 2013 19:12:51 +0000
treeherdermozilla-central@93ba23f414ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslongsonr
bugs655877
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 655877 - Part 33: Allow new SVG text frames in clip paths. r=longsonr
layout/svg/nsSVGClipPathFrame.cpp
--- a/layout/svg/nsSVGClipPathFrame.cpp
+++ b/layout/svg/nsSVGClipPathFrame.cpp
@@ -255,24 +255,26 @@ nsSVGClipPathFrame::IsValid()
 
     if (type == nsGkAtoms::svgUseFrame) {
       for (nsIFrame* grandKid = kid->GetFirstPrincipalChild(); grandKid;
            grandKid = grandKid->GetNextSibling()) {
 
         nsIAtom *type = grandKid->GetType();
 
         if (type != nsGkAtoms::svgPathGeometryFrame &&
-            type != nsGkAtoms::svgTextFrame) {
+            type != nsGkAtoms::svgTextFrame &&
+            type != nsGkAtoms::svgTextFrame2) {
           return false;
         }
       }
       continue;
     }
     if (type != nsGkAtoms::svgPathGeometryFrame &&
-        type != nsGkAtoms::svgTextFrame) {
+        type != nsGkAtoms::svgTextFrame &&
+        type != nsGkAtoms::svgTextFrame2) {
       return false;
     }
   }
   return true;
 }
 
 NS_IMETHODIMP
 nsSVGClipPathFrame::AttributeChanged(int32_t         aNameSpaceID,