[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 becd552c1d165b3323b629daf9e42ba345b10338
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 20 00:09:50 2002 +0000

    	* kwq/KWQScrollView.mm:
    	(QScrollView::addChild):
    	    Fixed regression from fix to 2956444.  Wrong view was being checked
    	    for conformance to WebCoreFrameView.
    	* kwq/KWQWidget.mm:
    	(QWidget::internalSetGeometry):
    	    Fixed regression from fix to 2956444.  Wrong view was being checked
    	    for conformance to WebCoreFrameView.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1407 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c559f7f..9bc67f5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-06-19  Richard Williamson (local)  <rjw at apple.com>
 
+	* kwq/KWQScrollView.mm:
+	(QScrollView::addChild):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+	* kwq/KWQWidget.mm:
+	(QWidget::internalSetGeometry):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+
+2002-06-19  Richard Williamson (local)  <rjw at apple.com>
+
 	* khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): 
 	    Tweak
 	* khtml/rendering/render_image.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c559f7f..9bc67f5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-06-19  Richard Williamson (local)  <rjw at apple.com>
 
+	* kwq/KWQScrollView.mm:
+	(QScrollView::addChild):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+	* kwq/KWQWidget.mm:
+	(QWidget::internalSetGeometry):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+
+2002-06-19  Richard Williamson (local)  <rjw at apple.com>
+
 	* khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): 
 	    Tweak
 	* khtml/rendering/render_image.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c559f7f..9bc67f5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-06-19  Richard Williamson (local)  <rjw at apple.com>
 
+	* kwq/KWQScrollView.mm:
+	(QScrollView::addChild):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+	* kwq/KWQWidget.mm:
+	(QWidget::internalSetGeometry):
+	    Fixed regression from fix to 2956444.  Wrong view was being checked
+	    for conformance to WebCoreFrameView.
+
+2002-06-19  Richard Williamson (local)  <rjw at apple.com>
+
 	* khtml/khtmlview.cpp: (KHTMLView::~KHTMLView): 
 	    Tweak
 	* khtml/rendering/render_image.cpp:
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index b4edca2..dbb87fe 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -201,7 +201,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
     // It's a bit of a hack, but when we are asked to add the widget for the top level of
     // a frame, we need to instead add the containing frame widget. See also the similar
     // code in QWidget::internalSetGeometry.
-    if ([[subview superview] conformsToProtocol:@protocol(WebCoreFrameView)]) {
+    if ([subview conformsToProtocol:@protocol(WebCoreFrameView)]) {
         subview = [subview superview];
     }
     
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 648a4f0..13f94b7 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -314,10 +314,12 @@ void QWidget::internalSetGeometry(int x, int y, int w, int h)
 {
     NSView *view = getView();
     
-    // It's a bit of a hack, but when we resize the widget for the top level of
-    // a frame, we need to resize the containing frame widget also. See also
-    // the similar code in QScrollView::addChild.
-    if ([[view superview] conformsToProtocol:@protocol(WebCoreFrameView)]) {
+    // A QScrollView is a widget only used to represent a frame.  If
+    // has an WebCoreFrameView as it's view. When
+    // we resize it we actually want to resize it's containing view,
+    // an IFWebView.  The scrollview contained by the IFWebView
+    // will be autosized.
+    if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
         view = [view superview];
     }
     

-- 
WebKit Debian packaging