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

[Adele]

adele       05/10/11 15:37:53

  Modified:    .        ChangeLog
               WebView.subproj WebHTMLView.m
  Log:
          Rolling out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195
          since it caused:
  
          REGRESSION text areas draw focus ring around each glyph, no caret in text fields
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5335
  
          * WebView.subproj/WebHTMLView.m:
          (-[WebHTMLView _propagateDirtyRectsToOpaqueAncestors]):
          (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
          (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
  
  Revision  Changes    Path
  1.3347    +13 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3346
  retrieving revision 1.3347
  diff -u -r1.3346 -r1.3347
  --- ChangeLog	10 Oct 2005 01:28:56 -0000	1.3346
  +++ ChangeLog	11 Oct 2005 22:37:43 -0000	1.3347
  @@ -1,3 +1,16 @@
  +2005-10-11  Adele Peterson  <adele at apple.com>
  +
  +        Rolling out fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5195
  +        since it caused:
  +
  +        REGRESSION text areas draw focus ring around each glyph, no caret in text fields
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5335
  +
  +        * WebView.subproj/WebHTMLView.m:
  +        (-[WebHTMLView _propagateDirtyRectsToOpaqueAncestors]):
  +        (-[WebHTMLView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:]):
  +        (-[WebHTMLView _recursiveDisplayAllDirtyWithLockFocus:visRect:]):
  +
   2005-10-09  Darin Adler  <darin at apple.com>
   
           Reviewed by Maciej.
  
  
  
  1.474     +14 -38    WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.473
  retrieving revision 1.474
  diff -u -r1.473 -r1.474
  --- WebHTMLView.m	10 Oct 2005 01:28:59 -0000	1.473
  +++ WebHTMLView.m	11 Oct 2005 22:37:52 -0000	1.474
  @@ -92,7 +92,6 @@
   @interface NSView (AppKitSecretsIKnowAbout)
   - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
   - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
  -- (void)_recursiveDisplayRectIgnoringOpacity:(NSRect)rect inContext:(NSGraphicsContext *)context topView:(BOOL)topView;
   - (NSRect)_dirtyRect;
   - (void)_setDrawsOwnDescendants:(BOOL)drawsOwnDescendants;
   - (void)_propagateDirtyRectsToOpaqueAncestors;
  @@ -724,8 +723,9 @@
   // need to be redrawn (in case the layout causes some things to get dirtied).
   - (void)_propagateDirtyRectsToOpaqueAncestors
   {
  -    if (![[self _webView] drawsBackground])
  +    if (![[self _webView] drawsBackground]) {
           [self _web_layoutIfNeededRecursive];
  +    }
       [super _propagateDirtyRectsToOpaqueAncestors];
   }
   
  @@ -737,10 +737,11 @@
       BOOL wasInPrintingMode = _private->printing;
       BOOL isPrinting = ![NSGraphicsContext currentContextDrawingToScreen];
       if (wasInPrintingMode != isPrinting) {
  -        if (isPrinting)
  +        if (isPrinting) {
               [self _web_setPrintingModeRecursive];
  -        else
  +        } else {
               [self _web_clearPrintingModeRecursive];
  +        }
       }
   
       [self _web_layoutIfNeededRecursive: rect testDirtyRect:YES];
  @@ -752,10 +753,11 @@
       [self _restoreSubviews];
   
       if (wasInPrintingMode != isPrinting) {
  -        if (wasInPrintingMode)
  +        if (wasInPrintingMode) {
               [self _web_setPrintingModeRecursive];
  -        else
  +        } else {
               [self _web_clearPrintingModeRecursive];
  +        }
       }
   }
   
  @@ -771,10 +773,11 @@
           // This helps when we print as part of a larger print process.
           // If the WebHTMLView itself is what we're printing, then we will never have to do this.
           if (wasInPrintingMode != isPrinting) {
  -            if (isPrinting)
  +            if (isPrinting) {
                   [self _web_setPrintingModeRecursive];
  -            else
  +            } else {
                   [self _web_clearPrintingModeRecursive];
  +            }
           }
   
           NSRect boundsBeforeLayout = [self bounds];
  @@ -795,44 +798,17 @@
       
       if (needToSetAsideSubviews) {
           if (wasInPrintingMode != isPrinting) {
  -            if (wasInPrintingMode)
  +            if (wasInPrintingMode) {
                   [self _web_setPrintingModeRecursive];
  -            else
  +            } else {
                   [self _web_clearPrintingModeRecursive];
  +            }
           }
   
           [self _restoreSubviews];
       }
   }
   
  -// Don't let AppKit even draw subviews. We take care of that.
  -- (void)_recursiveDisplayRectIgnoringOpacity:(NSRect)rect inContext:(NSGraphicsContext *)context topView:(BOOL)topView
  -{
  -    // This helps when we print as part of a larger print process.
  -    // If the WebHTMLView itself is what we're printing, then we will never have to do this.
  -    BOOL wasInPrintingMode = _private->printing;
  -    BOOL isPrinting = ![context isDrawingToScreen];
  -    if (wasInPrintingMode != isPrinting) {
  -        if (isPrinting)
  -            [self _web_setPrintingModeRecursive];
  -        else
  -            [self _web_clearPrintingModeRecursive];
  -    }
  -
  -    [self _web_layoutIfNeededRecursive:rect testDirtyRect:NO];
  -
  -    [self _setAsideSubviews];
  -    [super _recursiveDisplayRectIgnoringOpacity:rect inContext:context topView:topView];
  -    [self _restoreSubviews];
  -
  -    if (wasInPrintingMode != isPrinting) {
  -        if (wasInPrintingMode)
  -            [self _web_setPrintingModeRecursive];
  -        else
  -            [self _web_clearPrintingModeRecursive];
  -    }
  -}
  -
   - (BOOL)_insideAnotherHTMLView
   {
       NSView *view = self;