[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 57c71359ab68356b56ed114ebfd0b6ce9ca638a3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 16 18:59:11 2002 +0000

    	- fixed 2998692 -- crash when you type "googl" into the page address
    
            * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame): Check for
    	a nil part here to restore the old behavior. Whether that's OK or not
    	is another question that I'd prefer to deal with later.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d06b77c..d71c91c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-07-16  Darin Adler  <darin at apple.com>
 
+	- fixed 2998692 -- crash when you type "googl" into the page address
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame): Check for
+	a nil part here to restore the old behavior. Whether that's OK or not
+	is another question that I'd prefer to deal with later.
+
+2002-07-16  Darin Adler  <darin at apple.com>
+
         * almost every file: Renamed IF* -> Web*.
 
 2002-07-15  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d06b77c..d71c91c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-07-16  Darin Adler  <darin at apple.com>
 
+	- fixed 2998692 -- crash when you type "googl" into the page address
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame): Check for
+	a nil part here to restore the old behavior. Whether that's OK or not
+	is another question that I'd prefer to deal with later.
+
+2002-07-16  Darin Adler  <darin at apple.com>
+
         * almost every file: Renamed IF* -> Web*.
 
 2002-07-15  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d06b77c..d71c91c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-07-16  Darin Adler  <darin at apple.com>
 
+	- fixed 2998692 -- crash when you type "googl" into the page address
+
+        * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::requestFrame): Check for
+	a nil part here to restore the old behavior. Whether that's OK or not
+	is another question that I'd prefer to deal with later.
+
+2002-07-16  Darin Adler  <darin at apple.com>
+
         * almost every file: Renamed IF* -> Web*.
 
 2002-07-15  Darin Adler  <darin at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 7a8b372..642804a 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -431,7 +431,10 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
     WebCoreFrameBridge *wcFrame = [bridge childFrameNamed:name];
     if (wcFrame) {
         KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "found %s\n", DEBUG_OBJECT(name));
-        frame->setWidget([[wcFrame bridge] part]->impl->getView());
+        KHTMLPart *part = [[wcFrame bridge] part];
+        if (part) {
+            frame->setWidget(part->impl->getView());
+        }
     }
     else {
         KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "creating %s\n", DEBUG_OBJECT(name));
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 7a8b372..642804a 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -431,7 +431,10 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
     WebCoreFrameBridge *wcFrame = [bridge childFrameNamed:name];
     if (wcFrame) {
         KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "found %s\n", DEBUG_OBJECT(name));
-        frame->setWidget([[wcFrame bridge] part]->impl->getView());
+        KHTMLPart *part = [[wcFrame bridge] part];
+        if (part) {
+            frame->setWidget(part->impl->getView());
+        }
     }
     else {
         KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "creating %s\n", DEBUG_OBJECT(name));

-- 
WebKit Debian packaging