Show
Ignore:
Timestamp:
08/08/08 14:23:27 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35637

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/WebCore/html/HTMLAppletElement.h

    r243 r433  
    2626#include "HTMLPlugInElement.h" 
    2727 
    28 #if USE(JAVASCRIPTCORE_BINDINGS) 
    29 namespace KJS {  
    30     namespace Bindings {  
    31         class Instance; 
    32     }  
    33 } 
    34 #endif 
    35  
    3628namespace WebCore { 
    3729 
     
    5244    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*); 
    5345    virtual void finishParsingChildren(); 
    54     virtual void detach(); 
    5546     
    5647#if USE(JAVASCRIPTCORE_BINDINGS) 
    57     virtual KJS::Bindings::Instance* getInstance() const; 
     48    virtual RenderWidget* renderWidgetForJSBindings() const; 
    5849#endif 
    5950