[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Maks Orlovich <maksim () kde ! org>
Date:       2007-03-15 20:15:21
Message-ID: 1173989721.341828.7364.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 642912 by orlovich:

Don't use element()->getDocument() but rather just document() to get 
to the document from a RenderObject, as element() may be 0 for generated
content.
BUG:142589



 M  +1 -1      render_body.cpp  
 M  +4 -4      render_layer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_body.cpp #642911:642912
@@ -49,7 +49,7 @@
         style->setPosition(STATIC);
 
     RenderBlock::setStyle(style);
-    element()->getDocument()->setTextColor( style->color() );
+    document()->setTextColor( style->color() );
     scrollbarsStyled = false;
 }
 
--- branches/KDE/3.5/kdelibs/khtml/rendering/render_layer.cpp #642911:642912
@@ -262,7 +262,7 @@
         uint count = m_posZOrderList ? m_posZOrderList->count() : 0;
         bool needUpdate = (count || !m_region.isNull());
         if (count) {
-            QScrollView* sv = m_object->element()->getDocument()->view();
+            QScrollView* sv = m_object->document()->view();
             m_region = QRect(0,0,sv->contentsWidth(),sv->contentsHeight());
 
             for (uint i = 0; i < count; i++) {
@@ -609,7 +609,7 @@
     QScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar;
 
     if (show && !sb) {
-        QScrollView* scrollView = m_object->element()->getDocument()->view();
+        QScrollView* scrollView = m_object->document()->view();
         sb = new QScrollBar(o, scrollView, "__khtml");
         scrollView->addChild(sb, 0, -50000);
 	sb->setBackgroundMode(QWidget::NoBackground);
@@ -683,7 +683,7 @@
     if (w <= 0 || h <= 0 || (!m_vBar && !m_hBar))
 	return;
 
-    QScrollView* scrollView = m_object->element()->getDocument()->view();
+    QScrollView* scrollView = m_object->document()->view();
 
     tx += bl;
     ty += bt;
@@ -799,7 +799,7 @@
     if (!m_object->element())
        return;
 
-    QScrollView* scrollView = m_object->element()->getDocument()->view();
+    QScrollView* scrollView = m_object->document()->view();
     if (m_hBar) {
 	int x = m_hBar->x();
 	int y = m_hBar->y();
[prev in list] [next in list] [prev in thread] [next in thread]