[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 14b130b26a13c24659be156d2a5666d7da41c67d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 16 00:53:08 2004 +0000

    	Fix for 3530734, many java applets don't show up.  Go ahead and just use the width/height from the style
    	system as the initial size when the width/height are fixed.
    
            Reviewed by rjw
    
            * khtml/rendering/render_applet.cpp:
            (RenderApplet::createWidgetIfNecessary):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2509e8d..ab2aa92 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-01-15  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3530734, many java applets don't show up.  Go ahead and just use the width/height from the style
+	system as the initial size when the width/height are fixed.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_applet.cpp:
+        (RenderApplet::createWidgetIfNecessary):
+
 2004-01-15  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3529426.  Exclude pages that contain Java applets from 
diff --git a/WebCore/khtml/rendering/render_applet.cpp b/WebCore/khtml/rendering/render_applet.cpp
index c030aab..756e1bc 100644
--- a/WebCore/khtml/rendering/render_applet.cpp
+++ b/WebCore/khtml/rendering/render_applet.cpp
@@ -93,9 +93,13 @@ int RenderApplet::intrinsicHeight() const
 void RenderApplet::createWidgetIfNecessary()
 {
     if (!m_widget) {
-        QSize size = QSize(m_width - borderLeft() - borderRight() - paddingLeft() - paddingRight(),
-                           m_height - borderTop() - borderBottom() - paddingTop() - paddingBottom());        
-    
+        // FIXME: Java applets can't be resized (this is a bug in Apple's Java implementation).  In order to work around
+        // this problem, we will simply use fixed widths/heights from the style system when we can, since the widget might
+        // not have an accurate m_width/m_height.
+        int width = style()->width().isFixed() ? style()->width().value : 
+                    m_width - borderLeft() - borderRight() - paddingLeft() - paddingRight();
+        int height = style()->height().isFixed() ? style()->height().value :
+                     m_height - borderTop() - borderBottom() - paddingTop() - paddingBottom();
         NodeImpl *child = element()->firstChild();
         while (child) {
             if (child->id() == ID_PARAM) {
@@ -105,7 +109,7 @@ void RenderApplet::createWidgetIfNecessary()
             child = child->nextSibling();
         }
     
-        setQWidget(new KJavaAppletWidget(size, m_context, m_args));
+        setQWidget(new KJavaAppletWidget(QSize(width, height), m_context, m_args));
     }
 }
 

-- 
WebKit Debian packaging