Changeset 91302 in webkit

Timestamp:

Jul 19, 2011 2:31:17 PM (13 years ago)

Author:

caio.oliveira@openbossa.org

Message:

[Qt] Fix leak of QWebPage in errorPageExtension tests
​https://bugs.webkit.org/show_bug.cgi?id=64814

Reviewed by Noam Rosenthal.

QWebView::setPage() doesn't take ownership, so the ErrorPages were leaking. So now
allocate them on the stack. This shouldn't change any behavior.

• tests/qwebpage/tst_qwebpage.cpp:

(tst_QWebPage::errorPageExtension):
(tst_QWebPage::errorPageExtensionInIFrames):
(tst_QWebPage::errorPageExtensionInFrameset):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (6 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-07-19  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] Fix leak of QWebPage in errorPageExtension tests
+        https://bugs.webkit.org/show_bug.cgi?id=64814
+
+        Reviewed by Noam Rosenthal.
+
+        QWebView::setPage() doesn't take ownership, so the ErrorPages were leaking. So now
+        allocate them on the stack. This shouldn't change any behavior.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::errorPageExtension):
+        (tst_QWebPage::errorPageExtensionInIFrames):
+        (tst_QWebPage::errorPageExtensionInFrameset):
+
 2011-07-18  Hui Huang  <hui.2.huang@nokia.com>
 

trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -2512 +2512 @@
 void tst_QWebPage::errorPageExtension()
 {
-    ErrorPage* page = new ErrorPage;
-    m_view->setPage(page);
+    ErrorPage page;
+    m_view->setPage(&page);
 
     QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
@@ -2520 +2520 @@
     QTRY_COMPARE(spyLoadFinished.count(), 1);
 
-    page->mainFrame()->setUrl(QUrl("http://non.existent/url"));
+    page.mainFrame()->setUrl(QUrl("http://non.existent/url"));
     QTRY_COMPARE(spyLoadFinished.count(), 2);
-    QCOMPARE(page->mainFrame()->toPlainText(), QString("error"));
-    QCOMPARE(page->history()->count(), 2);
-    QCOMPARE(page->history()->currentItem().url(), QUrl("http://non.existent/url"));
-    QCOMPARE(page->history()->canGoBack(), true);
-    QCOMPARE(page->history()->canGoForward(), false);
-
-    page->triggerAction(QWebPage::Back);
-    QTRY_COMPARE(page->history()->canGoBack(), false);
-    QTRY_COMPARE(page->history()->canGoForward(), true);
-
-    page->triggerAction(QWebPage::Forward);
-    QTRY_COMPARE(page->history()->canGoBack(), true);
-    QTRY_COMPARE(page->history()->canGoForward(), false);
-
-    page->triggerAction(QWebPage::Back);
-    QTRY_COMPARE(page->history()->canGoBack(), false);
-    QTRY_COMPARE(page->history()->canGoForward(), true);
-    QTRY_COMPARE(page->history()->currentItem().url(), QUrl("data:text/html,foo"));
+    QCOMPARE(page.mainFrame()->toPlainText(), QString("error"));
+    QCOMPARE(page.history()->count(), 2);
+    QCOMPARE(page.history()->currentItem().url(), QUrl("http://non.existent/url"));
+    QCOMPARE(page.history()->canGoBack(), true);
+    QCOMPARE(page.history()->canGoForward(), false);
+
+    page.triggerAction(QWebPage::Back);
+    QTRY_COMPARE(page.history()->canGoBack(), false);
+    QTRY_COMPARE(page.history()->canGoForward(), true);
+
+    page.triggerAction(QWebPage::Forward);
+    QTRY_COMPARE(page.history()->canGoBack(), true);
+    QTRY_COMPARE(page.history()->canGoForward(), false);
+
+    page.triggerAction(QWebPage::Back);
+    QTRY_COMPARE(page.history()->canGoBack(), false);
+    QTRY_COMPARE(page.history()->canGoForward(), true);
+    QTRY_COMPARE(page.history()->currentItem().url(), QUrl("data:text/html,foo"));
 
     m_view->setPage(0);
@@ -2546 +2546 @@
 void tst_QWebPage::errorPageExtensionInIFrames()
 {
-    ErrorPage* page = new ErrorPage;
-    m_view->setPage(page);
+    ErrorPage page;
+    m_view->setPage(&page);
 
     m_view->page()->mainFrame()->load(QUrl(
@@ -2557 +2557 @@
     QTRY_COMPARE(spyLoadFinished.count(), 1);
 
-    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("error"));
+    QCOMPARE(page.mainFrame()->childFrames()[1]->toPlainText(), QString("error"));
 
     m_view->setPage(0);
@@ -2564 +2564 @@
 void tst_QWebPage::errorPageExtensionInFrameset()
 {
-    ErrorPage* page = new ErrorPage;
-    m_view->setPage(page);
+    ErrorPage page;
+    m_view->setPage(&page);
 
     m_view->load(QUrl("qrc:///resources/index.html"));
@@ -2571 +2571 @@
     QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
     QTRY_COMPARE(spyLoadFinished.count(), 1);
-    QCOMPARE(page->mainFrame()->childFrames().count(), 2);
-    QCOMPARE(page->mainFrame()->childFrames()[1]->toPlainText(), QString("error"));
+    QCOMPARE(page.mainFrame()->childFrames().count(), 2);
+    QCOMPARE(page.mainFrame()->childFrames()[1]->toPlainText(), QString("error"));
 
     m_view->setPage(0);