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

[Adele]

adele       05/08/24 23:33:59

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebView.subproj Tag: Safari-2-0-branch WebView.h WebView.m
                        WebViewPrivate.h
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-08-22  Geoffrey Garen  <ggaren at apple.com>
  
          - fixed <rdar://problem/4227011> Debugger SPI should be removed from WebView.h API
  
          Reviewed by mjs and adele.
  
          Cut and pasted debugging SPI from WebView to WebView(WebPendingPublic)
  
          * WebView.subproj/WebView.h:
          * WebView.subproj/WebView.m:
          (-[WebView setScriptDebugDelegate:]):
          (-[WebView scriptDebugDelegate]):
          * WebView.subproj/WebViewPrivate.h:
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.54 +18 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.53
  retrieving revision 1.3118.4.54
  diff -u -r1.3118.4.53 -r1.3118.4.54
  --- ChangeLog	24 Aug 2005 18:16:08 -0000	1.3118.4.53
  +++ ChangeLog	25 Aug 2005 06:33:54 -0000	1.3118.4.54
  @@ -2,6 +2,24 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-08-22  Geoffrey Garen  <ggaren at apple.com>
  +
  +        - fixed <rdar://problem/4227011> Debugger SPI should be removed from WebView.h API
  +
  +        Reviewed by mjs and adele.
  +
  +        Cut and pasted debugging SPI from WebView to WebView(WebPendingPublic)
  +
  +        * WebView.subproj/WebView.h:
  +        * WebView.subproj/WebView.m:
  +        (-[WebView setScriptDebugDelegate:]):
  +        (-[WebView scriptDebugDelegate]):
  +        * WebView.subproj/WebViewPrivate.h:
  +
  +2005-08-24  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-08-23  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Beth Dakin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.158.12.2 +0 -14     WebKit/WebView.subproj/WebView.h
  
  Index: WebView.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebView.h,v
  retrieving revision 1.158.12.1
  retrieving revision 1.158.12.2
  diff -u -r1.158.12.1 -r1.158.12.2
  --- WebView.h	2 Aug 2005 22:50:28 -0000	1.158.12.1
  +++ WebView.h	25 Aug 2005 06:33:58 -0000	1.158.12.2
  @@ -228,20 +228,6 @@
   - (id)policyDelegate;
   
   /*!
  -    @method setScriptDebugDelegate:
  -    @abstract Set the WebView's WebScriptDebugDelegate delegate.
  -    @param delegate The WebScriptDebugDelegate to set as the delegate.
  -*/    
  -- (void)setScriptDebugDelegate:(id)delegate;
  -
  -/*!
  -    @method scriptDebugDelegate
  -    @abstract Return the WebView's WebScriptDebugDelegate.
  -    @result The WebView's WebScriptDebugDelegate.
  -*/    
  -- (id)scriptDebugDelegate;
  -
  -/*!
       @method mainFrame
       @abstract Return the top level frame.  
       @discussion Note that even document that are not framesets will have a
  
  
  
  1.274.8.5 +12 -12    WebKit/WebView.subproj/WebView.m
  
  Index: WebView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
  retrieving revision 1.274.8.4
  retrieving revision 1.274.8.5
  diff -u -r1.274.8.4 -r1.274.8.5
  --- WebView.m	2 Aug 2005 22:50:28 -0000	1.274.8.4
  +++ WebView.m	25 Aug 2005 06:33:58 -0000	1.274.8.5
  @@ -1764,18 +1764,6 @@
   {
       return _private->frameLoadDelegate;
   }
  -- (void)setScriptDebugDelegate:delegate
  -{
  -    _private->scriptDebugDelegate = delegate;
  -    [_private->scriptDebugDelegateForwarder release];
  -    _private->scriptDebugDelegateForwarder = nil;
  -}
  -
  -- scriptDebugDelegate
  -{
  -    return _private->scriptDebugDelegate;
  -}
  -
   
   - (WebFrame *)mainFrame
   {
  @@ -2533,6 +2521,18 @@
       }
   }
   
  +- (void)setScriptDebugDelegate:delegate
  +{
  +    _private->scriptDebugDelegate = delegate;
  +    [_private->scriptDebugDelegateForwarder release];
  +    _private->scriptDebugDelegateForwarder = nil;
  +}
  +
  +- scriptDebugDelegate
  +{
  +    return _private->scriptDebugDelegate;
  +}
  +
   @end
   
   @implementation WebView (WebViewPrintingPrivate)
  
  
  
  1.138.8.3 +14 -0     WebKit/WebView.subproj/WebViewPrivate.h
  
  Index: WebViewPrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebViewPrivate.h,v
  retrieving revision 1.138.8.2
  retrieving revision 1.138.8.3
  diff -u -r1.138.8.2 -r1.138.8.3
  --- WebViewPrivate.h	24 Aug 2005 00:45:17 -0000	1.138.8.2
  +++ WebViewPrivate.h	25 Aug 2005 06:33:59 -0000	1.138.8.3
  @@ -58,6 +58,20 @@
   
   - (void)toggleSmartInsertDelete:(id)sender;
   
  +/*!
  + at method setScriptDebugDelegate:
  + at abstract Set the WebView's WebScriptDebugDelegate delegate.
  + at param delegate The WebScriptDebugDelegate to set as the delegate.
  +*/    
  +- (void)setScriptDebugDelegate:(id)delegate;
  +
  +/*!
  + at method scriptDebugDelegate
  + at abstract Return the WebView's WebScriptDebugDelegate.
  + at result The WebView's WebScriptDebugDelegate.
  +*/    
  +- (id)scriptDebugDelegate;
  +
   @end
   
   @interface WebView (WebPrivate)