[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 b487f934266013368149309c931a1ec7d04fe394
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 04:48:41 2003 +0000

    	Margins were being lost on documents inside iframes
    	and objects.  This turned out to be 3 different bugs, one
    	of which involved the bad cast of an object element to an
    	iframe element.
    
            Reviewed by darin
    
            * khtml/html/html_baseimpl.cpp:
            (HTMLIFrameElementImpl::HTMLIFrameElementImpl):
            * khtml/rendering/render_frames.cpp:
            (RenderPartObject::slotViewCleared):
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::createPart):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3503 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ed7e4cf..71778e6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,21 @@
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
+	Margins were being lost on documents inside iframes
+	and objects.  This turned out to be 3 different bugs, one
+	of which involved the bad cast of an object element to an
+	iframe element.
+	
+        Reviewed by darin
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLIFrameElementImpl::HTMLIFrameElementImpl):
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::slotViewCleared):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart):
+
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
 	Fix for auto width tables.  Prevent overflow when assigning from
 	the computed integer max width back into a short value.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ed7e4cf..71778e6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,21 @@
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
+	Margins were being lost on documents inside iframes
+	and objects.  This turned out to be 3 different bugs, one
+	of which involved the bad cast of an object element to an
+	iframe element.
+	
+        Reviewed by darin
+
+        * khtml/html/html_baseimpl.cpp:
+        (HTMLIFrameElementImpl::HTMLIFrameElementImpl):
+        * khtml/rendering/render_frames.cpp:
+        (RenderPartObject::slotViewCleared):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart):
+
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
 	Fix for auto width tables.  Prevent overflow when assigning from
 	the computed integer max width back into a short value.
 
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 1aa7b48..12dd5fa 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -621,8 +621,8 @@ NodeImpl::Id HTMLHtmlElementImpl::id() const
 HTMLIFrameElementImpl::HTMLIFrameElementImpl(DocumentPtr *doc) : HTMLFrameElementImpl(doc)
 {
     frameBorder = false;
-    marginWidth = 0;
-    marginHeight = 0;
+    marginWidth = -1;
+    marginHeight = -1;
     needWidgetUpdate = false;
 }
 
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index e54c6cd..00cd51d 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -940,8 +940,8 @@ void RenderPartObject::slotViewCleared()
       QScrollView *view = static_cast<QScrollView *>(m_widget);
       int frameStyle = QFrame::NoFrame;
       QScrollView::ScrollBarMode scroll = QScrollView::Auto;
-      int marginw = 0;
-      int marginh = 0;
+      int marginw = -1;
+      int marginh = -1;
       if ( element()->id() == ID_IFRAME) {
 	  HTMLIFrameElementImpl *frame = static_cast<HTMLIFrameElementImpl *>(element());
 	  if(frame->frameBorder)
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 5663f9e..0f2adab 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -267,13 +267,21 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
         return newPart;
     } else {
         LOG(Frames, "name %s", child.m_name.ascii());
-        HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(child.m_frame->element());
+        BOOL allowsScrolling = YES;
+        int marginWidth = -1;
+        int marginHeight = -1;
+        if (child.m_type != ChildFrame::Object) {
+            HTMLIFrameElementImpl *o = static_cast<HTMLIFrameElementImpl *>(child.m_frame->element());
+            allowsScrolling = o->scrollingMode() != QScrollView::AlwaysOff;
+            marginWidth = o->getMarginWidth();
+            marginHeight = o->getMarginHeight();
+        }
         WebCoreBridge *childBridge = [_bridge createChildFrameNamed:child.m_name.getNSString()
                                                             withURL:url.url().getNSString()
                                                          renderPart:child.m_frame
-                                                    allowsScrolling:o->scrollingMode() != QScrollView::AlwaysOff
-                                                        marginWidth:o->getMarginWidth()
-                                                       marginHeight:o->getMarginHeight()];
+                                                    allowsScrolling:allowsScrolling
+                                                        marginWidth:marginWidth
+                                                       marginHeight:marginHeight];
         return [childBridge part];
     }
 }

-- 
WebKit Debian packaging