Changeset 109106 in webkit
- Timestamp:
- Feb 28, 2012 8:11:56 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r109096 r109106 1 2012-02-27 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> 2 3 [Qt] API changes to QWebNavigationRequest 4 https://bugs.webkit.org/show_bug.cgi?id=78821 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Changes discussed in API review at Szeged: rename 'button' to 'mouseButton', 9 rename 'modifiers' to 'keyboardModifiers', remove 'originatingUrl' and 10 use the enum type for 'action'. 11 12 * UIProcess/API/qt/qwebnavigationrequest.cpp: 13 (QWebNavigationRequestPrivate::QWebNavigationRequestPrivate): 14 (QWebNavigationRequestPrivate): 15 (QWebNavigationRequest::QWebNavigationRequest): 16 (QWebNavigationRequest::setAction): 17 (QWebNavigationRequest::mouseButton): 18 (QWebNavigationRequest::keyboardModifiers): 19 (QWebNavigationRequest::action): 20 * UIProcess/API/qt/qwebnavigationrequest_p.h: 21 * UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp: 22 * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml: 23 * UIProcess/qt/QtWebPagePolicyClient.cpp: 24 (QtWebPagePolicyClient::decidePolicyForNavigationAction): 25 * UIProcess/qt/QtWebPagePolicyClient.h: 26 (QtWebPagePolicyClient): 27 1 28 2012-02-28 Shinya Kawanaka <shinyak@chromium.org> 2 29 -
trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp
r108614 r109106 26 26 class QWebNavigationRequestPrivate { 27 27 public: 28 QWebNavigationRequestPrivate(const QUrl& url, const QUrl& originatingUrl, Qt::MouseButton button, 29 Qt::KeyboardModifiers modifiers, QQuickWebView::NavigationType navigationType) 28 QWebNavigationRequestPrivate(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType) 30 29 : url(url) 31 , originatingUrl(originatingUrl) 32 , button(button) 33 , modifiers(modifiers) 30 , mouseButton(mouseButton) 31 , keyboardModifiers(keyboardModifiers) 34 32 , action(QQuickWebView::AcceptRequest) 35 33 , navigationType(navigationType) … … 42 40 43 41 QUrl url; 44 QUrl originatingUrl; 45 Qt::MouseButton button; 46 Qt::KeyboardModifiers modifiers; 47 int action; 42 Qt::MouseButton mouseButton; 43 Qt::KeyboardModifiers keyboardModifiers; 44 QQuickWebView::NavigationRequestAction action; 48 45 QQuickWebView::NavigationType navigationType; 49 46 }; 50 47 51 QWebNavigationRequest::QWebNavigationRequest(const QUrl& url, const QUrl& originatingUrl, Qt::MouseButton button, 52 Qt::KeyboardModifiers modifiers, QQuickWebView::NavigationType navigationType, QObject* parent) 48 QWebNavigationRequest::QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, QObject* parent) 53 49 : QObject(parent) 54 , d(new QWebNavigationRequestPrivate(url, originatingUrl, button, modifiers, navigationType))50 , d(new QWebNavigationRequestPrivate(url, mouseButton, keyboardModifiers, navigationType)) 55 51 { 56 52 } … … 61 57 } 62 58 63 void QWebNavigationRequest::setAction( intaction)59 void QWebNavigationRequest::setAction(QQuickWebView::NavigationRequestAction action) 64 60 { 65 61 if (d->action == action) … … 75 71 } 76 72 77 QUrl QWebNavigationRequest::originatingUrl() const73 int QWebNavigationRequest::mouseButton() const 78 74 { 79 return d->originatingUrl;75 return int(d->mouseButton); 80 76 } 81 77 82 int QWebNavigationRequest:: button() const78 int QWebNavigationRequest::keyboardModifiers() const 83 79 { 84 return int(d-> button);80 return int(d->keyboardModifiers); 85 81 } 86 82 87 int QWebNavigationRequest::modifiers() const83 QQuickWebView::NavigationRequestAction QWebNavigationRequest::action() const 88 84 { 89 return int(d->modifiers); 90 } 91 92 int QWebNavigationRequest::action() const 93 { 94 return int(d->action); 85 return d->action; 95 86 } 96 87 -
trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h
r108614 r109106 32 32 Q_OBJECT 33 33 Q_PROPERTY(QUrl url READ url CONSTANT FINAL) 34 Q_PROPERTY(QUrl originatingUrl READ originatingUrl CONSTANT FINAL) 35 Q_PROPERTY(int button READ button CONSTANT FINAL) 36 Q_PROPERTY(int modifiers READ modifiers CONSTANT FINAL) 37 Q_PROPERTY(int action READ action WRITE setAction NOTIFY actionChanged FINAL) 34 Q_PROPERTY(int mouseButton READ mouseButton CONSTANT FINAL) 35 Q_PROPERTY(int keyboardModifiers READ keyboardModifiers CONSTANT FINAL) 36 Q_PROPERTY(QQuickWebView::NavigationRequestAction action READ action WRITE setAction NOTIFY actionChanged FINAL) 38 37 Q_PROPERTY(QQuickWebView::NavigationType navigationType READ navigationType CONSTANT FINAL) 39 38 40 39 public: 41 QWebNavigationRequest(const QUrl& url, const QUrl& originatingUrl, Qt::MouseButton button, Qt::KeyboardModifiers modifiers, 42 QQuickWebView::NavigationType navigationType, QObject* parent = 0); 40 QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, QObject* parent = 0); 43 41 ~QWebNavigationRequest(); 44 42 45 43 QUrl url() const; 46 QUrl originatingUrl() const; 47 int button() const; 48 int modifiers() const; 49 int action() const; 44 int mouseButton() const; 45 int keyboardModifiers() const; 46 QQuickWebView::NavigationRequestAction action() const; 50 47 51 void setAction( intaction);48 void setAction(QQuickWebView::NavigationRequestAction action); 52 49 QQuickWebView::NavigationType navigationType() const; 53 50 -
trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp
r108889 r109106 84 84 << "QWebLoadRequest.errorCode --> int" 85 85 << "QWebNavigationRequest.url --> QUrl" 86 << "QWebNavigationRequest.originatingUrl --> QUrl" 87 << "QWebNavigationRequest.button --> int" 88 << "QWebNavigationRequest.modifiers --> int" 89 << "QWebNavigationRequest.action --> int" 86 << "QWebNavigationRequest.mouseButton --> int" 87 << "QWebNavigationRequest.keyboardModifiers --> int" 88 << "QWebNavigationRequest.action --> QQuickWebView::NavigationRequestAction" 90 89 << "QWebNavigationRequest.navigationType --> QQuickWebView::NavigationType" 91 90 << "QWebNavigationRequest.actionChanged() --> void" -
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_navigationRequested.qml
r108815 r109106 9 9 property int totalBytes: 0 10 10 property bool shouldDownload: false 11 property string originatingUrl: ""12 11 property url beginUrl: Qt.resolvedUrl("../common/test2.html") 13 12 property url endUrl: Qt.resolvedUrl("../common/test1.html") … … 23 22 if (shouldDownload) 24 23 request.action = WebViewExperimental.DownloadRequest 25 else if (request. button == Qt.MiddleButton && request.modifiers & Qt.ControlModifier) {24 else if (request.mouseButton == Qt.MiddleButton && request.keyboardModifiers & Qt.ControlModifier) { 26 25 otherWebView.load(request.url) 27 26 request.action = WebView.IgnoreRequest 28 27 } 29 originatingUrl = request.originatingUrl30 28 } 31 29 … … 79 77 downloadFinishedSpy.clear() 80 78 shouldDownload = false 81 originatingUrl = ""82 79 } 83 80 … … 116 113 compare(totalBytes, expectedLength) 117 114 } 118 119 function test_originatingUrl() {120 webView.load(beginUrl)121 verify(webView.waitForLoadSucceeded())122 mouseClick(webView, 100, 100, Qt.LeftButton)123 verify(webView.waitForLoadSucceeded())124 compare(webView.title, "Test page 1")125 compare(webView.url, endUrl)126 compare(originatingUrl, beginUrl)127 }128 115 } 129 116 } -
trunk/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp
r108614 r109106 42 42 } 43 43 44 void QtWebPagePolicyClient::decidePolicyForNavigationAction(const QUrl& url, const QUrl& originatingUrl, Qt::MouseButton mouseButton, 45 Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, WKFramePolicyListenerRef listener) 44 void QtWebPagePolicyClient::decidePolicyForNavigationAction(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, WKFramePolicyListenerRef listener) 46 45 { 47 46 // NOTE: even though the C API (and the WebKit2 IPC) supports an asynchronous answer, this is not currently working. 48 47 // We are expected to call the listener immediately. See the patch for https://bugs.webkit.org/show_bug.cgi?id=53785. 49 QWebNavigationRequest navigationRequest(url, originatingUrl,mouseButton, keyboardModifiers, navigationType);48 QWebNavigationRequest navigationRequest(url, mouseButton, keyboardModifiers, navigationType); 50 49 emit m_webView->navigationRequested(&navigationRequest); 51 50 … … 124 123 WKRetainPtr<WKURLRef> frameURL(AdoptWK, WKFrameCopyURL(frame)); 125 124 WKRetainPtr<WKURLRef> requestURL(AdoptWK, WKURLRequestCopyURL(request)); 126 QUrl qUrlFrame = WKURLCopyQUrl(frameURL.get());127 125 QUrl qUrl = WKURLCopyQUrl(requestURL.get()); 128 toQtWebPagePolicyClient(clientInfo)->decidePolicyForNavigationAction(qUrl, qUrlFrame,toQtMouseButton(mouseButton), toQtKeyboardModifiers(modifiers), toQuickWebViewNavigationType(navigationType), listener);126 toQtWebPagePolicyClient(clientInfo)->decidePolicyForNavigationAction(qUrl, toQtMouseButton(mouseButton), toQtKeyboardModifiers(modifiers), toQuickWebViewNavigationType(navigationType), listener); 129 127 } 130 128 -
trunk/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.h
r108614 r109106 32 32 33 33 private: 34 void decidePolicyForNavigationAction(const QUrl&, const QUrl&,Qt::MouseButton, Qt::KeyboardModifiers, QQuickWebView::NavigationType, WKFramePolicyListenerRef);34 void decidePolicyForNavigationAction(const QUrl&, Qt::MouseButton, Qt::KeyboardModifiers, QQuickWebView::NavigationType, WKFramePolicyListenerRef); 35 35 36 36 // WKPagePolicyClient callbacks.
Note: See TracChangeset
for help on using the changeset viewer.