[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 72d8084148c3316890780ddb3975d303a468246c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 18 21:28:55 2001 +0000

    nother checkit
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/khtmlview.h b/WebCore/khtml/khtmlview.h
index 0ba179d..2e4ea59 100644
--- a/WebCore/khtml/khtmlview.h
+++ b/WebCore/khtml/khtmlview.h
@@ -172,6 +172,8 @@ public:
 
     static const QList<KHTMLView> *viewList() { return lstViews; }
 
+    virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
+
 signals:
     void cleared();
 
@@ -182,7 +184,6 @@ protected:
     virtual void showEvent ( QShowEvent * );
     virtual void hideEvent ( QHideEvent *);
     virtual bool focusNextPrevChild( bool next );
-    virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
 
     virtual void viewportMousePressEvent( QMouseEvent * );
     virtual void focusOutEvent( QFocusEvent * );
diff --git a/WebCore/src/kdelibs/khtml/khtmlview.h b/WebCore/src/kdelibs/khtml/khtmlview.h
index 0ba179d..2e4ea59 100644
--- a/WebCore/src/kdelibs/khtml/khtmlview.h
+++ b/WebCore/src/kdelibs/khtml/khtmlview.h
@@ -172,6 +172,8 @@ public:
 
     static const QList<KHTMLView> *viewList() { return lstViews; }
 
+    virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
+
 signals:
     void cleared();
 
@@ -182,7 +184,6 @@ protected:
     virtual void showEvent ( QShowEvent * );
     virtual void hideEvent ( QHideEvent *);
     virtual bool focusNextPrevChild( bool next );
-    virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph );
 
     virtual void viewportMousePressEvent( QMouseEvent * );
     virtual void focusOutEvent( QFocusEvent * );

-- 
WebKit Debian packaging