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

[darin]

The following commit has been merged in the debian/unstable branch:
commit e071a60941ffcd9d0d40f84674a03197efe492cc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 9 16:26:23 2004 +0000

            Reviewed by Don.
    
            - fixed an assertion failure when putting up Java applets caused by my last change
    
            * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::KJavaAppletWidget):
            Don't try to get x() and y(). They are always zero because the widget is just being
            created at this point and has not yet been positioned; trying to get them
            leads to an assertion because there is no NSView until we call setView().
            Before my change, there was a KWQView object at 0,0 that was released when we called
            setView, which is why the problem is new.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0c6db94..8d6be11 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2004-02-08  Darin Adler  <darin at apple.com>
 
+        Reviewed by Don.
+
+        - fixed an assertion failure when putting up Java applets caused by my last change
+
+        * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::KJavaAppletWidget):
+        Don't try to get x() and y(). They are always zero because the widget is just being
+        created at this point and has not yet been positioned; trying to get them
+        leads to an assertion because there is no NSView until we call setView().
+        Before my change, there was a KWQView object at 0,0 that was released when we called
+        setView, which is why the problem is new.
+
+2004-02-08  Darin Adler  <darin at apple.com>
+
         Reviewed by Dave.
 
         - fixed things seen in the profile, for a total speedup of 4% on cvs-base
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 99129fb..c56c4ef 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,10 +27,7 @@
 
 #import "KHTMLView.h"
 #import "KWQExceptions.h"
-#import "KWQKHTMLPart.h"
 #import "KWQKJavaAppletContext.h"
-#import "KWQKURL.h"
-#import "KWQView.h"
 #import "WebCoreBridge.h"
 
 KJavaAppletWidget::KJavaAppletWidget(const QSize &size, KJavaAppletContext *c, const QMap<QString, QString> &args)
@@ -40,7 +37,7 @@ KJavaAppletWidget::KJavaAppletWidget(const QSize &size, KJavaAppletContext *c, c
     NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
     QMapConstIterator<QString, QString> it = args.begin();
     QMapConstIterator<QString, QString> end = args.end();
-    QString baseURLString = NULL;
+    QString baseURLString;
     while (it != end) {
         if (it.key().lower() == "baseurl") {
             baseURLString = it.data();
@@ -50,14 +47,13 @@ KJavaAppletWidget::KJavaAppletWidget(const QSize &size, KJavaAppletContext *c, c
     }
     
     KHTMLPart *part = c->part();
-    KURL baseURL = baseURLString != NULL ? KURL(baseURLString) : part->baseURL();
+    KURL baseURL = baseURLString.isNull() ? part->baseURL() : KURL(baseURLString);
     
-    setView([KWQ(part)->bridge() viewForJavaAppletWithFrame:NSMakeRect(x(), y(), size.width(), size.height())
+    setView([KWQ(part)->bridge() viewForJavaAppletWithFrame:NSMakeRect(0, 0, size.width(), size.height())
                                                  attributes:attributes
                                                     baseURL:baseURL.getNSURL()]);
     [attributes release];
-    part->view()->addChild(this, x(), y());
+    part->view()->addChild(this);
     
     KWQ_UNBLOCK_EXCEPTIONS;
 }
-

-- 
WebKit Debian packaging