Reviewed by Maciej
authorbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Nov 2006 00:52:18 +0000 (00:52 +0000)
committerbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 8 Nov 2006 00:52:18 +0000 (00:52 +0000)
        Changed the check for "top level frame" to something much more valid

        * page/Frame.cpp:
        (WebCore::Frame::endIfNotLoading):

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

WebCore/ChangeLog
WebCore/page/Frame.cpp

index c374a1c6826a3f2e2cbbbb03482b17e67b18c743..ee23d46e41ae778343162212f29e24a4450ccd44 100644 (file)
@@ -1,3 +1,12 @@
+2006-11-07  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Maciej
+
+        Changed the check for "top level frame" to something much more valid
+
+        * page/Frame.cpp:
+        (WebCore::Frame::endIfNotLoading):
+
 2006-11-07  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Hyatt (yesterday).
index 27aec41dbe334dc5d0245266feef53162ac28746..f31720f5545c56578a8e28a1c7016797527b2699 100644 (file)
@@ -1026,10 +1026,9 @@ void Frame::endIfNotLoading()
     // 3) We have no valid icon URL
     // 4) We already have an unexpired icon
     
-    if (tree()->parent())
+    if (page()->mainFrame() != this)
         return;
         
-    
     if (IconDatabase* sharedIconDatabase = IconDatabase::sharedIconDatabase()) {
         if (!sharedIconDatabase->enabled())
             return;