Title: [116505] trunk/Source/WebKit2
- Revision
- 116505
- Author
- [email protected]
- Date
- 2012-05-09 01:42:14 -0700 (Wed, 09 May 2012)
Log Message
[Qt][WK2] Remove delayed loadDidSucceed() signaling and m_deferedUrlToLoad from QQuickWebViewPrivate
https://bugs.webkit.org/show_bug.cgi?id=85906
Patch by Zalan Bujtas <[email protected]> on 2012-05-09
Reviewed by Kenneth Rohde Christiansen.
Deferred loading activies were introduced to work around the delayed Flickable construction
at onComponentComplete(). QQuickWebView inherits from QQuickFlickable now,
so no need for the workaround anymore.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
(QQuickWebViewFlickablePrivate::onComponentComplete):
(QQuickWebView::setUrl):
(QQuickWebView::componentComplete):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate::onComponentComplete):
(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (116504 => 116505)
--- trunk/Source/WebKit2/ChangeLog 2012-05-09 08:34:33 UTC (rev 116504)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-09 08:42:14 UTC (rev 116505)
@@ -1,3 +1,24 @@
+2012-05-09 Zalan Bujtas <[email protected]>
+
+ [Qt][WK2] Remove delayed loadDidSucceed() signaling and m_deferedUrlToLoad from QQuickWebViewPrivate
+ https://bugs.webkit.org/show_bug.cgi?id=85906
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Deferred loading activies were introduced to work around the delayed Flickable construction
+ at onComponentComplete(). QQuickWebView inherits from QQuickFlickable now,
+ so no need for the workaround anymore.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
+ (QQuickWebViewFlickablePrivate::onComponentComplete):
+ (QQuickWebView::setUrl):
+ (QQuickWebView::componentComplete):
+ * UIProcess/API/qt/qquickwebview_p_p.h:
+ (QQuickWebViewPrivate::onComponentComplete):
+ (QQuickWebViewPrivate):
+ (QQuickWebViewFlickablePrivate):
+
2012-05-08 Jon Lee <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (116504 => 116505)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-09 08:34:33 UTC (rev 116504)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-05-09 08:42:14 UTC (rev 116505)
@@ -341,14 +341,6 @@
emit q->loadingChanged(&loadRequest);
}
-void QQuickWebViewPrivate::onComponentComplete()
-{
- if (m_deferedUrlToLoad.isEmpty())
- return;
-
- q_ptr->setUrl(m_deferedUrlToLoad);
-}
-
void QQuickWebViewPrivate::setNeedsDisplay()
{
Q_Q(QQuickWebView);
@@ -729,7 +721,6 @@
QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* viewport)
: QQuickWebViewPrivate(viewport)
, pageIsSuspended(true)
- , loadSuccessDispatchIsPending(false)
{
// Disable mouse events on the flickable web view so we do not
// select text during pan gestures on platforms which send both
@@ -792,25 +783,10 @@
_q_resume();
- if (loadSuccessDispatchIsPending) {
- QQuickWebViewPrivate::loadDidSucceed();
- loadSuccessDispatchIsPending = false;
- }
-
// Trigger setting of correct visibility flags after everything was allocated and initialized.
_q_onVisibleChanged();
-
- QQuickWebViewPrivate::onComponentComplete();
}
-void QQuickWebViewFlickablePrivate::loadDidSucceed()
-{
- if (interactionEngine)
- QQuickWebViewPrivate::loadDidSucceed();
- else
- loadSuccessDispatchIsPending = true;
-}
-
void QQuickWebViewFlickablePrivate::loadDidCommit()
{
// Due to entering provisional load before committing, we
@@ -1457,11 +1433,6 @@
if (url.isEmpty())
return;
- if (!isComponentComplete()) {
- d->m_deferedUrlToLoad = url;
- return;
- }
-
d->webPageProxy->loadURL(url.toString());
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (116504 => 116505)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-05-09 08:34:33 UTC (rev 116504)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h 2012-05-09 08:42:14 UTC (rev 116505)
@@ -67,6 +67,8 @@
virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+ virtual void onComponentComplete() { }
+
virtual void enableMouseEvents() { }
virtual void disableMouseEvents() { }
@@ -74,7 +76,6 @@
virtual void updateContentsSize(const QSizeF&) { }
virtual void loadDidSucceed();
- virtual void onComponentComplete();
virtual void loadDidCommit() { }
virtual void didFinishFirstNonEmptyLayout() { }
virtual void didChangeViewportProperties(const WebCore::ViewportAttributes& attr) { }
@@ -192,7 +193,6 @@
bool m_renderToOffscreenBuffer;
bool m_dialogActive;
QUrl m_iconURL;
- QUrl m_deferedUrlToLoad;
};
class QQuickWebViewLegacyPrivate : public QQuickWebViewPrivate {
@@ -216,11 +216,11 @@
virtual ~QQuickWebViewFlickablePrivate();
virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
+ virtual void onComponentComplete();
+
virtual QPointF pageItemPos();
virtual void updateContentsSize(const QSizeF&);
- virtual void loadDidSucceed();
- virtual void onComponentComplete();
virtual void loadDidCommit();
virtual void didFinishFirstNonEmptyLayout();
virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
@@ -237,7 +237,6 @@
private:
QScopedPointer<WebKit::QtViewportInteractionEngine> interactionEngine;
bool pageIsSuspended;
- bool loadSuccessDispatchIsPending;
};
#endif // qquickwebview_p_p_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
