[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_dom.cpp

[Darin]

darin       05/11/29 08:15:02

  Modified:    .        ChangeLog
               khtml/ecma kjs_dom.cpp
  Log:
          - fixed deployment builds
  
          * khtml/ecma/kjs_dom.cpp: (KJS::DOMDocument::getValueProperty):
          Put decoder local variable inside if statement.
  
  Revision  Changes    Path
  1.421     +8 -5      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.420
  retrieving revision 1.421
  diff -u -r1.420 -r1.421
  --- ChangeLog	29 Nov 2005 11:20:36 -0000	1.420
  +++ ChangeLog	29 Nov 2005 16:14:57 -0000	1.421
  @@ -1,3 +1,10 @@
  +2005-11-29  Darin Adler  <darin at apple.com>
  +
  +        - fixed deployment builds
  +
  +        * khtml/ecma/kjs_dom.cpp: (KJS::DOMDocument::getValueProperty):
  +        Put decoder local variable inside if statement.
  +
   2005-11-29  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by mjs.
  @@ -69,10 +76,6 @@
           * khtml/ecma/kjs_dom.h:
           (KJS::DOMDocument::):
   
  -2005-11-28  Eric Seidel  <eseidel at apple.com>
  -
  -        * ChangeLog: added bug numbers for last two commits.
  -
   2005-11-28  Julien Palmas <julien.palmas at gmail.com>
   
           Reviewed by eseidel.  Committed by eseidel.
  @@ -126,7 +129,7 @@
           
           * khtml/editing/visible_position.cpp:
           (khtml::VisiblePosition::init):
  -        It's ok to do some hunting to find a valid VisblePosition given a position 
  +        It's ok to do some hunting to find a valid VisiblePosition given a position 
           that is not somewhere visible, like inside an empty div, but only leave the 
           block containing the position used to construct the VisiblePosition if we 
           can't find a VisiblePosition inside that block.
  
  
  
  1.114     +8 -9      WebCore/khtml/ecma/kjs_dom.cpp
  
  Index: kjs_dom.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- kjs_dom.cpp	29 Nov 2005 09:07:57 -0000	1.113
  +++ kjs_dom.cpp	29 Nov 2005 16:15:01 -0000	1.114
  @@ -78,7 +78,7 @@
   using DOM::ProcessingInstructionImpl;
   using DOM::TextImpl;
   
  -using khtml::RenderObject;
  +using namespace khtml;
   
   #include "kjs_dom.lut.h"
   
  @@ -403,7 +403,7 @@
         docimpl->updateLayoutIgnorePendingStylesheets();
       }
   
  -    khtml::RenderObject *rend = node.renderer();
  +    RenderObject *rend = node.renderer();
   
       switch (token) {
       case OffsetLeft:
  @@ -415,7 +415,7 @@
       case OffsetHeight:
         return rend ? jsNumber(rend->offsetHeight()) : static_cast<ValueImp *>(jsUndefined());
       case OffsetParent: {
  -      khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
  +      RenderObject* par = rend ? rend->offsetParent() : 0;
         return getDOMNode(exec, par ? par->element() : 0);
       }
       case ClientWidth:
  @@ -589,13 +589,13 @@
       setListener(exec,scrollEvent,value);
       break;
     case ScrollTop: {
  -    khtml::RenderObject *rend = node.renderer();
  +    RenderObject *rend = node.renderer();
       if (rend && rend->hasOverflowClip())
           rend->layer()->scrollToYOffset(value->toInt32(exec));
       break;
     }
     case ScrollLeft: {
  -    khtml::RenderObject *rend = node.renderer();
  +    RenderObject *rend = node.renderer();
       if (rend && rend->hasOverflowClip())
         rend->layer()->scrollToXOffset(value->toInt32(exec));
       break;
  @@ -969,9 +969,8 @@
     case CharacterSet:
     case ActualEncoding:
     case InputEncoding:
  -    khtml::Decoder* decoder = doc.decoder();
  -    if (decoder)
  -      return String(doc.decoder()->encoding());
  +    if (Decoder* decoder = doc.decoder())
  +      return String(decoder->encoding());
       return Null();
     case DefaultCharset:
       if (KHTMLPart* part = doc.part())
  @@ -1017,7 +1016,7 @@
         doc.setSelectedStylesheetSet(value->toString(exec).domString());
         break;
       case Charset:
  -      doc.decoder()->setEncoding(value->toString(exec).cstring().c_str(), khtml::Decoder::UserChosenEncoding);
  +      doc.decoder()->setEncoding(value->toString(exec).cstring().c_str(), Decoder::UserChosenEncoding);
         break;
     }
   }