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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 7426c8cf978fb6d72ac41540e6bd83ac741539ec
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 22 01:42:32 2002 +0000

    	* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
    	Commented out call to applyChanges that no longer exists.
    	This was breaking the build. Live font changes are
    	temporarily broken again.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@800 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 706ea3d..d73451d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-21  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
+	Commented out call to applyChanges that no longer exists.
+	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:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 706ea3d..d73451d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-21  John Sullivan  <sullivan at apple.com>
+
+	* WebView.subproj/IFWebView.mm: (-[IFWebView reapplyStyles]):
+	Commented out call to applyChanges that no longer exists.
+	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:
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index c2d6cff..fd6f7d1 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -133,7 +133,15 @@
         if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
             WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
             //double start = CFAbsoluteTimeGetCurrent();
-            widget->part()->xmlDocImpl()->applyChanges(TRUE, TRUE);
+
+
+// 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);
+
+
+
             //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "apply style time %e\n", CFAbsoluteTimeGetCurrent() - start);
             ((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
         }
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index c2d6cff..fd6f7d1 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -133,7 +133,15 @@
         if (((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles){
             WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "doing layout\n");
             //double start = CFAbsoluteTimeGetCurrent();
-            widget->part()->xmlDocImpl()->applyChanges(TRUE, TRUE);
+
+
+// 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);
+
+
+
             //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "apply style time %e\n", CFAbsoluteTimeGetCurrent() - start);
             ((IFWebViewPrivate *)_viewPrivate)->needsToApplyStyles = NO;
         }

-- 
WebKit Debian packaging