Show
Ignore:
Timestamp:
08/13/08 13:49:09 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35706

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/WebCore/bindings/js/JSDOMWindowBase.cpp

    r427 r436  
    180180  onunload              WebCore::JSDOMWindowBase::Onunload           DontDelete 
    181181  onbeforeunload        WebCore::JSDOMWindowBase::Onbeforeunload     DontDelete 
     182  onwebkitanimationstart    WebCore::JSDOMWindowBase::OnWebKitAnimationStart  DontDelete 
     183  onwebkitanimationiteration     WebCore::JSDOMWindowBase::OnWebKitAnimationIteration   DontDelete 
     184  onwebkitanimationend      WebCore::JSDOMWindowBase::OnWebKitAnimationEnd    DontDelete 
     185  onwebkittransitionend     WebCore::JSDOMWindowBase::OnWebKitTransitionEnd   DontDelete 
    182186# -- Constructors -- 
    183187  Audio                 WebCore::JSDOMWindowBase::Audio              DontDelete 
     
    519523   case Onunload: 
    520524     return getListener(exec, unloadEvent); 
     525   case OnWebKitAnimationStart: 
     526     return getListener(exec, webkitAnimationStartEvent); 
     527   case OnWebKitAnimationIteration: 
     528     return getListener(exec, webkitAnimationIterationEvent); 
     529   case OnWebKitAnimationEnd: 
     530     return getListener(exec, webkitAnimationEndEvent); 
     531   case OnWebKitTransitionEnd: 
     532     return getListener(exec, webkitTransitionEndEvent); 
    521533   } 
    522534   ASSERT_NOT_REACHED();