Changeset 17066 in webkit


Ignore:
Timestamp:
Oct 15, 2006 7:00:04 PM (18 years ago)
Author:
zbujtas
Message:

2006-10-13 sareen <​shyam.sareen@nokia.com>

Reviewed by bujtas <​zbujtas@gmail.com>
DESC: New Enum need to add for finding the whether the plugin

is interactive or not.

​http://bugs.webkit.org/show_bug.cgi?id=11281

WARNING: NO TEST CASES ADDED OR CHANGED

  • bridge/WebCoreWidget.h:
  • khtml/html/html_objectimpl.cpp: (HTMLEmbedElementImpl::isFocusable): (HTMLObjectElementImpl::isFocusable):
  • khtml/rendering/render_frames.cpp:
  • khtml/rendering/render_frames.h:
  • kwq/KWQObjectWidget.cpp:
  • kwq/KWQObjectWidget.h:
Location:
S60/trunk/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • S60/trunk/WebCore/ChangeLog

    r17009 r17066  
     12006-10-13  sareen  <shyam.sareen@nokia.com>
     2
     3        Reviewed by bujtas  <zbujtas@gmail.com>
     4        DESC: New Enum need to add for finding the whether the plugin
     5              is interactive or not.
     6        http://bugs.webkit.org/show_bug.cgi?id=11281
     7
     8        WARNING: NO TEST CASES ADDED OR CHANGED
     9
     10        * bridge/WebCoreWidget.h:
     11        * khtml/html/html_objectimpl.cpp:
     12        (HTMLEmbedElementImpl::isFocusable):
     13        (HTMLObjectElementImpl::isFocusable):
     14        * khtml/rendering/render_frames.cpp:
     15        * khtml/rendering/render_frames.h:
     16        * kwq/KWQObjectWidget.cpp:
     17        * kwq/KWQObjectWidget.h:
     18
    1192006-10-12  brmorris  <thisisbradley@gmail.com>
    220

  • S60/trunk/WebCore/bridge/WebCoreWidget.h

    r15885 r17066  
    225225    virtual TBool HasResized() = 0;
    226226   
    227 #ifdef RD_32_BROWSER
    228227    // check if the plugin is able to accept focus event
    229228    virtual TBool IsFocusable() const = 0;
    230 #endif
    231229
    232230    };

  • S60/trunk/WebCore/khtml/html/html_objectimpl.cpp

    r16256 r17066  
    508508    if (!m_render || (m_render->style() && m_render->style()->visibility() != VISIBLE))
    509509        return false;
    510 #ifdef RD_32_BROWSER
    511510    else {
    512511        RenderPartObject* render = static_cast<RenderPartObject*>( m_render );
    513512        return render->focusable();
    514513    }
    515 #else
    516     return true;
    517 #endif
    518514}
    519515
    … …  
    810806    if (!m_render || (m_render->style() && m_render->style()->visibility() != VISIBLE))
    811807        return false;
    812 #ifdef RD_32_BROWSER
    813808    else {
    814809        RenderPartObject* render = static_cast<RenderPartObject*>( m_render );
    815810        return render->focusable();
    816811    }
    817 #else
    818     return true;
    819 #endif
    820812}
    821813

  • S60/trunk/WebCore/khtml/rendering/render_frames.cpp

    r15885 r17066  
    13421342    return RenderReplaced::calcReplacedHeight();
    13431343}
    1344 #ifdef RD_32_BROWSER
     1344
    13451345bool RenderPartObject::focusable() const
    13461346{
    … …  
    13511351        return false;
    13521352}
    1353 #endif
     1353
    13541354
    13551355#endif // NOKIA_CHANGES

  • S60/trunk/WebCore/khtml/rendering/render_frames.h

    r15885 r17066  
    170170    virtual int calcReplacedWidth() const;
    171171    virtual int calcReplacedHeight() const;
    172 #ifdef RD_32_BROWSER
    173172    bool focusable() const;
    174 #endif
    175173#endif // NOKIA_CHANGES
    176174

  • S60/trunk/WebCore/kwq/KWQObjectWidget.cpp

    r15885 r17066  
    7272}
    7373
    74 #ifdef RD_32_BROWSER
    7574bool QObjectWidget::focusable() const
    7675{
    7776    return objectWidget->IsFocusable();
    7877}
    79 #endif
     78

  • S60/trunk/WebCore/kwq/KWQObjectWidget.h

    r15885 r17066  
    5151    bool hasResized();
    5252
    53 #ifdef RD_32_BROWSER
    5453    bool focusable() const;
    55 #endif
     54
    5655
    5756private:
Note: See TracChangeset for help on using the changeset viewer.