2008-03-28 Brady Eidson <beidson@apple.com>

        Reviewed by Sam Weinig

        Fold [WebArchiver archiveFrame:] into WebDataSource - the last remaining caller

        * WebView/WebArchiver.h:
        * WebView/WebArchiver.mm:
        * WebView/WebDataSource.mm:
        (-[WebDataSource webArchive]):



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

WebKit/mac/ChangeLog

+2008-03-28  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig
+
+        Fold [WebArchiver archiveFrame:] into WebDataSource - the last remaining caller
+
+        * WebView/WebArchiver.h:
+        * WebView/WebArchiver.mm:
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource webArchive]):
+
 2008-03-28  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Sam Weinig

WebKit/mac/WebView/WebArchiver.h

@@ -39,6 +39,5 @@
 
 + (WebArchive *)archiveRange:(DOMRange *)range;
 + (WebArchive *)archiveSelectionInFrame:(WebFrame *)frame;
-+ (WebArchive *)archiveFrame:(WebFrame *)frame;
 
 @end

WebKit/mac/WebView/WebArchiver.mm

@@ -47,11 +47,6 @@ using namespace WebCore;
 
 @implementation WebArchiver
 
-+ (WebArchive *)archiveFrame:(WebFrame *)frame;
-{
-    return [[[WebArchive alloc] _initWithCoreLegacyWebArchive:LegacyWebArchive::create(core(frame))] autorelease];
-}
-
 + (WebArchive *)_archiveWithMarkupString:(NSString *)markupString fromFrame:(WebFrame *)frame nodes:(NSArray *)nodes
 { 
     Vector<Node*> coreNodes;

WebKit/mac/WebView/WebDataSource.mm

@@ -448,7 +448,8 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
     // it makes no sense to grab a WebArchive from an uncommitted document.
     if (!_private->loader->isCommitted())
         return nil;
-    return [WebArchiver archiveFrame:[self webFrame]];
+        
+    return [[[WebArchive alloc] _initWithCoreLegacyWebArchive:LegacyWebArchive::create(core([self webFrame]))] autorelease];
 }
 
 - (WebResource *)mainResource