Reviewed by Darin.

        - segregate WebFrame methods into ones that should be moved into WebFrameLoader and ones that don't need to

        Also removed useless WebFrameLoader part

        * WebView/WebFrame.m:
        (-[WebFramePrivate dealloc]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dd5fa9224e6f4bd6d8aab5c754f77b3a4f132472..0648f218c9531215dc38d9a0203752c5782c3912 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+        
+        - segregate WebFrame methods into ones that should be moved into WebFrameLoader and ones that don't need to
+        
+        Also removed useless WebFrameLoader part
+
+        * WebView/WebFrame.m:
+        (-[WebFramePrivate dealloc]): 
+
 2006-10-06  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Anders.

diff --git a/WebKit/WebView/WebFrame.m b/WebKit/WebView/WebFrame.m
index 56bcbed0de391a3464edd8899cba306e9b36c680..25760462c9e0d5d1543bd803a10b65b31c7e6486 100644 (file)
--- a/WebKit/WebView/WebFrame.m
+++ b/WebKit/WebView/WebFrame.m
@@ -169,12 +169,21 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     WebFrameLoader *frameLoader;
 
     WebFrameBridge *bridge;
-    WebFrameLoadType loadType;
     WebHistoryItem *currentItem;        // BF item for our current content
     WebHistoryItem *provisionalItem;    // BF item for where we're trying to go
                                         // (only known when navigating to a pre-existing BF item)
     WebHistoryItem *previousItem;       // BF item for previous content, see _itemForSavingDocState
 
+    WebScriptDebugger *scriptDebugger;
+    id internalLoadDelegate;
+    
+    NSMutableSet *plugInViews;
+    NSMutableSet *inspectors;
+    
+    // things below here should be moved
+    
+    WebFrameLoadType loadType;
+
     WebPolicyDecisionListener *listener;
     // state we'll need to continue after waiting for the policy delegate's decision
     NSURLRequest *policyRequest;
@@ -192,14 +201,6 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     BOOL delegateIsDecidingNavigationPolicy;
     BOOL delegateIsHandlingUnimplementablePolicy;
     BOOL firstLayoutDone;
-    
-    id internalLoadDelegate;
-    WebScriptDebugger *scriptDebugger;
-
-    NSString *frameNamespace;
-    
-    NSMutableSet *plugInViews;
-    NSMutableSet *inspectors;
 }
 
 - (void)setWebFrameView:(WebFrameView *)v;
@@ -248,7 +249,6 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     ASSERT(policyFrameName == nil);
     ASSERT(policyTarget == nil);
     ASSERT(policyFormState == nil);
-    ASSERT(frameNamespace == nil);
     ASSERT(plugInViews == nil);
     
     [super dealloc];