Changeset 19046 in webkit

Timestamp:

Jan 23, 2007, 8:35:12 AM (18 years ago)

Author:

lars

Message:

Reviewed by Zack

Widget and ScrollView do not own the Qt widgets
anymore. Make sure they can handle the case of
a null QWidget and never delete them.

Fix refcounting of FrameViews (they get created with a
refcount of 1) and add a few safety checks to the
FrameLoaderClientQt.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/ScrollViewQt.cpp (modified) (17 diffs)
• WebCore/platform/qt/WidgetQt.cpp (modified) (2 diffs)
• WebKitQt/Api/qwebframe.cpp (modified) (3 diffs)
• WebKitQt/ChangeLog (modified) (1 diff)
• WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-23  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack
+
+        Widget and ScrollView do not own the Qt widgets
+        anymore. Make sure they can handle the case of
+        a null QWidget and never delete them.
+
+        * platform/qt/ScrollViewQt.cpp:
+        (WebCore::ScrollView::setScrollArea):
+        (WebCore::ScrollView::updateContents):
+        (WebCore::ScrollView::visibleWidth):
+        (WebCore::ScrollView::visibleHeight):
+        (WebCore::ScrollView::visibleContentRect):
+        (WebCore::ScrollView::setContentsPos):
+        (WebCore::ScrollView::resizeContents):
+        (WebCore::ScrollView::contentsX):
+        (WebCore::ScrollView::contentsY):
+        (WebCore::ScrollView::contentsWidth):
+        (WebCore::ScrollView::contentsHeight):
+        (WebCore::ScrollView::scrollOffset):
+        (WebCore::ScrollView::scrollBy):
+        (WebCore::ScrollView::hScrollbarMode):
+        (WebCore::ScrollView::vScrollbarMode):
+        (WebCore::ScrollView::setHScrollbarMode):
+        (WebCore::ScrollView::setVScrollbarMode):
+        * platform/qt/WidgetQt.cpp:
+        (WebCore::WidgetPrivate::~WidgetPrivate):
+        (WebCore::Widget::setQWidget):
+
 2007-01-23  Zack Rusin  <zack@kde.org>
 

trunk/WebCore/platform/qt/ScrollViewQt.cpp

