From be7ff51463ef0cc8ca9a46fc81d0e70fd5dc5038 Mon Sep 17 00:00:00 2001 From: "alqahira%ardisson.org" Date: Fri, 30 Jul 2010 18:27:34 +0000 Subject: [PATCH] Bug 575836: Fix logic here. Patch by Chris Jones and Josh Aas , r=josh/jones.chris.g, r=jst, a1.9.0.next=dveditz git-svn-id: svn://10.0.0.236/trunk@260921 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsObjectFrame.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 03f0b9f66b6..7917ab27898 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -3001,9 +3001,10 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays() // to the bottom of the array if there isn't already a "src" specified. PRUint16 numRealAttrs = mNumCachedAttrs; nsAutoString data; - if (mContent->Tag() == nsGkAtoms::object - && !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) - && mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data)) { + if (mContent->Tag() == nsGkAtoms::object && + !mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::src) && + mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::data, data) && + !data.IsEmpty()) { mNumCachedAttrs++; } @@ -3051,7 +3052,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays() } // if the conditions above were met, copy the "data" attribute to a "src" array entry - if (data.Length()) { + if (!data.IsEmpty()) { mCachedAttrParamNames [nextAttrParamIndex] = ToNewUTF8String(NS_LITERAL_STRING("SRC")); mCachedAttrParamValues[nextAttrParamIndex] = ToNewUTF8String(data); nextAttrParamIndex++;