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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e8c7c1130d30a18e3c7b07addac3c370e2402332
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 22 18:20:44 2002 +0000

    Fixed reapplyStyles to use new KDE3 recalcStyle function.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f68e857..974e203 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -11,20 +11,6 @@
 	This was breaking the build. Live font changes are
 	temporarily broken again.
 
-2002-03-20  Maciej Stachowiak  <mjs at apple.com>
-
-	Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
-	
-	2002-03-20  Maciej Stachowiak  <mjs at apple.com>
-
-		Merged accumlated changes from HEAD, up to
-		MERGED_TO_KDE_3_MERGE_BRANCH tag.
-
-	2002-03-19  Maciej Stachowiak  <mjs at apple.com>
-	
-	        * WebView.subproj/IFWebView.mm: (-[IFWebView layout]):
-		layout() no longer takes an argument.
-	
 2002-03-21  Richard Williamson  <rjw at apple.com>
 
         Added setNeedsToApplyStyles: and reapplyStyles.  This is for dynamic preferences
@@ -58,6 +44,20 @@
 	(+[IFWebDataSource initialize]): removed defaults-registration
 	from here.
 
+2002-03-20  Maciej Stachowiak  <mjs at apple.com>
+
+	Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
+	
+	2002-03-20  Maciej Stachowiak  <mjs at apple.com>
+
+		Merged accumlated changes from HEAD, up to
+		MERGED_TO_KDE_3_MERGE_BRANCH tag.
+
+	2002-03-19  Maciej Stachowiak  <mjs at apple.com>
+	
+	        * WebView.subproj/IFWebView.mm: (-[IFWebView layout]):
+		layout() no longer takes an argument.
+	
 2002-03-20  John Sullivan  <sullivan at apple.com>
 
 	Added displayTitle field to IFURIEntry. This is intended to hold the string
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f68e857..974e203 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -11,20 +11,6 @@
 	This was breaking the build. Live font changes are
 	temporarily broken again.
 
-2002-03-20  Maciej Stachowiak  <mjs at apple.com>
-
-	Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
-	
-	2002-03-20  Maciej Stachowiak  <mjs at apple.com>
-
-		Merged accumlated changes from HEAD, up to
-		MERGED_TO_KDE_3_MERGE_BRANCH tag.
-
-	2002-03-19  Maciej Stachowiak  <mjs at apple.com>
-	
-	        * WebView.subproj/IFWebView.mm: (-[IFWebView layout]):
-		layout() no longer takes an argument.
-	
 2002-03-21  Richard Williamson  <rjw at apple.com>
 
         Added setNeedsToApplyStyles: and reapplyStyles.  This is for dynamic preferences
@@ -58,6 +44,20 @@
 	(+[IFWebDataSource initialize]): removed defaults-registration
 	from here.
 
+2002-03-20  Maciej Stachowiak  <mjs at apple.com>
+
+	Merged the following changes from LABYRINTH_KDE_3_MERGE branch:
+	
+	2002-03-20  Maciej Stachowiak  <mjs at apple.com>
+
+		Merged accumlated changes from HEAD, up to
+		MERGED_TO_KDE_3_MERGE_BRANCH tag.
+
+	2002-03-19  Maciej Stachowiak  <mjs at apple.com>
+	
+	        * WebView.subproj/IFWebView.mm: (-[IFWebView layout]):
+		layout() no longer takes an argument.
+	
 2002-03-20  John Sullivan  <sullivan at apple.com>
 
 	Added displayTitle field to IFURIEntry. This is intended to hold the string
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index fd6f7d1..9afc40d 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -138,7 +138,7 @@
 // FIXME: This is commented out because it fails to  compile with KDE3 merge.
 // We need to replace it with whatever the new equivalent is.
 
-//            widget->part()->xmlDocImpl()->applyChanges(TRUE, TRUE);
+            widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
 
 
 
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index fd6f7d1..9afc40d 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -138,7 +138,7 @@
 // FIXME: This is commented out because it fails to  compile with KDE3 merge.
 // We need to replace it with whatever the new equivalent is.
 
-//            widget->part()->xmlDocImpl()->applyChanges(TRUE, TRUE);
+            widget->part()->xmlDocImpl()->recalcStyle(DOM::NodeImpl::Force);
 
 
 

-- 
WebKit Debian packaging