Changeset 116505 in webkit
- Timestamp:
- May 9, 2012 1:42:14 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r116492 r116505 1 2012-05-09 Zalan Bujtas <zbujtas@gmail.com> 2 3 [Qt][WK2] Remove delayed loadDidSucceed() signaling and m_deferedUrlToLoad from QQuickWebViewPrivate 4 https://bugs.webkit.org/show_bug.cgi?id=85906 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Deferred loading activies were introduced to work around the delayed Flickable construction 9 at onComponentComplete(). QQuickWebView inherits from QQuickFlickable now, 10 so no need for the workaround anymore. 11 12 * UIProcess/API/qt/qquickwebview.cpp: 13 (QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate): 14 (QQuickWebViewFlickablePrivate::onComponentComplete): 15 (QQuickWebView::setUrl): 16 (QQuickWebView::componentComplete): 17 * UIProcess/API/qt/qquickwebview_p_p.h: 18 (QQuickWebViewPrivate::onComponentComplete): 19 (QQuickWebViewPrivate): 20 (QQuickWebViewFlickablePrivate): 21 1 22 2012-05-08 Jon Lee <jonlee@apple.com> 2 23 -
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
r116420 r116505 342 342 } 343 343 344 void QQuickWebViewPrivate::onComponentComplete()345 {346 if (m_deferedUrlToLoad.isEmpty())347 return;348 349 q_ptr->setUrl(m_deferedUrlToLoad);350 }351 352 344 void QQuickWebViewPrivate::setNeedsDisplay() 353 345 { … … 730 722 : QQuickWebViewPrivate(viewport) 731 723 , pageIsSuspended(true) 732 , loadSuccessDispatchIsPending(false)733 724 { 734 725 // Disable mouse events on the flickable web view so we do not … … 793 784 _q_resume(); 794 785 795 if (loadSuccessDispatchIsPending) {796 QQuickWebViewPrivate::loadDidSucceed();797 loadSuccessDispatchIsPending = false;798 }799 800 786 // Trigger setting of correct visibility flags after everything was allocated and initialized. 801 787 _q_onVisibleChanged(); 802 803 QQuickWebViewPrivate::onComponentComplete();804 }805 806 void QQuickWebViewFlickablePrivate::loadDidSucceed()807 {808 if (interactionEngine)809 QQuickWebViewPrivate::loadDidSucceed();810 else811 loadSuccessDispatchIsPending = true;812 788 } 813 789 … … 1457 1433 if (url.isEmpty()) 1458 1434 return; 1459 1460 if (!isComponentComplete()) {1461 d->m_deferedUrlToLoad = url;1462 return;1463 }1464 1435 1465 1436 d->webPageProxy->loadURL(url.toString()); -
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
r115862 r116505 68 68 virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0); 69 69 70 virtual void onComponentComplete() { } 71 70 72 virtual void enableMouseEvents() { } 71 73 virtual void disableMouseEvents() { } … … 75 77 76 78 virtual void loadDidSucceed(); 77 virtual void onComponentComplete();78 79 virtual void loadDidCommit() { } 79 80 virtual void didFinishFirstNonEmptyLayout() { } … … 193 194 bool m_dialogActive; 194 195 QUrl m_iconURL; 195 QUrl m_deferedUrlToLoad;196 196 }; 197 197 … … 217 217 virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0); 218 218 219 virtual void onComponentComplete(); 220 219 221 virtual QPointF pageItemPos(); 220 222 virtual void updateContentsSize(const QSizeF&); 221 223 222 virtual void loadDidSucceed();223 virtual void onComponentComplete();224 224 virtual void loadDidCommit(); 225 225 virtual void didFinishFirstNonEmptyLayout(); … … 238 238 QScopedPointer<WebKit::QtViewportInteractionEngine> interactionEngine; 239 239 bool pageIsSuspended; 240 bool loadSuccessDispatchIsPending;241 240 }; 242 241
Note: See TracChangeset
for help on using the changeset viewer.