[webkit-changes] cvs commit: WebKit/WebView.subproj WebView.m WebViewPrivate.h

[Maciej]

mjs         05/12/13 22:16:48

  Modified:    .        ChangeLog
               WebView.subproj WebView.m WebViewPrivate.h
  Log:
          Reviewed by Darin.
  
  	- remove the dead _frameForDataSource: method (WebDataSource now knows its WebFrame)
  	http://bugzilla.opendarwin.org/show_bug.cgi?id=6072
  
          * WebView.subproj/WebView.m:
          * WebView.subproj/WebViewPrivate.h:
  
  Revision  Changes    Path
  1.3403    +10 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3402
  retrieving revision 1.3403
  diff -u -r1.3402 -r1.3403
  --- ChangeLog	14 Dec 2005 01:14:14 -0000	1.3402
  +++ ChangeLog	14 Dec 2005 06:16:43 -0000	1.3403
  @@ -1,3 +1,13 @@
  +2005-12-13  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by Darin.
  +
  +	- remove the dead _frameForDataSource: method (WebDataSource now knows its WebFrame)
  +	http://bugzilla.opendarwin.org/show_bug.cgi?id=6072
  +	
  +        * WebView.subproj/WebView.m:
  +        * WebView.subproj/WebViewPrivate.h:
  +
   === Safari-521~5 ===
   
   2005-12-12  Timothy Hatcher  <timothy at apple.com>
  
  
  
  1.317     +0 -35     WebKit/WebView.subproj/WebView.m
  
  Index: WebView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
  retrieving revision 1.316
  retrieving revision 1.317
  diff -u -r1.316 -r1.317
  --- WebView.m	10 Dec 2005 20:40:35 -0000	1.316
  +++ WebView.m	14 Dec 2005 06:16:47 -0000	1.317
  @@ -885,41 +885,6 @@
       return _private->scriptDebugDelegateForwarder;
   }
   
  -- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
  -{
  -    NSArray *frames;
  -    int i, count;
  -    WebFrame *result, *aFrame;
  -
  -    if ([frame dataSource] == dataSource)
  -        return frame;
  -
  -    if ([frame provisionalDataSource] == dataSource)
  -        return frame;
  -
  -    // It's safe to use the internal version because we know this
  -    // function will not change the set of frames
  -    frames = [frame _internalChildFrames];
  -    count = [frames count];
  -    for (i = 0; i < count; i++){
  -        aFrame = [frames objectAtIndex: i];
  -        result = [self _frameForDataSource: dataSource fromFrame: aFrame];
  -        if (result)
  -            return result;
  -    }
  -
  -    return nil;
  -}
  -
  -
  -- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource
  -{
  -    WebFrame *frame = [self mainFrame];
  -
  -    return [self _frameForDataSource: dataSource fromFrame: frame];
  -}
  -
  -
   - (WebFrame *)_frameForView: (WebFrameView *)aView fromFrame: (WebFrame *)frame
   {
       NSArray *frames;
  
  
  
  1.151     +1 -18     WebKit/WebView.subproj/WebViewPrivate.h
  
  Index: WebViewPrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebViewPrivate.h,v
  retrieving revision 1.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- WebViewPrivate.h	19 Nov 2005 01:27:06 -0000	1.150
  +++ WebViewPrivate.h	14 Dec 2005 06:16:48 -0000	1.151
  @@ -140,24 +140,7 @@
   */
   + (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
   
  -/*!
  -    @method frameForDataSource:
  -    @abstract Return the frame associated with the data source.
  -    @discussion Traverses the frame tree to find the frame associated
  -    with a datasource.
  -    @param datasource The datasource to  match against each frame.
  -    @result The frame that has the associated datasource.
  -*/
  -- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource;
  -
  -    /*!
  -            @method frameForView:
  -     @abstract Return the frame associated with the view.
  -     @discussion Traverses the frame tree to find the view.
  -     @param aView The view to match against each frame.
  -     @result The frame that has the associated view.
  -     */
  -- (WebFrame *)_frameForView: (WebFrameView *)aView;
  +- (WebFrame *)_frameForView:(WebFrameView *)view;
   
   - (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;