[webkit-changes] cvs commit: WebCore/khtml/xml dom_position.cpp

Adele adele at opensource.apple.com
Sun Aug 28 09:09:56 PDT 2005


adele       05/08/28 09:09:56

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebView.subproj Tag: Safari-2-0-branch
                        WebBaseResourceHandleDelegate.h
                        WebBaseResourceHandleDelegate.m
               .        Tag: Safari-2-0-branch ChangeLog
               khtml/xml Tag: Safari-2-0-branch dom_position.cpp
  Log:
  WebCore:
  
          Merged fix from TOT to Safari-2-0-branch to make debugging easier on the branch.
  
      2005-08-16  David Harrison  <harrison at apple.com>
  
          <rdar://problem/4119646> assertion failure in DOM::Position::upstream at babelfish.com
          <rdar://problem/4125949> Assertion failure clicking outside of textarea in page containing only textarea
  
          Removed asserts that did not account for iterating from a nested node to its parent.
  
          Test cases added: n/a for assert removal
  
          * khtml/xml/dom_position.cpp:
          (DOM::Position::upstream):
          (DOM::Position::downstream):
  
  WebKit:
  
          Merged fix from TOT to Safari-2-0-branch to make debugging on the branch easier.
  
      2005-05-09  Chris Blumenberg  <cblu at apple.com>
  
          Turned assertion into error message to prevent crash when encountering this bug:
          <rdar://problem/4067625> connection:willCacheResponse: is called inside of [NSURLConnection initWithRequest:delegate:]
  
          * WebView.subproj/WebBaseResourceHandleDelegate.h:
          * WebView.subproj/WebBaseResourceHandleDelegate.m:
          (-[WebBaseResourceHandleDelegate loadWithRequest:]): set flag to track when we're initializing the connection
          (-[WebBaseResourceHandleDelegate connection:willCacheResponse:]): log error
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.63 +14 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.62
  retrieving revision 1.3118.4.63
  diff -u -r1.3118.4.62 -r1.3118.4.63
  --- ChangeLog	27 Aug 2005 00:34:58 -0000	1.3118.4.62
  +++ ChangeLog	28 Aug 2005 16:09:50 -0000	1.3118.4.63
  @@ -1,3 +1,17 @@
  +2005-08-28  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch to make debugging on the branch easier.
  +
  +    2005-05-09  Chris Blumenberg  <cblu at apple.com>
  +
  +        Turned assertion into error message to prevent crash when encountering this bug:
  +        <rdar://problem/4067625> connection:willCacheResponse: is called inside of [NSURLConnection initWithRequest:delegate:]
  +
  +        * WebView.subproj/WebBaseResourceHandleDelegate.h:
  +        * WebView.subproj/WebBaseResourceHandleDelegate.m:
  +        (-[WebBaseResourceHandleDelegate loadWithRequest:]): set flag to track when we're initializing the connection
  +        (-[WebBaseResourceHandleDelegate connection:willCacheResponse:]): log error
  +
   2005-08-26  Adele Peterson  <adele at apple.com>
   
           Reviewed by Darin.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.38.10.3 +3 -0      WebKit/WebView.subproj/Attic/WebBaseResourceHandleDelegate.h
  
  Index: WebBaseResourceHandleDelegate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/Attic/WebBaseResourceHandleDelegate.h,v
  retrieving revision 1.38.10.2
  retrieving revision 1.38.10.3
  diff -u -r1.38.10.2 -r1.38.10.3
  --- WebBaseResourceHandleDelegate.h	2 Jul 2005 01:32:45 -0000	1.38.10.2
  +++ WebBaseResourceHandleDelegate.h	28 Aug 2005 16:09:54 -0000	1.38.10.3
  @@ -41,6 +41,9 @@
       NSURL *originalURL;
       NSMutableData *resourceData;
       WebResource *resource;
  +#ifndef NDEBUG
  +    BOOL isInitializingConnection;
  +#endif
   }
   
   - (BOOL)loadWithRequest:(NSURLRequest *)request;
  
  
  
  1.83.4.3  +11 -1     WebKit/WebView.subproj/Attic/WebBaseResourceHandleDelegate.m
  
  Index: WebBaseResourceHandleDelegate.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/Attic/WebBaseResourceHandleDelegate.m,v
  retrieving revision 1.83.4.2
  retrieving revision 1.83.4.3
  diff -u -r1.83.4.2 -r1.83.4.3
  --- WebBaseResourceHandleDelegate.m	2 Jul 2005 01:32:45 -0000	1.83.4.2
  +++ WebBaseResourceHandleDelegate.m	28 Aug 2005 16:09:54 -0000	1.83.4.3
  @@ -239,7 +239,13 @@
           }
       }
       
  +#ifndef NDEBUG
  +    isInitializingConnection = YES;
  +#endif
       connection = [[NSURLConnection alloc] initWithRequest:r delegate:self];
  +#ifndef NDEBUG
  +    isInitializingConnection = NO;
  +#endif
       if (defersCallbacks) {
           [connection setDefersCallbacks:YES];
       }
  @@ -631,7 +637,11 @@
   
   - (NSCachedURLResponse *)connection:(NSURLConnection *)con willCacheResponse:(NSCachedURLResponse *)cachedResponse
   {
  -    ASSERT(con == connection);
  +#ifndef NDEBUG
  +     if (connection == nil && isInitializingConnection) {
  +         ERROR("connection:willCacheResponse: was called inside of [NSURLConnection initWithRequest:delegate:] (40676250)");
  +     }
  +#endif
       
       ++inNSURLConnectionCallback;
       NSCachedURLResponse *result = [self willCacheResponse:cachedResponse];
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +17 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- ChangeLog	28 Aug 2005 05:01:21 -0000	1.1.2.13
  +++ ChangeLog	28 Aug 2005 16:09:55 -0000	1.1.2.14
  @@ -1,3 +1,20 @@
  +2005-08-28  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch to make debugging easier on the branch.
  +
  +    2005-08-16  David Harrison  <harrison at apple.com>
  +
  +        <rdar://problem/4119646> assertion failure in DOM::Position::upstream at babelfish.com
  +        <rdar://problem/4125949> Assertion failure clicking outside of textarea in page containing only textarea
  +
  +        Removed asserts that did not account for iterating from a nested node to its parent.
  +
  +        Test cases added: n/a for assert removal
  +
  +        * khtml/xml/dom_position.cpp:
  +        (DOM::Position::upstream):
  +        (DOM::Position::downstream):
  +
   2005-08-27  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.65.8.3  +2 -2      WebCore/khtml/xml/dom_position.cpp
  
  Index: dom_position.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_position.cpp,v
  retrieving revision 1.65.8.2
  retrieving revision 1.65.8.3
  diff -u -r1.65.8.2 -r1.65.8.3
  --- dom_position.cpp	26 Jul 2005 22:45:33 -0000	1.65.8.2
  +++ dom_position.cpp	28 Aug 2005 16:09:55 -0000	1.65.8.3
  @@ -383,7 +383,7 @@
   
               // we could not have iterated here because we would have returned
               // this node, caretMaxOffset, so we must have started here
  -            assert(currentPos == start);
  +//            assert(currentPos == start);
               continue;
           }
   
  @@ -495,7 +495,7 @@
               
               // we could not have iterated here because we would have returned
               // this node, offset 0, so we must have started here
  -            assert(currentPos == start);
  +//            assert(currentPos == start);
               continue;
           }
   
  
  
  



More information about the webkit-changes mailing list