[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 5cd21c0fe90a85c991b71f43d954ec56b9692c6f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 06:18:15 2002 +0000

    	Fixed: 3131267 - REGRESSION: Java 1.4.1 Applets Restarted When Window is Resized
    	Fixed: 3131244 - REGRESSION: Java 1.4.1 Multiple Copies of Applet Started When Window is Resized
    
    	Dave recently patched khtml with a fix for media content inside of table cells. The patch causes the java widget to get the layout call more than once. Calling layout more than once is perfectly allowed, but the java widget wasn't prepared for that and would create a new java view for each layout. We now only create a java view when the java view hasn't already been created.
    
            Reviewed by darin.
    
            * kwq/KWQKJavaAppletWidget.mm:
            (KJavaAppletWidget::showApplet): If the view of the widget is still a KWQView, we haven't replaced it with the Java view. This stops multiple view from being created.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b502026..12c2924 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-18  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3131267 - REGRESSION: Java 1.4.1 Applets Restarted When Window is Resized
+	Fixed: 3131244 - REGRESSION: Java 1.4.1 Multiple Copies of Applet Started When Window is Resized
+
+	Dave recently patched khtml with a fix for media content inside of table cells. The patch causes the java widget to get the layout call more than once. Calling layout more than once is perfectly allowed, but the java widget wasn't prepared for that and would create a new java view for each layout. We now only create a java view when the java view hasn't already been created.
+
+        Reviewed by darin.
+
+        * kwq/KWQKJavaAppletWidget.mm:
+        (KJavaAppletWidget::showApplet): If the view of the widget is still a KWQView, we haven't replaced it with the Java view. This stops multiple view from being created.
+
 === Alexander-40 ===
 
 2002-12-18  Trey Matteson  <trey at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b502026..12c2924 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-18  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3131267 - REGRESSION: Java 1.4.1 Applets Restarted When Window is Resized
+	Fixed: 3131244 - REGRESSION: Java 1.4.1 Multiple Copies of Applet Started When Window is Resized
+
+	Dave recently patched khtml with a fix for media content inside of table cells. The patch causes the java widget to get the layout call more than once. Calling layout more than once is perfectly allowed, but the java widget wasn't prepared for that and would create a new java view for each layout. We now only create a java view when the java view hasn't already been created.
+
+        Reviewed by darin.
+
+        * kwq/KWQKJavaAppletWidget.mm:
+        (KJavaAppletWidget::showApplet): If the view of the widget is still a KWQView, we haven't replaced it with the Java view. This stops multiple view from being created.
+
 === Alexander-40 ===
 
 2002-12-18  Trey Matteson  <trey at apple.com>
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index cbbd300..4f42cbd 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -28,6 +28,7 @@
 #import "KWQKJavaAppletContext.h"
 #import "KWQKURL.h"
 #import "KWQKHTMLPart.h"
+#import "KWQView.h"
 #import "WebCoreBridge.h"
 
 KJavaAppletWidget::KJavaAppletWidget(KJavaAppletContext *c, QWidget *)
@@ -60,8 +61,12 @@ void KJavaAppletWidget::processArguments(const QMap<QString, QString> &arguments
 
 void KJavaAppletWidget::showApplet()
 {
-    setView([KWQ(_context->part())->bridge()
-        viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
-                        attributes:_parameters
-                           baseURL:_baseURL.getNSString()]);
+    // If the view is a KWQView, we haven't replaced it with the Java view yet.
+    // Only set the Java view once.
+    if ([getView() isKindOfClass:[KWQView class]]) {
+        setView([KWQ(_context->part())->bridge()
+            viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
+                            attributes:_parameters
+                            baseURL:_baseURL.getNSString()]);
+    }
 }

-- 
WebKit Debian packaging