Changeset 19457 for S60/trunk/WebCore

Timestamp:

02/06/07 19:36:18 (2 years ago)

Author:

brmorris

Message:

yaharon, reviewed by zalan. merged to s60/trunk by brad.

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

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/rendering/render_layer.cpp (modified) (4 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yaharon, reviewed by zalan. merged to s60/trunk by brad.
+        DESC: [S60] BrowserNG: Betsson.com crash (MLIO-6XWP2K)
+        http://bugs.webkit.org/show_bug.cgi?id=12641
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::setHasHorizontalScrollbar):
+        (RenderLayer::setHasVerticalScrollbar):
+
 yongjzha, reviewed by Zalan.
         DESC: don't apply outline style for image inside <A> element

S60/trunk/WebCore/khtml/rendering/render_layer.cpp

@@ -710 +710 @@
 {
     if (hasScrollbar && !m_hBar) {
+#ifdef NOKIA_CHANGES
+        QScrollView* scrollView = m_object->document()->view();
+#else
         QScrollView* scrollView = m_object->element()->getDocument()->view();
+#endif
         m_hBar = new QScrollBar(Qt::Horizontal, 0);
         scrollView->addChild(m_hBar, 0, -50000);
@@ -718 +722 @@
     }
     else if (!hasScrollbar && m_hBar) {
+#ifdef NOKIA_CHANGES
+        QScrollView* scrollView = m_object->document()->view();
+#else
         QScrollView* scrollView = m_object->element()->getDocument()->view();
+#endif
         scrollView->removeChild (m_hBar);
 
@@ -732 +740 @@
 {
     if (hasScrollbar && !m_vBar) {
+#ifdef NOKIA_CHANGES
+        QScrollView* scrollView = m_object->document()->view();
+#else
         QScrollView* scrollView = m_object->element()->getDocument()->view();
+#endif
         m_vBar = new QScrollBar(Qt::Vertical, 0);
         scrollView->addChild(m_vBar, 0, -50000);
@@ -740 +752 @@
     }
     else if (!hasScrollbar && m_vBar) {
+#ifdef NOKIA_CHANGES
+        QScrollView* scrollView = m_object->document()->view();
+#else
         QScrollView* scrollView = m_object->element()->getDocument()->view();
+#endif
         scrollView->removeChild (m_vBar);