[webkit-changes] cvs commit: WebCore/kwq DOM-CSS.mm DOM.mm

[Darin]

darin       05/11/29 09:28:35

  Modified:    .        ChangeLog
               kwq      DOM-CSS.mm DOM.mm
  Log:
          Reviewed by Maciej.
  
          - fixed <rdar://problem/4089752> Duplicate method implementation for -[DOMDocument getComputedStyle::]
            also http://bugzilla.opendarwin.org/show_bug.cgi?5682
  
          * kwq/DOM.mm: Removed extra implementation of -[DOMDocument getComputedStyle::].
          * kwq/DOM-CSS.mm: (-[DOMDocument getComputedStyle::]): Copied slightly better implementation from
          DOM.mm in here.
  
  Revision  Changes    Path
  1.426     +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.425
  retrieving revision 1.426
  diff -u -r1.425 -r1.426
  --- ChangeLog	29 Nov 2005 17:22:12 -0000	1.425
  +++ ChangeLog	29 Nov 2005 17:28:29 -0000	1.426
  @@ -1,5 +1,16 @@
   2005-11-29  Darin Adler  <darin at apple.com>
   
  +        Reviewed by Maciej.
  +
  +        - fixed <rdar://problem/4089752> Duplicate method implementation for -[DOMDocument getComputedStyle::]
  +          also http://bugzilla.opendarwin.org/show_bug.cgi?5682
  +
  +        * kwq/DOM.mm: Removed extra implementation of -[DOMDocument getComputedStyle::].
  +        * kwq/DOM-CSS.mm: (-[DOMDocument getComputedStyle::]): Copied slightly better implementation from
  +        DOM.mm in here.
  +
  +2005-11-29  Darin Adler  <darin at apple.com>
  +
           Reviewed by Eric.
   
           - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5681
  
  
  
  1.32      +3 -2      WebCore/kwq/DOM-CSS.mm
  
  Index: DOM-CSS.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/DOM-CSS.mm,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DOM-CSS.mm	20 Nov 2005 21:34:15 -0000	1.31
  +++ DOM-CSS.mm	29 Nov 2005 17:28:34 -0000	1.32
  @@ -2534,8 +2534,9 @@
   
   - (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
   {
  -    return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:
  -        AbstractViewImpl([self _documentImpl]).getComputedStyle([elt _elementImpl], DOMString(pseudoElt).impl())];
  +    ElementImpl *elementImpl = [elt _elementImpl];
  +    DOMString pseudoEltString(pseudoElt);
  +    return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->defaultView()->getComputedStyle(elementImpl, pseudoEltString.impl())];
   }
   
   @end
  
  
  
  1.61      +0 -7      WebCore/kwq/DOM.mm
  
  Index: DOM.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- DOM.mm	23 Nov 2005 09:46:57 -0000	1.60
  +++ DOM.mm	29 Nov 2005 17:28:34 -0000	1.61
  @@ -1122,13 +1122,6 @@
   
   @implementation DOMDocument (DOMDocumentCSS)
   
  -- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
  -{
  -    ElementImpl *elementImpl = [elt _elementImpl];
  -    DOMString pseudoEltString(pseudoElt);
  -    return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->defaultView()->getComputedStyle(elementImpl, pseudoEltString.impl())];
  -}
  -
   - (DOMCSSStyleDeclaration *)getOverrideStyle:(DOMElement *)elt :(NSString *)pseudoElt
   {
       ElementImpl *elementImpl = [elt _elementImpl];