Changeset 61504 in webkit
- Timestamp:
- Jun 20, 2010 4:46:17 AM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebhistory.cpp
r61056 r61504 364 364 { 365 365 if (canGoBack()) { 366 d->lst->goBack();367 366 WebCore::Page* page = d->lst->page(); 368 page->goToItem( currentItem().d->item, WebCore::FrameLoadTypeIndexedBackForward);367 page->goToItem(d->lst->backItem(), WebCore::FrameLoadTypeIndexedBackForward); 369 368 } 370 369 } … … 379 378 { 380 379 if (canGoForward()) { 381 d->lst->goForward();382 380 WebCore::Page* page = d->lst->page(); 383 page->goToItem( currentItem().d->item, WebCore::FrameLoadTypeIndexedBackForward);381 page->goToItem(d->lst->forwardItem(), WebCore::FrameLoadTypeIndexedBackForward); 384 382 } 385 383 } … … 392 390 void QWebHistory::goToItem(const QWebHistoryItem &item) 393 391 { 394 d->lst->goToItem(item.d->item);395 392 WebCore::Page* page = d->lst->page(); 396 page->goToItem( currentItem().d->item, WebCore::FrameLoadTypeIndexedBackForward);393 page->goToItem(item.d->item, WebCore::FrameLoadTypeIndexedBackForward); 397 394 } 398 395 -
trunk/WebKit/qt/ChangeLog
r61487 r61504 1 2010-06-20 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 The QWebHistory regression fix. 6 7 After change r51629 and r61207 QWebHistory's function back(), 8 forward(), goToItem() got broken. 9 10 Use page->goToItem() instead of direct actions on the BackForwardList. 11 12 [Qt] REGRESSION(r61207): qwebhistory unit test hangs 13 https://bugs.webkit.org/show_bug.cgi?id=40672 14 15 * Api/qwebhistory.cpp: 16 (QWebHistory::back): 17 (QWebHistory::forward): 18 (QWebHistory::goToItem): 19 * tests/qwebhistory/tst_qwebhistory.cpp: 20 (tst_QWebHistory::init): 21 (tst_QWebHistory::back): 22 (tst_QWebHistory::forward): 23 1 24 2010-06-19 Yael Aharon <yael.aharon@nokia.com> 2 25 -
trunk/WebKit/qt/tests/qwebhistory/tst_qwebhistory.cpp
r59815 r61504 85 85 page = new QWebPage(this); 86 86 frame = page->mainFrame(); 87 connect(page, SIGNAL(loadFinished(bool)), &waitForLoadFinished, SLOT(quit()) );87 connect(page, SIGNAL(loadFinished(bool)), &waitForLoadFinished, SLOT(quit()), Qt::QueuedConnection); 88 88 89 89 for (int i = 1;i < 6;i++) { … … 127 127 //try one more time (too many). crash test 128 128 hist->back(); 129 QCOMPARE(page->mainFrame()->toPlainText(), QString("page1")); 129 130 } 130 131 … … 147 148 //try one more time (too many). crash test 148 149 hist->forward(); 150 QCOMPARE(page->mainFrame()->toPlainText(), QString("page") + QString::number(histsize)); 149 151 } 150 152
Note: See TracChangeset
for help on using the changeset viewer.