[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:34:32 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1fd8f61eb91b5eb6366c5e7ac1f8259d677395ee
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 19:13:49 2003 +0000

    Roll out accidentally-committed change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4028 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 2e852c9..6266fb5 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -924,9 +924,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
                 fontDef.family.setFamily(stdfont);
                 fontDef.family.appendFamily(0);
             }
-            if (m_styleSelector) {
-                fontDef.size = m_styleSelector->fontSizes()[3];
-            }
+            fontDef.size = m_styleSelector->fontSizes()[3];
         }
 
         //kdDebug() << "DocumentImpl::attach: setting to charset " << settings->charset() << endl;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list