[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 b30fb841429f59f59d7c71db751bedd5158f5cef
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 23:24:58 2003 +0000

    	Fix for 3136473.  <object>s with no specified size should be
    	0x0.  They should not be 300x200.  Fixes thinker.org.
    
            Reviewed by john and darin.
    
            * khtml/rendering/render_frames.cpp:
            (RenderPart::intrinsicWidth):
            (RenderPart::intrinsicHeight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3238 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b6aab66..792ceba 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3136473.  <object>s with no specified size should be
+	0x0.  They should not be 300x200.  Fixes thinker.org.
+	
+        Reviewed by john and darin.
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPart::intrinsicWidth):
+        (RenderPart::intrinsicHeight):
+
 2003-01-02  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej and Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b6aab66..792ceba 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3136473.  <object>s with no specified size should be
+	0x0.  They should not be 300x200.  Fixes thinker.org.
+	
+        Reviewed by john and darin.
+
+        * khtml/rendering/render_frames.cpp:
+        (RenderPart::intrinsicWidth):
+        (RenderPart::intrinsicHeight):
+
 2003-01-02  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej and Trey.
diff --git a/WebCore/khtml/rendering/render_frames.cpp b/WebCore/khtml/rendering/render_frames.cpp
index 8d0ec40..cc5141d 100644
--- a/WebCore/khtml/rendering/render_frames.cpp
+++ b/WebCore/khtml/rendering/render_frames.cpp
@@ -585,12 +585,22 @@ bool RenderPart::partLoadingErrorNotify(khtml::ChildFrame *, const KURL& , const
 
 short RenderPart::intrinsicWidth() const
 {
+  // KDE may need a non-zero width here, although this will mess up pages (e.g., thinker.org).
+#if APPLE_CHANGES
+    return 0;
+#else
     return 300;
+#endif
 }
 
 int RenderPart::intrinsicHeight() const
 {
+  // KDE may need a non-zero height here, although this will mess up pages (e.g., thinker.org).
+#if APPLE_CHANGES
+    return 0;
+#else
     return 200;
+#endif
 }
 
 void RenderPart::slotViewCleared()

-- 
WebKit Debian packaging