[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 1eda7524692e9b8d6f2f456592a5230a26479bbd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 19 05:54:50 2004 +0000

    Fix build bustage.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index e8ea8b7..2d35384 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -238,7 +238,7 @@ __ZN5QRectC1Eiiii
 __ZN5QRectC1Ev
 __ZN5QSizeC1Eii
 __ZN5QSizeC1Ev
-__ZN5QTime7elapsedEv
+__ZNK5QTime7elapsedEv
 __ZN5QTime7restartEv
 __ZN5QTimeC1Eii
 __ZN5QTimeC1Ev
diff --git a/WebCore/WebCore-tests.exp b/WebCore/WebCore-tests.exp
index d53fd7f..6e8641b 100644
--- a/WebCore/WebCore-tests.exp
+++ b/WebCore/WebCore-tests.exp
@@ -127,7 +127,7 @@ __ZN5QRectC1Eiiii
 __ZN5QRectC1Ev
 __ZN5QSizeC1Eii
 __ZN5QSizeC1Ev
-__ZN5QTime7elapsedEv
+__ZNK5QTime7elapsedEv
 __ZN5QTime7restartEv
 __ZN5QTimeC1Eii
 __ZN5QTimeC1Ev
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 5c9fe12..dce2fc0 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -106,7 +106,7 @@ public:
         paintBuffer=0;
         formCompletions=0;
         layoutTimerId = 0;
-        layoutTimerParsing = false;
+        allDataReceivedWhenTimerSet = false;
         mousePressed = false;
         tooltip = 0;
         doFullRepaint = true;
@@ -160,7 +160,7 @@ public:
 	isDoubleClick = false;
 	scrollingSelf = false;
 	layoutTimerId = 0;
-        layoutTimerParsing = false;
+        allDataReceivedWhenTimerSet = false;
         mousePressed = false;
         doFullRepaint = true;
         layoutSchedulingEnabled = true;
@@ -203,7 +203,7 @@ public:
     int prevMouseX, prevMouseY;
     bool scrollingSelf;
     int layoutTimerId;
-    bool layoutTimerParsing;
+    bool allDataReceivedWhenTimerSet;
     
     bool layoutSchedulingEnabled;
     bool layoutSuppressed;
@@ -542,7 +542,7 @@ void KHTMLView::layout()
     d->layoutSchedulingEnabled=false;
     killTimer(d->layoutTimerId);
     d->layoutTimerId = 0;
-    d->layoutTimerParsing = false;
+    d->allDataReceivedWhenTimerSet = false;
 
     if (!m_part) {
         // FIXME: Do we need to set _width here?
@@ -1845,7 +1845,7 @@ void KHTMLView::scheduleRelayout()
     if (d->layoutTimerId || (m_part->xmlDocImpl() && !m_part->xmlDocImpl()->shouldScheduleLayout()))
         return;
 
-    d->layoutTimerParsing = m_part->xmlDocImpl() && !m_part->xmlDocImpl()->allDataReceived();
+    d->allDataReceivedWhenTimerSet = m_part->xmlDocImpl() && !m_part->xmlDocImpl()->allDataReceived();
 
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
     if (!m_part->xmlDocImpl()->ownerElement())
@@ -1857,7 +1857,7 @@ void KHTMLView::scheduleRelayout()
 
 bool KHTMLView::haveDelayedLayoutScheduled()
 {
-    return d->layoutTimerId && d->layoutTimerParsing;
+    return d->layoutTimerId && d->allDataReceivedWhenTimerSet;
 }
 
 void KHTMLView::unscheduleRelayout()
@@ -1867,7 +1867,7 @@ void KHTMLView::unscheduleRelayout()
 
     killTimer(d->layoutTimerId);
     d->layoutTimerId = 0;
-    d->layoutTimerParsing = false;
+    d->allDataReceivedWhenTimerSet = false;
 }
 
 bool KHTMLView::isTransparent() const

-- 
WebKit Debian packaging