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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 78be86d227fd7d1ed9fba9a850e5e19c9e218f6e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 03:00:13 2003 +0000

    	Fix first-line regression caused by my removal of a local variable.
    
            Reviewed by mjs
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 96c2e09..79bd4dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
+	Fix first-line regression caused by my removal of a local variable.
+	
+        Reviewed by mjs
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-01-22  Richard Williamson   <rjw at apple.com>
 
         Fix the fix to 3119777 to scan for break over entire string
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 96c2e09..79bd4dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-01-22  David Hyatt  <hyatt at apple.com>
+
+	Fix first-line regression caused by my removal of a local variable.
+	
+        Reviewed by mjs
+
+        * khtml/css/cssstyleselector.cpp:
+
 2003-01-22  Richard Williamson   <rjw at apple.com>
 
         Fix the fix to 3119777 to scan for break over entire string
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 3230d2e..e0b5071 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -438,9 +438,11 @@ RenderStyle *CSSStyleSelector::styleForElement(ElementImpl *e)
                         pseudoStyle->inheritFrom( style );
                 }
 
-		CSSStyleSelector::style = pseudoStyle;
+                RenderStyle* oldStyle = style;
+		style = pseudoStyle;
                 if ( pseudoStyle )
                     applyRule( pseudoProps[i]->prop );
+                style = oldStyle;
             }
 
 	    if ( fontDirty ) {

-- 
WebKit Debian packaging