rpms/xulrunner/F-9 mozilla-resolution.patch, NONE, 1.1 xulrunner-hang.patch, 1.1, 1.2 xulrunner.spec, 1.117, 1.118

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3434

Modified Files:
	xulrunner-hang.patch xulrunner.spec 
Added Files:
	mozilla-resolution.patch 
Log Message:
* Sat Apr 26 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.58
- Fix font scaling


mozilla-resolution.patch:

--- NEW FILE mozilla-resolution.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=384090

Index: mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v
retrieving revision 1.76
diff -d -u -p -r1.76 nsThebesDeviceContext.cpp
--- mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp	16 Apr 2008 03:27:03 -0000	1.76
+++ mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp	18 Apr 2008 18:41:21 -0000
@@ -49,7 +49,9 @@
 
 #ifdef MOZ_ENABLE_GTK2
 // for getenv
-#include <stdlib.h>
+#include <cstdlib>
+// for round
+#include <cmath>
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -170,8 +172,9 @@ nsThebesDeviceContext::SetDPI()
         }
 
 #if defined(MOZ_ENABLE_GTK2)
-        float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
-        PRInt32 OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn);
+        GdkScreen *screen = gdk_screen_get_default();
+        gtk_settings_get_for_screen(screen); // Make sure init is run so we have a resolution
+        PRInt32 OSVal = PRInt32(round(gdk_screen_get_resolution(screen)));
 
         if (prefDPI == 0) // Force the use of the OS dpi
             dpi = OSVal;

xulrunner-hang.patch:

Index: xulrunner-hang.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner-hang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-hang.patch	23 Apr 2008 08:33:50 -0000	1.1
+++ xulrunner-hang.patch	27 Apr 2008 04:14:11 -0000	1.2
@@ -1,3 +1,5 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=429903
+
 diff -NprU8 mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp mozilla/dom/src/base/nsDOMClassInfo.cpp
 --- mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp	2008-04-22 16:58:15.000000000 -0700
 +++ mozilla/dom/src/base/nsDOMClassInfo.cpp	2008-04-22 16:58:15.000000000 -0700
@@ -41,3 +43,21 @@
       * from ilooping SpiderMonkey trivially. But the overhead of detecting
       * cycles is high enough, and the threat from JS-API-calling C++ code is
       * low enough, that it's not worth burdening the non-DEBUG callers. Same
+@@ -2951,16 +2952,17 @@ JS_GetParent(JSContext *cx, JSObject *ob
+     /* Beware ref to dead object (we may be called from obj's finalizer). */
+     return parent && parent->map ? parent : NULL;
+ }
+ 
+ JS_PUBLIC_API(JSBool)
+ JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent)
+ {
+     CHECK_REQUEST(cx);
++    JS_ASSERT(obj != parent);
+ #ifdef DEBUG
+     /* FIXME: bug 408416, see JS_SetPrototype just above. */
+     if (obj->map->ops->setParent)
+         return obj->map->ops->setParent(cx, obj, JSSLOT_PARENT, parent);
+ #endif
+     OBJ_SET_PARENT(cx, obj, parent);
+     return JS_TRUE;
+ }


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- xulrunner.spec	25 Apr 2008 13:25:11 -0000	1.117
+++ xulrunner.spec	27 Apr 2008 04:14:11 -0000	1.118
@@ -9,7 +9,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.57%{?version_pre}%{?dist}
+Release:        0.58%{?version_pre}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -32,6 +32,7 @@
 Patch21:        mozilla-wtfbuttons.patch
 Patch22:        mozilla-keys.patch
 Patch23:        xulrunner-hang.patch
+Patch24:        mozilla-resolution.patch
 
 
 # ---------------------------------------------------
@@ -103,6 +104,7 @@
 %patch21 -p1 -b .wtfbuttons
 %patch22 -p1 -b .keys
 %patch23 -p1 -b .hang
+%patch24 -p1 -b .resolution
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -387,6 +389,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Apr 26 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.58
+- Fix font scaling
+
 * Fri Apr 25 2008 Martin Stransky <stransky at redhat.com> 1.9-0.57
 - Enabled phishing protection (#443403)