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/JSEventCustom.cpp

    r427 r436  
    4141#include "JSTextEvent.h" 
    4242#include "JSUIEvent.h" 
     43#include "JSWebKitAnimationEvent.h" 
     44#include "JSWebKitTransitionEvent.h" 
    4345#include "JSWheelEvent.h" 
    4446#include "JSXMLHttpRequestProgressEvent.h" 
     
    5153#include "TextEvent.h" 
    5254#include "UIEvent.h" 
     55#include "WebKitAnimationEvent.h" 
     56#include "WebKitTransitionEvent.h" 
    5357#include "WheelEvent.h" 
    5458#include "XMLHttpRequestProgressEvent.h" 
     
    113117        ret = new (exec) JSStorageEvent(JSStorageEventPrototype::self(exec), static_cast<StorageEvent*>(event)); 
    114118#endif 
     119    else if (event->isWebKitAnimationEvent()) 
     120        ret = new (exec) JSWebKitAnimationEvent(JSWebKitAnimationEventPrototype::self(exec), static_cast<WebKitAnimationEvent*>(event)); 
     121    else if (event->isWebKitTransitionEvent()) 
     122        ret = new (exec) JSWebKitTransitionEvent(JSWebKitTransitionEventPrototype::self(exec), static_cast<WebKitTransitionEvent*>(event)); 
    115123    else 
    116124        ret = new (exec) JSEvent(JSEventPrototype::self(exec), event);