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

[Timothy]

thatcher    05/10/11 18:00:29

  Modified:    .        ChangeLog
               WebView.subproj WebHTMLView.m
  Log:
          Reviewed by Darin.
  
          Test for 10.4 because of <rdar://problem/4243463>
  
          * WebView.subproj/WebHTMLView.m:
          (-[WebHTMLView conversationIdentifier]):
  
  Revision  Changes    Path
  1.3348    +9 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3347
  retrieving revision 1.3348
  diff -u -r1.3347 -r1.3348
  --- ChangeLog	11 Oct 2005 22:37:43 -0000	1.3347
  +++ ChangeLog	12 Oct 2005 01:00:20 -0000	1.3348
  @@ -1,3 +1,12 @@
  +2005-10-11  Timothy Hatcher  <timothy at apple.com>
  +
  +        Reviewed by Darin.
  +        
  +        Test for 10.4 because of <rdar://problem/4243463>
  +
  +        * WebView.subproj/WebHTMLView.m:
  +        (-[WebHTMLView conversationIdentifier]):
  +
   2005-10-11  Adele Peterson  <adele at apple.com>
   
           Rolling out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195
  
  
  
  1.475     +8 -0      WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.474
  retrieving revision 1.475
  diff -u -r1.474 -r1.475
  --- WebHTMLView.m	11 Oct 2005 22:37:52 -0000	1.474
  +++ WebHTMLView.m	12 Oct 2005 01:00:28 -0000	1.475
  @@ -4940,10 +4940,18 @@
       return nil;
   }
   
  +// test for 10.4 because of <rdar://problem/4243463>
  +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
   - (long)conversationIdentifier
   {
       return (long)self;
   }
  +#else
  +- (NSInt)conversationIdentifier
  +{
  +    return (NSInt)self;
  +}
  +#endif
   
   - (BOOL)hasMarkedText
   {