[webkit-changes] cvs commit: WebCore/kwq WebCoreBridge.h WebCoreBridge.mm

[Timothy]

thatcher    05/09/16 12:28:10

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch WebCoreBridge.h
                        WebCoreBridge.mm
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      2005-09-14  Justin Garcia  <justin.garcia at apple.com>
  
          Reviewed by john
  
          Test cases added: none, method rename
  
          Part of fix for <rdar://problem/4237479> REGRESSION (Cambridge-Denver): old QuickTime movie continues to play sound after reload
  
          * kwq/WebCoreBridge.h:
          * kwq/WebCoreBridge.mm:
          (-[WebCoreBridge handleFallbackContent]):
          Renamed bridge method mainResourceError to handleFallbackContent, since there are some
          main resource errors for which we should not render fallback content.  E.G user cancels
          and the cancel we do to prevent loading plugin content twice (see <rdar://problem/4258008>)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.28  +19 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.27
  retrieving revision 1.1.2.28
  diff -u -r1.1.2.27 -r1.1.2.28
  --- ChangeLog	16 Sep 2005 18:18:32 -0000	1.1.2.27
  +++ ChangeLog	16 Sep 2005 19:28:08 -0000	1.1.2.28
  @@ -2,6 +2,25 @@
   
           Merged fix from TOT to Safari-2-0-branch
   
  +    2005-09-14  Justin Garcia  <justin.garcia at apple.com>
  +
  +        Reviewed by john
  +        
  +        Test cases added: none, method rename
  +        
  +        Part of fix for <rdar://problem/4237479> REGRESSION (Cambridge-Denver): old QuickTime movie continues to play sound after reload
  +
  +        * kwq/WebCoreBridge.h:
  +        * kwq/WebCoreBridge.mm:
  +        (-[WebCoreBridge handleFallbackContent]):
  +        Renamed bridge method mainResourceError to handleFallbackContent, since there are some 
  +        main resource errors for which we should not render fallback content.  E.G user cancels 
  +        and the cancel we do to prevent loading plugin content twice (see <rdar://problem/4258008>)
  +
  +2005-09-16  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
       2005-09-14 Vicki Murley  <vicki at apple.com>
   
           Reviewed by Dave Hyatt.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.327.8.6 +1 -1      WebCore/kwq/WebCoreBridge.h
  
  Index: WebCoreBridge.h
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.h,v
  retrieving revision 1.327.8.5
  retrieving revision 1.327.8.6
  diff -u -r1.327.8.5 -r1.327.8.6
  --- WebCoreBridge.h	9 Aug 2005 23:52:19 -0000	1.327.8.5
  +++ WebCoreBridge.h	16 Sep 2005 19:28:09 -0000	1.327.8.6
  @@ -226,7 +226,7 @@
   - (void)end;
   - (void)stop;
   
  -- (void)mainResourceError;
  +- (void)handleFallbackContent;
   
   - (NSURL *)URL;
   - (NSURL *)baseURL;
  
  
  
  1.382.2.9 +1 -1      WebCore/kwq/WebCoreBridge.mm
  
  Index: WebCoreBridge.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/WebCoreBridge.mm,v
  retrieving revision 1.382.2.8
  retrieving revision 1.382.2.9
  diff -u -r1.382.2.8 -r1.382.2.9
  --- WebCoreBridge.mm	16 Sep 2005 02:34:18 -0000	1.382.2.8
  +++ WebCoreBridge.mm	16 Sep 2005 19:28:09 -0000	1.382.2.9
  @@ -511,7 +511,7 @@
       _part->stop();
   }
   
  -- (void)mainResourceError
  +- (void)handleFallbackContent
   {
       _part->handleFallbackContent();
   }