Bug 428023. Allow SVG without a viewBox to scroll when embedded by reference by a replaced element. r=longsonr, sr=roc, a1.9=vlad

layout/reftests/svg/sizing/reftest.list

@@ -286,12 +286,13 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == inline--position-relative--01.xhtml
 fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == object--auto-auto--0-pct.html        object--auto-auto--0-pct--ref.html
 fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == object--auto-auto--0-px.html         object--auto-auto--0-px--ref.html
 fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == object--auto-auto--pct-0.html        object--auto-auto--pct-0--ref.html
-== object--auto-auto--pct-pct.html      object--auto-auto--pct-pct--ref.html
-== object--auto-auto--pct-px.html       object--auto-auto--pct-px--ref.html
+# The following four commented out tests fail post bug 428023:
+#== object--auto-auto--pct-pct.html      object--auto-auto--pct-pct--ref.html
+#== object--auto-auto--pct-px.html       object--auto-auto--pct-px--ref.html
 fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == object--auto-auto--px-0.html         object--auto-auto--px-0--ref.html
-== object--auto-auto--px-pct.html       object--auto-auto--px-pct--ref.html
+#== object--auto-auto--px-pct.html       object--auto-auto--px-pct--ref.html
 == object--auto-auto--px-px.html        object--auto-auto--px-px--ref.html
-== object--pct-pct--0-0.html            pass.svg
+#== object--pct-pct--0-0.html            pass.svg
 
 
 # Assorted tests to check that dynamic changes work correctly

layout/svg/base/src/nsSVGOuterSVGFrame.cpp

@@ -320,7 +320,8 @@ nsSVGOuterSVGFrame::ComputeSize(nsIRenderingContext *aRenderingContext,
                                 nsSize aMargin, nsSize aBorder, nsSize aPadding,
                                 PRBool aShrinkWrap)
 {
-  if (EmbeddedByReference()) {
+  if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::viewBox) &&
+      EmbeddedByReference()) {
     // The embedding element has done the replaced element sizing, using our
     // intrinsic dimensions as necessary. We just need to fill the viewport.
     return aCBSize;