[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[alex at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4b7a1f76c65cc727f36a707a69bbe538227c36e0
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 19:48:10 2011 +0000

    2011-01-13  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [gtk] Zero-sized font does not yet work
            https://bugs.webkit.org/show_bug.cgi?id=49793
    
            Unskip font-size-zero.html.
    
            * platform/gtk/Skipped:
    
    2011-01-13  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [gtk] Zero-sized font does not yet work
            https://bugs.webkit.org/show_bug.cgi?id=49793
    
            Set minimum-font-size to 0 for the DRT.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (resetDefaultsToConsistentValues):
    
    2011-01-13  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [gtk] Zero-sized font does not yet work
            https://bugs.webkit.org/show_bug.cgi?id=49793
    
            Allow 0 as a minimum-font-size value for the settings.
    
            * webkit/webkitwebsettings.cpp:
            (webkit_web_settings_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75729 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9f07e90..0b2f220 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-13  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [gtk] Zero-sized font does not yet work
+        https://bugs.webkit.org/show_bug.cgi?id=49793
+
+        Unskip font-size-zero.html.
+
+        * platform/gtk/Skipped:
+
 2011-01-13  Tony Chang  <tony at chromium.org>
 
         Unreviewed, updating chromium test_expectations.txt
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 7d7628e..07dabcb 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5532,10 +5532,6 @@ fast/history/nested-visited-test.html
 fast/history/self-is-visited.html
 fast/history/sibling-visited-test.html
 
-# [gtk] Zero-sized font does not yet work
-# https://bugs.webkit.org/show_bug.cgi?id=49793
-fast/text/font-size-zero.html
-
 # Rounding color problems inside pixman
 # https://bugs.webkit.org/show_bug.cgi?id=49964
 fast/canvas/canvas-fillPath-shadow.html
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d0d8512..2c53451 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-13  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [gtk] Zero-sized font does not yet work
+        https://bugs.webkit.org/show_bug.cgi?id=49793
+
+        Set minimum-font-size to 0 for the DRT.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+
 2011-01-13  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 32a41c3..ff90d81 100644
--- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -408,7 +408,7 @@ static void resetDefaultsToConsistentValues()
                  "fantasy-font-family", "fantasy",
                  "default-font-size", 16,
                  "default-monospace-font-size", 13,
-                 "minimum-font-size", 1,
+                 "minimum-font-size", 0,
                  "enable-caret-browsing", FALSE,
                  "enable-page-cache", FALSE,
                  "auto-resize-window", TRUE,
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index f744d35..a6528b4 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-13  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [gtk] Zero-sized font does not yet work
+        https://bugs.webkit.org/show_bug.cgi?id=49793
+
+        Allow 0 as a minimum-font-size value for the settings.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+
 2011-01-12  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed build fix for 32-bits Release. Include GRefPtrGtk.h so
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 3deae30..492c7b6 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -335,7 +335,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                     "minimum-font-size",
                                     _("Minimum Font Size"),
                                     _("The minimum font size used to display text."),
-                                    1, G_MAXINT, 5,
+                                    0, G_MAXINT, 5,
                                     flags));
 
     g_object_class_install_property(gobject_class,

-- 
WebKit Debian packaging