Changeset 19456 in webkit


Ignore:
Timestamp:
Feb 6, 2007 7:33:57 PM (17 years ago)
Author:
brmorris
Message:

yaharon, reviewed by zalan.

DESC: [S60] BrowserNG: Betsson.com crash (MLIO-6XWP2K)
http://bugs.webkit.org/show_bug.cgi?id=12641

Location:
S60/branches/3.1m/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • S60/branches/3.1m/WebCore/ChangeLog

    r19433 r19456  
     1yaharon, reviewed by zalan.
     2        DESC: [S60] BrowserNG: Betsson.com crashes browser (MLIO-6XWP2K)
     3        http://bugs.webkit.org/show_bug.cgi?id=12641
     4
     5        WARNING: NO TEST CASES ADDED OR CHANGED
     6
     7        * khtml/rendering/render_layer.cpp:
     8        (RenderLayer::setHasHorizontalScrollbar):
     9        (RenderLayer::setHasVerticalScrollbar):
     10
    111w3liu,  Reviewed by Yongjun Zhang <yongjun.zhang@nokia.com>
    212        DESC: Should check meta for charset if meta exists EHSN-6UQ6CM
  • S60/branches/3.1m/WebCore/khtml/rendering/render_layer.cpp

    r15508 r19456  
    710710{
    711711    if (hasScrollbar && !m_hBar) {
     712#ifdef NOKIA_CHANGES
     713        QScrollView* scrollView = m_object->document()->view();
     714#else
    712715        QScrollView* scrollView = m_object->element()->getDocument()->view();
     716#endif
    713717        m_hBar = new QScrollBar(Qt::Horizontal, 0);
    714718        scrollView->addChild(m_hBar, 0, -50000);
     
    718722    }
    719723    else if (!hasScrollbar && m_hBar) {
     724#ifdef NOKIA_CHANGES
     725        QScrollView* scrollView = m_object->document()->view();
     726#else
    720727        QScrollView* scrollView = m_object->element()->getDocument()->view();
     728#endif
    721729        scrollView->removeChild (m_hBar);
    722730
     
    732740{
    733741    if (hasScrollbar && !m_vBar) {
     742#ifdef NOKIA_CHANGES
     743        QScrollView* scrollView = m_object->document()->view();
     744#else
    734745        QScrollView* scrollView = m_object->element()->getDocument()->view();
     746#endif
    735747        m_vBar = new QScrollBar(Qt::Vertical, 0);
    736748        scrollView->addChild(m_vBar, 0, -50000);
     
    740752    }
    741753    else if (!hasScrollbar && m_vBar) {
     754#ifdef NOKIA_CHANGES
     755        QScrollView* scrollView = m_object->document()->view();
     756#else
    742757        QScrollView* scrollView = m_object->element()->getDocument()->view();
     758#endif
    743759        scrollView->removeChild (m_vBar);
    744760
Note: See TracChangeset for help on using the changeset viewer.