rpms/xulrunner/F-12 mozilla-575836.patch, NONE, 1.1 xulrunner.spec, 1.192, 1.193

[Christopher Aillon]

Author: caillon

Update of /cvs/pkgs/rpms/xulrunner/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2888

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-575836.patch 
Log Message:
* Fri Jul 23 2010 Christopher Aillon <caillon at redhat.com> - 1.9.1.11-2
- Add patch for mozbz#575836 (1.9.1.12)


mozilla-575836.patch:
 nsObjectFrame.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE mozilla-575836.patch ---
# HG changeset patch
# User Chris Jones <jones.chris.g at gmail.com>
# Date 1279837785 14400
# Node ID 2f748ad22bbbf50c47fb0783e8f948917f3e8990
# Parent  3e8356d36728e61162b9d02b54676aef7b07f178
Bug 575836: Fix logic here. r=jst r=josh a=beltzner

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -3144,9 +3144,10 @@ nsresult nsPluginInstanceOwner::EnsureCa
   // 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++;
   }
 
@@ -3194,7 +3195,7 @@ nsresult nsPluginInstanceOwner::EnsureCa
   }
 
   // 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++;




Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/F-12/xulrunner.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- xulrunner.spec	20 Jul 2010 10:49:26 -0000	1.192
+++ xulrunner.spec	23 Jul 2010 20:30:39 -0000	1.193
@@ -15,7 +15,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -41,6 +41,7 @@ Patch10:        mozilla-191-pkgconfig.pa
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
 Patch101:       xulrunner-1.9.1-sparc-linux-sync_instruction_memory.patch
+Patch102:       mozilla-575836.patch
 
 # ---------------------------------------------------
 
@@ -167,6 +168,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
 %patch101 -p2 -b .sparc-linux-sync_instruction_memory
+%patch102 -p1 -b .575837
 
 
 %{__rm} -f .mozconfig
@@ -481,6 +483,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Jul 23 2010 Christopher Aillon <caillon at redhat.com> - 1.9.1.11-2
+- Add patch for mozbz#575836 (1.9.1.12)
+
 * Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 1.9.1.11-1
 - Update to 1.9.1.11