Changeset 19457 in webkit
- Timestamp:
- Feb 6, 2007 7:36:18 PM (17 years ago)
- Location:
- S60/trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/trunk/WebCore/ChangeLog
r19440 r19457 1 yaharon, reviewed by zalan. merged to s60/trunk by brad. 2 DESC: [S60] BrowserNG: Betsson.com crash (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 1 11 yongjzha, reviewed by Zalan. 2 12 DESC: don't apply outline style for image inside <A> element -
S60/trunk/WebCore/khtml/rendering/render_layer.cpp
r15508 r19457 710 710 { 711 711 if (hasScrollbar && !m_hBar) { 712 #ifdef NOKIA_CHANGES 713 QScrollView* scrollView = m_object->document()->view(); 714 #else 712 715 QScrollView* scrollView = m_object->element()->getDocument()->view(); 716 #endif 713 717 m_hBar = new QScrollBar(Qt::Horizontal, 0); 714 718 scrollView->addChild(m_hBar, 0, -50000); … … 718 722 } 719 723 else if (!hasScrollbar && m_hBar) { 724 #ifdef NOKIA_CHANGES 725 QScrollView* scrollView = m_object->document()->view(); 726 #else 720 727 QScrollView* scrollView = m_object->element()->getDocument()->view(); 728 #endif 721 729 scrollView->removeChild (m_hBar); 722 730 … … 732 740 { 733 741 if (hasScrollbar && !m_vBar) { 742 #ifdef NOKIA_CHANGES 743 QScrollView* scrollView = m_object->document()->view(); 744 #else 734 745 QScrollView* scrollView = m_object->element()->getDocument()->view(); 746 #endif 735 747 m_vBar = new QScrollBar(Qt::Vertical, 0); 736 748 scrollView->addChild(m_vBar, 0, -50000); … … 740 752 } 741 753 else if (!hasScrollbar && m_vBar) { 754 #ifdef NOKIA_CHANGES 755 QScrollView* scrollView = m_object->document()->view(); 756 #else 742 757 QScrollView* scrollView = m_object->element()->getDocument()->view(); 758 #endif 743 759 scrollView->removeChild (m_vBar); 744 760
Note: See TracChangeset
for help on using the changeset viewer.