Changeset 84539 in webkit
- Timestamp:
- Apr 21, 2011 12:31:03 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r84526 r84539 1 2011-04-21 Andreas Kling <andreas.kling@nokia.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt][WK2] Emit QWKPage::urlChanged() when navigating within the same document. 6 https://bugs.webkit.org/show_bug.cgi?id=59044 7 8 Hook up the didSameDocumentNavigationForFrame callback to QWKPage::urlChanged(). 9 10 * UIProcess/API/qt/ClientImpl.cpp: 11 (qt_wk_didSameDocumentNavigationForFrame): 12 * UIProcess/API/qt/ClientImpl.h: 13 * UIProcess/API/qt/qwkpage.cpp: 14 (QWKPage::QWKPage): 15 1 16 2011-04-20 Alexey Proskuryakov <ap@apple.com> 2 17 -
trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp
r84201 r84539 180 180 emit toQWKPage(clientInfo)->statusBarMessage(qText); 181 181 } 182 183 void qt_wk_didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef userData, const void* clientInfo) 184 { 185 WebFrameProxy* wkframe = toImpl(frame); 186 QString urlStr(wkframe->url()); 187 QUrl qUrl = urlStr; 188 emit toQWKPage(clientInfo)->urlChanged(qUrl); 189 QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions(); 190 } -
trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.h
r84201 r84539 44 44 void qt_wk_didBecomeUnresponsive(WKPageRef, const void* clientInfo); 45 45 void qt_wk_didBecomeResponsive(WKPageRef, const void* clientInfo); 46 void qt_wk_didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocumentNavigationType, WKTypeRef, const void* clientInfo); 46 47 47 48 // ui client -
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
r84201 r84539 433 433 qt_wk_didFinishLoadForFrame, 434 434 qt_wk_didFailLoadWithErrorForFrame, 435 0, /* didSameDocumentNavigationForFrame */435 qt_wk_didSameDocumentNavigationForFrame, 436 436 qt_wk_didReceiveTitleForFrame, 437 437 qt_wk_didFirstLayoutForFrame,
Note: See TracChangeset
for help on using the changeset viewer.