[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 655a310f72a7e51ea36cce4fa9011e92a7d818f5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 13 10:53:01 2002 +0000

        More cleanup to deal with special case of provisional view
        not being in a scrollview.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1345 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c0e677c..7d0993e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-06-13  Richard Williamson  <rjw at apple.com>
 
+    More cleanup to deal with special case of provisional view
+    not being in a scrollview.
+    
+	* kwq/KWQScrollView.mm:
+	(QScrollView::contentsWidth):
+	(QScrollView::contentsHeight):
+	(QScrollView::contentsX):
+	(QScrollView::contentsY):
+
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
     
 	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
 	* kwq/external.h:   removed definitions no longer needed
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c0e677c..7d0993e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-06-13  Richard Williamson  <rjw at apple.com>
 
+    More cleanup to deal with special case of provisional view
+    not being in a scrollview.
+    
+	* kwq/KWQScrollView.mm:
+	(QScrollView::contentsWidth):
+	(QScrollView::contentsHeight):
+	(QScrollView::contentsX):
+	(QScrollView::contentsY):
+
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
     
 	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
 	* kwq/external.h:   removed definitions no longer needed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c0e677c..7d0993e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-06-13  Richard Williamson  <rjw at apple.com>
 
+    More cleanup to deal with special case of provisional view
+    not being in a scrollview.
+    
+	* kwq/KWQScrollView.mm:
+	(QScrollView::contentsWidth):
+	(QScrollView::contentsHeight):
+	(QScrollView::contentsX):
+	(QScrollView::contentsY):
+
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
     
 	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
 	* kwq/external.h:   removed definitions no longer needed
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 26aaf3b..1ae3434 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -108,26 +108,34 @@ int QScrollView::visibleHeight() const
 int QScrollView::contentsWidth() const
 {
     NSScrollView *view = (NSScrollView *)getView();
-    return (int)[[view documentView] bounds].size.width;
+    if ([view respondsToSelector: @selector(documentView)])
+        return (int)[[view documentView] bounds].size.width;
+    return (int)[view bounds].size.width;
 }
 
 
 int QScrollView::contentsHeight() const
 {
     NSScrollView *view = (NSScrollView *)getView();
-    return (int)[[view documentView] bounds].size.height;
+    if ([view respondsToSelector: @selector(documentView)])
+        return (int)[[view documentView] bounds].size.height;
+    return (int)[view bounds].size.height;
 }
 
 int QScrollView::contentsX() const
 {
     NSScrollView *view = (NSScrollView *)getView();
-    return (int)[[view documentView] bounds].origin.x;
+    if ([view respondsToSelector: @selector(documentView)])
+        return (int)[[view documentView] bounds].origin.x;
+    return 0;
 }
 
 int QScrollView::contentsY() const
 {
     NSScrollView *view = (NSScrollView *)getView();
-    return (int)[[view documentView] bounds].origin.y;
+    if ([view respondsToSelector: @selector(documentView)])
+        return (int)[[view documentView] bounds].origin.y;
+    return 0;
 }
 
 int QScrollView::childX(QWidget *)

-- 
WebKit Debian packaging