Changeset 61056 in webkit
- Timestamp:
- Jun 12, 2010 12:36:06 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r61054 r61056 1 2010-06-12 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Back-forward list dumping is incorrect 6 7 https://bugs.webkit.org/show_bug.cgi?id=36392 8 9 Support dumping child history items in DRT. 10 11 Unskip: 12 13 fast/loader/frame-src-change-added-to-history.html 14 fast/loader/frame-src-change-not-added-to-history.html 15 fast/loader/frame-location-change-not-added-to-history.html 16 17 * platform/qt/Skipped: 18 1 19 2010-06-11 Eric Seidel <eric@webkit.org> 2 20 -
trunk/LayoutTests/platform/qt/Skipped
r60970 r61056 2522 2522 # https://bugs.webkit.org/show_bug.cgi?id=35973 2523 2523 fast/multicol/hit-test-above-or-below.html 2524 2525 # [Qt] Back-forward list dumping is incorrect2526 # https://bugs.webkit.org/show_bug.cgi?id=363922527 fast/loader/frame-src-change-added-to-history.html2528 fast/loader/frame-src-change-not-added-to-history.html2529 fast/loader/frame-location-change-not-added-to-history.html2530 2524 2531 2525 # fast/loader/stateobjects/replacestate-in-iframe.html caused infinite loop -
trunk/WebKit/qt/Api/qwebhistory.cpp
r59660 r61056 556 556 return QWebFramePrivate::kit(lst->page()->mainFrame())->page()->handle(); 557 557 } 558 559 WebCore::HistoryItem* QWebHistoryItemPrivate::core(QWebHistoryItem* q) 560 { 561 return q->d->item; 562 } -
trunk/WebKit/qt/Api/qwebhistory.h
r50224 r61056 62 62 friend class WebCore::FrameLoaderClientQt; 63 63 friend class QWebHistoryItemPrivate; 64 friend class DumpRenderTreeSupportQt; 64 65 //friend QDataStream & operator<<(QDataStream& out,const QWebHistoryItem& hist); 65 66 //friend QDataStream & operator>>(QDataStream& in,QWebHistoryItem& hist); -
trunk/WebKit/qt/Api/qwebhistory_p.h
r48688 r61056 46 46 } 47 47 48 static WebCore::HistoryItem* core(QWebHistoryItem* q); 49 48 50 WebCore::HistoryItem* item; 49 51 }; -
trunk/WebKit/qt/ChangeLog
r61034 r61056 1 2010-06-12 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Back-forward list dumping is incorrect 6 7 https://bugs.webkit.org/show_bug.cgi?id=36392 8 9 Support dumping child history items in DRT. 10 11 Unskip: 12 13 fast/loader/frame-src-change-added-to-history.html 14 fast/loader/frame-src-change-not-added-to-history.html 15 fast/loader/frame-location-change-not-added-to-history.html 16 17 * Api/qwebhistory.cpp: 18 (QWebHistoryItemPrivate::core): 19 * Api/qwebhistory.h: 20 * Api/qwebhistory_p.h: 21 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 22 (DumpRenderTreeSupportQt::isTargetItem): 23 (DumpRenderTreeSupportQt::historyItemTarget): 24 (DumpRenderTreeSupportQt::getChildHistoryItems): 25 * WebCoreSupport/DumpRenderTreeSupportQt.h: 26 1 27 2010-06-11 Jesus Sanchez-Palencia <jesus@webkit.org> 2 28 -
trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r60917 r61056 36 36 #include "FrameView.h" 37 37 #include "GCController.h" 38 #include "HistoryItem.h" 38 39 #include "HTMLInputElement.h" 39 40 #include "InspectorController.h" … … 56 57 #include "qwebframe.h" 57 58 #include "qwebframe_p.h" 59 #include "qwebhistory.h" 60 #include "qwebhistory_p.h" 58 61 #include "qwebpage.h" 59 62 #include "qwebpage_p.h" … … 566 569 } 567 570 571 bool DumpRenderTreeSupportQt::isTargetItem(const QWebHistoryItem& historyItem) 572 { 573 QWebHistoryItem it = historyItem; 574 if (QWebHistoryItemPrivate::core(&it)->isTargetItem()) 575 return true; 576 return false; 577 } 578 579 QString DumpRenderTreeSupportQt::historyItemTarget(const QWebHistoryItem& historyItem) 580 { 581 QWebHistoryItem it = historyItem; 582 return (QWebHistoryItemPrivate::core(&it)->target()); 583 } 584 585 QList<QWebHistoryItem> DumpRenderTreeSupportQt::getChildHistoryItems(const QWebHistoryItem& historyItem) 586 { 587 QWebHistoryItem it = historyItem; 588 HistoryItem* item = QWebHistoryItemPrivate::core(&it); 589 const WebCore::HistoryItemVector& children = item->children(); 590 591 unsigned size = children.size(); 592 QList<QWebHistoryItem> kids; 593 for (unsigned i = 0; i < size; ++i) { 594 QWebHistoryItem kid(new QWebHistoryItemPrivate(children[i].get())); 595 kids.prepend(kid); 596 } 597 return kids; 598 } 599 568 600 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release 569 601 -
trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
r60566 r61056 30 30 class QWebFrame; 31 31 class QWebPage; 32 class QWebHistoryItem; 32 33 33 34 enum NotificationPermission { … … 119 120 static void setCheckPermissionFunction(CheckPermissionFunctionType*); 120 121 static void setRequestPermissionFunction(RequestPermissionFunctionType*); 122 123 static QList<QWebHistoryItem> getChildHistoryItems(const QWebHistoryItem& historyItem); 124 static bool isTargetItem(const QWebHistoryItem& historyItem); 125 static QString historyItemTarget(const QWebHistoryItem& historyItem); 126 121 127 }; 122 128 -
trunk/WebKitTools/ChangeLog
r61047 r61056 1 2010-06-12 Robert Hogan <robert@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Back-forward list dumping is incorrect 6 7 https://bugs.webkit.org/show_bug.cgi?id=36392 8 9 Support dumping child history items in DRT. 10 11 Unskip: 12 13 fast/loader/frame-src-change-added-to-history.html 14 fast/loader/frame-src-change-not-added-to-history.html 15 fast/loader/frame-location-change-not-added-to-history.html 16 17 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 18 (WebCore::dumpHistoryItem): 19 1 20 2010-06-10 Ojan Vafai <ojan@chromium.org> 2 21 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r60586 r61056 709 709 } 710 710 711 // FIXME: Wrong, need (private?) API for determining this. 712 result.append(QLatin1String(" **nav target**")); 711 QString target = DumpRenderTreeSupportQt::historyItemTarget(item); 712 if (!target.isEmpty()) 713 result.append(QString(QLatin1String(" (in frame \"%1\")")).arg(target)); 714 715 if (DumpRenderTreeSupportQt::isTargetItem(item)) 716 result.append(QLatin1String(" **nav target**")); 713 717 result.append(QLatin1String("\n")); 718 719 QList<QWebHistoryItem> children = DumpRenderTreeSupportQt::getChildHistoryItems(item); 720 for (int i = 0; i < children.size(); ++i) 721 result += dumpHistoryItem(children.at(i), 12, false); 714 722 715 723 return result;
Note: See TracChangeset
for help on using the changeset viewer.