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

[Eric]

eseidel     05/10/03 23:11:36

  Modified:    .        ChangeLog
               khtml/ecma kjs_views.cpp kjs_views.h
  Log:
  Bug #: 4233538
  Submitted by: eseidel
  Reviewed by: mjs
          Fixed AbstractView toString(), by giving it a prototype.
          <rdar://problem/4233558> toString on event.view Object fails with "No Default Value" in console
  
          * khtml/ecma/kjs_views.cpp:
          (KJS::DOMAbstractView::DOMAbstractView): sets prototype
          (KJS::DOMAbstractView::getOwnPropertySlot): now getStaticValue
          (KJS::DOMAbstractViewProtoFunc::callAsFunction): renamed
          * khtml/ecma/kjs_views.h:
  
  Revision  Changes    Path
  1.194     +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.193
  retrieving revision 1.194
  diff -u -r1.193 -r1.194
  --- ChangeLog	4 Oct 2005 05:42:32 -0000	1.193
  +++ ChangeLog	4 Oct 2005 06:11:33 -0000	1.194
  @@ -1,3 +1,16 @@
  +2005-10-03  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by mjs.
  +
  +        Fixed AbstractView toString(), by giving it a prototype.
  +        <rdar://problem/4233558> toString on event.view Object fails with "No Default Value" in console
  +
  +        * khtml/ecma/kjs_views.cpp:
  +        (KJS::DOMAbstractView::DOMAbstractView): sets prototype
  +        (KJS::DOMAbstractView::getOwnPropertySlot): now getStaticValue
  +        (KJS::DOMAbstractViewProtoFunc::callAsFunction): renamed
  +        * khtml/ecma/kjs_views.h:
  +
   2005-10-03  David Hyatt  <hyatt at apple.com>
   
   	Fix regression caused by variable->auto change.  Accidentally removed a line of code from calcWidthUsing.
  
  
  
  1.15      +14 -3     WebCore/khtml/ecma/kjs_views.cpp
  
  Index: kjs_views.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.cpp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- kjs_views.cpp	3 Oct 2005 21:12:14 -0000	1.14
  +++ kjs_views.cpp	4 Oct 2005 06:11:35 -0000	1.15
  @@ -44,10 +44,21 @@
   /*
   @begin DOMAbstractViewTable 2
     document		DOMAbstractView::Document		DontDelete|ReadOnly
  + at end
  + at begin DOMAbstractViewProtoTable 1
     getComputedStyle	DOMAbstractView::GetComputedStyle	DontDelete|Function 2
   @end
   */
  -IMPLEMENT_PROTOFUNC(DOMAbstractViewFunc)
  +
  +DEFINE_PROTOTYPE("DOMAbstractView",DOMAbstractViewProto)
  +IMPLEMENT_PROTOFUNC(DOMAbstractViewProtoFunc)
  +IMPLEMENT_PROTOTYPE(DOMAbstractViewProto,DOMAbstractViewProtoFunc)
  +
  +DOMAbstractView::DOMAbstractView(ExecState *exec, AbstractViewImpl *av)
  +  : m_impl(av)
  +{
  +  setPrototype(DOMAbstractViewProto::self(exec));
  +}
   
   DOMAbstractView::~DOMAbstractView()
   {
  @@ -62,10 +73,10 @@
   
   bool DOMAbstractView::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
   {
  -    return getStaticPropertySlot<DOMAbstractViewFunc, DOMAbstractView, DOMObject>(exec, &DOMAbstractViewTable, this, propertyName, slot);
  +    return getStaticValueSlot<DOMAbstractView, DOMObject>(exec, &DOMAbstractViewTable, this, propertyName, slot);
   }
   
  -ValueImp *DOMAbstractViewFunc::callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args)
  +ValueImp *DOMAbstractViewProtoFunc::callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args)
   {
     if (!thisObj->inherits(&DOMAbstractView::info))
       return throwError(exec, TypeError);
  
  
  
  1.10      +1 -1      WebCore/khtml/ecma/kjs_views.h
  
  Index: kjs_views.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- kjs_views.h	27 Sep 2005 22:37:04 -0000	1.9
  +++ kjs_views.h	4 Oct 2005 06:11:36 -0000	1.10
  @@ -31,7 +31,7 @@
   
     class DOMAbstractView : public DOMObject {
     public:
  -    DOMAbstractView(ExecState *, DOM::AbstractViewImpl *av) : m_impl(av) { }
  +    DOMAbstractView(ExecState *, DOM::AbstractViewImpl *av);
       ~DOMAbstractView();
       virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
       ValueImp *getValueProperty(ExecState *exec, int token);