[webkit-changes] cvs commit: WebCore/khtml/editing markup.cpp

[Adele]

adele       05/08/27 10:41:47

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/editing Tag: Safari-2-0-branch markup.cpp
  Log:
          Fixing merge error.
  
          * khtml/editing/markup.cpp:
          (khtml::startMarkup):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.12  +7 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- ChangeLog	27 Aug 2005 17:10:26 -0000	1.1.2.11
  +++ ChangeLog	27 Aug 2005 17:41:46 -0000	1.1.2.12
  @@ -1,5 +1,12 @@
   2005-08-27  Adele Peterson  <adele at apple.com>
   
  +        Fixing merge error.
  +
  +        * khtml/editing/markup.cpp:
  +        (khtml::startMarkup):
  +
  +2005-08-27  Adele Peterson  <adele at apple.com>
  +
           Merged fix from TOT to Safari-2-0-branch.
   
           * khtml/editing/htmlediting.cpp:  ReplaceSelectionCommand changes are made here. 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.17.8.4  +0 -1      WebCore/khtml/editing/markup.cpp
  
  Index: markup.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/editing/markup.cpp,v
  retrieving revision 1.17.8.3
  retrieving revision 1.17.8.4
  diff -u -r1.17.8.3 -r1.17.8.4
  --- markup.cpp	27 Aug 2005 17:10:27 -0000	1.17.8.3
  +++ markup.cpp	27 Aug 2005 17:41:46 -0000	1.17.8.4
  @@ -189,7 +189,6 @@
               if (defaultStyle) {
                   NodeImpl *element = node->parentNode();
                   if (element) {
  -                    CSSMutableStyleDeclarationImpl *style = Position(element, 0).computedStyle()->copyInheritableProperties();
                       CSSComputedStyleDeclarationImpl *computedStyle = Position(element, 0).computedStyle();
                       computedStyle->ref();
                       CSSMutableStyleDeclarationImpl *style = computedStyle->copyInheritableProperties();