Not reviewed, fix for crash on launch bug in last patch.

        * WebView/WebHTMLView.mm:
        (-[WebHTMLView setDataSource:]): Remove an assertion, fix code to work right in the
        face of that condition.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c84937e78ee8a121525338650a1a0a6e92899a28..7c52006735b81eae8fd991ce1cc4c03c54ade452 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-20  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed, fix for crash on launch bug in last patch.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView setDataSource:]): Remove an assertion, fix code to work right in the
+        face of that condition.
+
 2007-08-18  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/WebView/WebHTMLView.mm b/WebKit/WebView/WebHTMLView.mm
index a699668d454070f72bc990450a4c1cb4b6c4c38d..066c1497a1880dc1735250727c1283fe953bb529 100644 (file)
--- a/WebKit/WebView/WebHTMLView.mm
+++ b/WebKit/WebView/WebHTMLView.mm
@@ -3251,9 +3251,10 @@ noPromisedData:
 {
     ASSERT(dataSource);
     if (_private->dataSource != dataSource) {
-        ASSERT(!_private->dataSource);
         ASSERT(!_private->closed);
-        _private->dataSource = [dataSource retain];
+        [dataSource retain];
+        [_private->dataSource release];
+        _private->dataSource = dataSource;
         [_private->pluginController setDataSource:dataSource];
         [self addMouseMovedObserver];
     }