[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 12:38:50 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 30ea4bc0e4943cc2c48c621c05ebba4559861068
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 16:18:59 2010 +0000

    WebCore: Fix the same issue as https://bugs.webkit.org/show_bug.cgi?id=41585
    but this time for the -webkit-font-smoothing property.
    
    Reviewed by Simon Fraser.
    
    Updated fast/css/text-rendering-priority.html to cover all properties that
    affect the font.
    
    * css/CSSPropertyNames.in: Moved text-rendering to the â€œhigh priorityâ€ section at the top.
    * css/CSSStyleSelector.cpp:
    (WebCore::CSSStyleSelector::styleForElement): Assert that the font is not dirtied by
    applying any of the â€œlow priorityâ€ properties, but still handle the case that the assertion
    is false.
    (WebCore::CSSStyleSelector::applyDeclarations): Updated compile-time assertion.
    
    LayoutTests: Extended this test to cover all properties that dirty the font and therefore
    need to have high priority.
    
    Reviewed by Simon Fraser.
    
    * fast/css/text-rendering-priority.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 324c2ba..69b5387 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-26  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Extended this test to cover all properties that dirty the font and therefore
+        need to have high priority.
+
+        * fast/css/text-rendering-priority.html:
+
 2010-08-26  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/LayoutTests/fast/css/text-rendering-priority.html b/LayoutTests/fast/css/text-rendering-priority.html
index 122f250..f9e9c49 100644
--- a/LayoutTests/fast/css/text-rendering-priority.html
+++ b/LayoutTests/fast/css/text-rendering-priority.html
@@ -4,7 +4,16 @@
             layoutTestController.dumpAsText();
     </script>
     <style>
+        #target { font: 20px fantasy; }
+        #target { font-family: sans-serif; }
+        #target { font-size: 40px; }
+        #target { font-style: italic; }
+        #target { font-variant: small-caps; }
+        #target { font-weight: 900; }
         #target { text-rendering: optimizelegibility; }
+        #target { -webkit-font-smoothing: none; }
+        #target { -webkit-text-size-adjust: none; }
+        #target { zoom: 2; }
     </style>
 </head>
 <body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b703339..8e14e2d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-26  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Fix the same issue as https://bugs.webkit.org/show_bug.cgi?id=41585
+        but this time for the -webkit-font-smoothing property.
+
+        Updated fast/css/text-rendering-priority.html to cover all properties that
+        affect the font.
+
+        * css/CSSPropertyNames.in: Moved text-rendering to the â€œhigh priorityâ€ section at the top.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleForElement): Assert that the font is not dirtied by
+        applying any of the â€œlow priorityâ€ properties, but still handle the case that the assertion
+        is false.
+        (WebCore::CSSStyleSelector::applyDeclarations): Updated compile-time assertion.
+
 2010-08-26  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/css/CSSPropertyNames.in b/WebCore/css/CSSPropertyNames.in
index 0216ae1..a3063db 100644
--- a/WebCore/css/CSSPropertyNames.in
+++ b/WebCore/css/CSSPropertyNames.in
@@ -20,6 +20,7 @@ font-style
 font-variant
 font-weight
 text-rendering
+-webkit-font-smoothing
 -webkit-text-size-adjust
 zoom
 
@@ -213,7 +214,6 @@ z-index
 -webkit-column-width
 -webkit-columns
 -webkit-font-size-delta
--webkit-font-smoothing
 -webkit-highlight
 -webkit-hyphenate-character
 -webkit-hyphenate-locale
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 120519b..8477ed7 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -1347,7 +1347,8 @@ PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* e, RenderStyl
         applyDeclarations<false>(true, firstUserRule, lastUserRule);
     }
     applyDeclarations<false>(true, firstUARule, lastUARule);
-    
+
+    ASSERT(!m_fontDirty);
     // If our font got dirtied by one of the non-essential font props, 
     // go ahead and update it a second time.
     if (m_fontDirty)
@@ -2922,7 +2923,7 @@ void CSSStyleSelector::applyDeclarations(bool isImportant, int startIndex, int e
 
                 if (applyFirst) {
                     COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
-                    COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 11, CSS_zoom_is_end_of_first_prop_range);
+                    COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 12, CSS_zoom_is_end_of_first_prop_range);
                     COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
 
                     // give special priority to font-xxx, color properties, etc

-- 
WebKit Debian packaging

