[webkit-changes] cvs commit: WebCore/khtml/rendering bidi.cpp render_layer.cpp

[David]

harrison    05/10/06 11:37:42

  Modified:    .        ChangeLog
               khtml/rendering bidi.cpp render_layer.cpp
  Log:
          Reviewed by hyatt.
  
          No test cases added or changed because this patch does not address a bug.
  
          Fix two detach/destroy renames I missed yesterday.
  
          * khtml/rendering/bidi.cpp:
          (khtml::BidiRun::destroy):
          (khtml::BidiRun::operator delete):
          Renamed inBidiRunDetach to inBidiRunDestroy.
  
          * khtml/rendering/render_layer.cpp:
          (khtml::RenderLayer::operator delete):
          (khtml::RenderLayer::destroy):
          Renamed inRenderLayerDetach to inRenderLayerDestroy.
  
  Revision  Changes    Path
  1.208     +18 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- ChangeLog	6 Oct 2005 15:45:49 -0000	1.207
  +++ ChangeLog	6 Oct 2005 18:37:38 -0000	1.208
  @@ -1,3 +1,21 @@
  +2005-10-06  David Harrison  <harrison at apple.com>
  +
  +        Reviewed by hyatt.
  +
  +        No test cases added or changed because this patch does not address a bug.
  +        
  +        Fix two detach/destroy renames I missed yesterday.
  +        
  +        * khtml/rendering/bidi.cpp:
  +        (khtml::BidiRun::destroy):
  +        (khtml::BidiRun::operator delete):
  +        Renamed inBidiRunDetach to inBidiRunDestroy.
  +        
  +        * khtml/rendering/render_layer.cpp:
  +        (khtml::RenderLayer::operator delete):
  +        (khtml::RenderLayer::destroy):
  +        Renamed inRenderLayerDetach to inRenderLayerDestroy.
  +
   2005-10-06  Darin Adler  <darin at apple.com>
   
           Reviewed by Hyatt.
  
  
  
  1.146     +4 -4      WebCore/khtml/rendering/bidi.cpp
  
  Index: bidi.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- bidi.cpp	6 Oct 2005 00:53:55 -0000	1.145
  +++ bidi.cpp	6 Oct 2005 18:37:42 -0000	1.146
  @@ -144,17 +144,17 @@
   }
   
   #ifndef NDEBUG
  -static bool inBidiRunDetach;
  +static bool inBidiRunDestroy;
   #endif
   
   void BidiRun::destroy(RenderArena* renderArena)
   {
   #ifndef NDEBUG
  -    inBidiRunDetach = true;
  +    inBidiRunDestroy = true;
   #endif
       delete this;
   #ifndef NDEBUG
  -    inBidiRunDetach = false;
  +    inBidiRunDestroy = false;
   #endif
   
       // Recover the size left there for us by operator delete and free the memory.
  @@ -168,7 +168,7 @@
   
   void BidiRun::operator delete(void* ptr, size_t sz)
   {
  -    assert(inBidiRunDetach);
  +    assert(inBidiRunDestroy);
   
       // Stash size where destroy() can find it.
       *(size_t*)ptr = sz;
  
  
  
  1.108     +4 -4      WebCore/khtml/rendering/render_layer.cpp
  
  Index: render_layer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- render_layer.cpp	6 Oct 2005 00:53:57 -0000	1.107
  +++ render_layer.cpp	6 Oct 2005 18:37:42 -0000	1.108
  @@ -77,7 +77,7 @@
   #endif
   
   #ifndef NDEBUG
  -static bool inRenderLayerDetach;
  +static bool inRenderLayerDestroy;
   #endif
   
   void* ClipRects::operator new(size_t sz, RenderArena* renderArena) throw()
  @@ -336,7 +336,7 @@
   
   void RenderLayer::operator delete(void* ptr, size_t sz)
   {
  -    assert(inRenderLayerDetach);
  +    assert(inRenderLayerDestroy);
       
       // Stash size where destroy can find it.
       *(size_t *)ptr = sz;
  @@ -345,11 +345,11 @@
   void RenderLayer::destroy(RenderArena* renderArena)
   {
   #ifndef NDEBUG
  -    inRenderLayerDetach = true;
  +    inRenderLayerDestroy = true;
   #endif
       delete this;
   #ifndef NDEBUG
  -    inRenderLayerDetach = false;
  +    inRenderLayerDestroy = false;
   #endif
       
       // Recover the size left there for us by operator delete and free the memory.