@@ -58 +58 @@
 {
     m_area = area;
-    if (isFrameView()) {
+    if (m_area && isFrameView()) {
         ScrollViewCanvasQt* canvas = new ScrollViewCanvasQt(static_cast<FrameView*>(this), m_area);
         m_area->setWidget(canvas);
@@ -68 +68 @@
 {
     //Update is fine for both now=true/false cases
-    if (m_area->widget())
+    if (m_area && m_area->widget())
         m_area->widget()->update(updateRect);
 }
@@ -74 +74 @@
 int ScrollView::visibleWidth() const
 {
+    if (!m_area)
+        return 0;
     return m_area->maximumViewportSize().width();
 }
@@ -79 +81 @@
 int ScrollView::visibleHeight() const
 {
+    if (!m_area)
+        return 0;
     return m_area->maximumViewportSize().height();
 }
@@ -84 +88 @@
 FloatRect ScrollView::visibleContentRect() const
 {
+    if (!m_area)
+        return FloatRect();
     const QSize s(m_area->maximumViewportSize());
 
@@ -93 +99 @@
 void ScrollView::setContentsPos(int newX, int newY)
 {
+    if (!m_area)
+        return;
     m_area->horizontalScrollBar()->setValue(newX);
     m_area->verticalScrollBar()->setValue(newY);
@@ -99 +107 @@
 void ScrollView::resizeContents(int w, int h)
 {
-    if (m_area->widget())
+    if (m_area && m_area->widget())
         m_area->widget()->resize(w, h);
 }
@@ -105 +113 @@
 int ScrollView::contentsX() const
 {
+    if (!m_area)
+        return 0;
     return m_area->horizontalScrollBar()->value();
 }
@@ -110 +120 @@
 int ScrollView::contentsY() const
 {
+    if (!m_area)
+        return 0;
     return m_area->verticalScrollBar()->value();
 }
@@ -115 +127 @@
 int ScrollView::contentsWidth() const
 {
-    if (!m_area->widget())
+    if (!m_area || !m_area->widget())
         return 0;
 
@@ -123 +135 @@
 int ScrollView::contentsHeight() const
 {
-    if (!m_area->widget())
+    if (!m_area || !m_area->widget())
         return 0;
 
@@ -142 +154 @@
 IntSize ScrollView::scrollOffset() const
 {
+    if (!m_area)
+        return IntSize();
     return IntSize(m_area->horizontalScrollBar()->value(), m_area->verticalScrollBar()->value());
 }
@@ -147 +161 @@
 void ScrollView::scrollBy(int dx, int dy)
 {
+    if (!m_area)
+        return;
     m_area->horizontalScrollBar()->setValue(m_area->horizontalScrollBar()->value() + dx);
     m_area->verticalScrollBar()->setValue(m_area->verticalScrollBar()->value() + dy);
@@ -153 +169 @@
 ScrollbarMode ScrollView::hScrollbarMode() const
 {
+    if (!m_area)
+        return ScrollbarAuto;
     switch (m_area->horizontalScrollBarPolicy())
     {
@@ -168 +186 @@
 ScrollbarMode ScrollView::vScrollbarMode() const
 {
+    if (!m_area)
+        return ScrollbarAuto;
     switch (m_area->verticalScrollBarPolicy())
     {
@@ -188 +208 @@
 void ScrollView::setHScrollbarMode(ScrollbarMode newMode)
 {
+    if (!m_area)
+        return;
     switch (newMode)
     {
@@ -204 +226 @@
 void ScrollView::setVScrollbarMode(ScrollbarMode newMode)
 {
+    if (!m_area)
+        return;
     switch (newMode)
     {

trunk/WebCore/platform/qt/WidgetQt.cpp

@@ -48 +48 @@
 {
     WidgetPrivate() : m_parent(0), m_widget(0), m_client(0) { }
-    ~WidgetPrivate() { delete m_widget; }
+    ~WidgetPrivate() { }
 
     WidgetClient *m_client;
@@ -141 +141 @@
 void Widget::setQWidget(QWidget* child)
 {
-    delete data->m_widget;
     data->m_widget = child;
 }

trunk/WebKitQt/Api/qwebframe.cpp

@@ -58 +58 @@
 
     d->frameView = new FrameView(d->frame.get());
+    d->frameView->deref();
     d->frameView->setScrollArea(this);
     d->frame->setView(d->frameView.get());
@@ -78 +79 @@
 
     d->frameView = new FrameView(d->frame.get());
+    d->frameView->deref();
     d->frameView->setScrollArea(this);
     d->frame->setView(d->frameView.get());
@@ -84 +86 @@
 QWebFrame::~QWebFrame()
 {
+    if (d->frameView)
+        d->frameView->setScrollArea(0);
     delete d;
 }

trunk/WebKitQt/ChangeLog

@@ +1 @@
+2007-01-23  Lars Knoll <lars@trolltech.com>
+
+        Reviewed by Zack
+
+        Fix refcounting of FrameViews (they get created with a
+        refcount of 1) and add a few safety checks to the 
+        FrameLoaderClientQt.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::QWebFrame):
+        (QWebFrame::~QWebFrame):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::detachedFromParent3):
+        (WebCore::FrameLoaderClientQt::detachedFromParent4):
+        (WebCore::FrameLoaderClientQt::dispatchDidHandleOnloadEvents):
+        (WebCore::FrameLoaderClientQt::postProgressStartedNotification):
+        (WebCore::FrameLoaderClientQt::postProgressEstimateChangedNotification):
+        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification):
+        (WebCore::FrameLoaderClientQt::frameLoaderDestroyed):
+        (WebCore::FrameLoaderClientQt::windowObjectCleared):
+
 2007-01-23  Zack Rusin  <zack@kde.org>
 

trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -262 +262 @@
 void FrameLoaderClientQt::detachedFromParent3()
 {
+    if (!m_webFrame)
+        return;
+    if (m_webFrame->d->frameView)
+        m_webFrame->d->frameView->setScrollArea(0);
     m_webFrame->d->frameView = 0;
 }
@@ -269 +273 @@
 {
     delete m_webFrame;
+    m_webFrame = 0;
+    m_frame = 0;
 }
 
@@ -280 +286 @@
 void FrameLoaderClientQt::dispatchDidHandleOnloadEvents()
 {
-    emit m_webFrame->loadDone();
+    if (m_webFrame)
+        emit m_webFrame->loadDone();
 }
 
@@ -407 +414 @@
 void FrameLoaderClientQt::postProgressStartedNotification()
 {
-    emit loadStarted(m_webFrame);
+    if (m_webFrame && m_frame->page())
+        emit loadStarted(m_webFrame);
 }
 
 void FrameLoaderClientQt::postProgressEstimateChangedNotification()
 {
-    emit loadProgressChanged(m_frame->page()->progress()->estimatedProgress());
+    if (m_webFrame && m_frame->page())
+        emit loadProgressChanged(m_frame->page()->progress()->estimatedProgress());
 }
 
 void FrameLoaderClientQt::postProgressFinishedNotification()
 {
-    emit loadFinished(m_webFrame);
+    if (m_webFrame && m_frame->page())
+        emit loadFinished(m_webFrame);
 }
 
@@ -559 +569 @@
 void FrameLoaderClientQt::frameLoaderDestroyed()
 {
+    m_webFrame = 0;
     m_frame = 0;
     delete this;
@@ -570 +581 @@
 void FrameLoaderClientQt::windowObjectCleared() const
 {
-    emit m_webFrame->cleared();
+    if (m_webFrame)
+        emit m_webFrame->cleared();
 }