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/HTMLObjectElement.h

    r370 r433  
    2424#define HTMLObjectElement_h 
    2525 
    26 #include "HTMLPlugInElement.h" 
    27 #include <wtf/OwnPtr.h> 
     26#include "HTMLPlugInImageElement.h" 
    2827 
    2928namespace WebCore { 
    3029 
    31 class HTMLImageLoader; 
    3230class KURL; 
    3331 
    34 class HTMLObjectElement : public HTMLPlugInElement { 
     32class HTMLObjectElement : public HTMLPlugInImageElement { 
    3533public: 
    3634    HTMLObjectElement(Document*, bool createdByParser); 
    …… 
    5957    void setNeedWidgetUpdate(bool needWidgetUpdate) { m_needWidgetUpdate = needWidgetUpdate; } 
    6058 
    61     bool isImageType(); 
    62  
    6359    void renderFallbackContent(); 
    6460 
    6561#if USE(JAVASCRIPTCORE_BINDINGS) 
    66     virtual KJS::Bindings::Instance* getInstance() const; 
     62    virtual RenderWidget* renderWidgetForJSBindings() const; 
    6763#endif 
    6864 
    …… 
    106102 
    107103    const String& classId() const { return m_classId; } 
    108     const String& url() const { return m_url; } 
    109     const String& serviceType() const { return m_serviceType; } 
    110104 
    111105    bool containsJavaApplet() const; 
    …… 
    117111 
    118112    AtomicString m_id; 
    119     String m_serviceType; 
    120     String m_url; 
    121113    String m_classId; 
    122114    bool m_docNamedItem : 1; 
    123115    bool m_needWidgetUpdate : 1; 
    124116    bool m_useFallbackContent : 1; 
    125     OwnPtr<HTMLImageLoader> m_imageLoader; 
    126117}; 
    127118