Title: [143935] trunk/Source/WebKit2
- Revision
- 143935
- Author
- abe...@webkit.org
- Date
- 2013-02-25 09:14:01 -0800 (Mon, 25 Feb 2013)
Log Message
[Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients
https://bugs.webkit.org/show_bug.cgi?id=110751
Reviewed by Jocelyn Turcotte.
This is a clean-up in the PageViewportController clients that removes leftover
code from previous design that is partially unused and unnecessary, to simplify
the interaction between PageViewportController and clients.
* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::resumeContent):
* UIProcess/PageViewportControllerClient.h:
(PageViewportControllerClient):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
* UIProcess/efl/PageViewportControllerClientEfl.h:
(PageViewportControllerClientEfl):
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::animateContentRectVisible):
(WebKit::PageViewportControllerClientQt::flickMoveEnded):
(WebKit::PageViewportControllerClientQt::resumeAndUpdateContent):
(WebKit::PageViewportControllerClientQt::pinchGestureCancelled):
* UIProcess/qt/PageViewportControllerClientQt.h:
(PageViewportControllerClientQt):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (143934 => 143935)
--- trunk/Source/WebKit2/ChangeLog 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-25 17:14:01 UTC (rev 143935)
@@ -1,3 +1,29 @@
+2013-02-25 Andras Becsi <andras.be...@digia.com>
+
+ [Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients
+ https://bugs.webkit.org/show_bug.cgi?id=110751
+
+ Reviewed by Jocelyn Turcotte.
+
+ This is a clean-up in the PageViewportController clients that removes leftover
+ code from previous design that is partially unused and unnecessary, to simplify
+ the interaction between PageViewportController and clients.
+
+ * UIProcess/PageViewportController.cpp:
+ (WebKit::PageViewportController::resumeContent):
+ * UIProcess/PageViewportControllerClient.h:
+ (PageViewportControllerClient):
+ * UIProcess/efl/PageViewportControllerClientEfl.cpp:
+ * UIProcess/efl/PageViewportControllerClientEfl.h:
+ (PageViewportControllerClientEfl):
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ (WebKit::PageViewportControllerClientQt::animateContentRectVisible):
+ (WebKit::PageViewportControllerClientQt::flickMoveEnded):
+ (WebKit::PageViewportControllerClientQt::resumeAndUpdateContent):
+ (WebKit::PageViewportControllerClientQt::pinchGestureCancelled):
+ * UIProcess/qt/PageViewportControllerClientQt.h:
+ (PageViewportControllerClientQt):
+
2013-02-25 Andreas Kling <akl...@apple.com>
Reduce amount of code that includes StylePropertySet.h
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2013-02-25 17:14:01 UTC (rev 143935)
@@ -316,8 +316,6 @@
void PageViewportController::resumeContent()
{
- m_client->didResumeContent();
-
if (!m_hasSuspendedContent)
return;
Modified: trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/PageViewportControllerClient.h 2013-02-25 17:14:01 UTC (rev 143935)
@@ -41,7 +41,6 @@
virtual void setViewportPosition(const WebCore::FloatPoint& contentsPoint) = 0;
virtual void setPageScaleFactor(float) = 0;
- virtual void didResumeContent() = 0;
virtual void didChangeContentsSize(const WebCore::IntSize&) = 0;
virtual void didChangeVisibleContents() = 0;
virtual void didChangeViewportAttributes() = 0;
Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp 2013-02-25 17:14:01 UTC (rev 143935)
@@ -63,12 +63,6 @@
m_view->setPageScaleFactor(newScale);
}
-void PageViewportControllerClientEfl::didResumeContent()
-{
- ASSERT(m_controller);
- m_controller->didChangeContentsVisibility(m_contentPosition, m_view->pageScaleFactor());
-}
-
void PageViewportControllerClientEfl::didChangeVisibleContents()
{
m_view->scheduleUpdateDisplay();
Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h 2013-02-25 17:14:01 UTC (rev 143935)
@@ -46,7 +46,6 @@
virtual void setViewportPosition(const WebCore::FloatPoint&) OVERRIDE;
virtual void setPageScaleFactor(float) OVERRIDE;
- virtual void didResumeContent() OVERRIDE;
virtual void didChangeContentsSize(const WebCore::IntSize&) OVERRIDE;
virtual void didChangeVisibleContents() OVERRIDE;
virtual void didChangeViewportAttributes() OVERRIDE;
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2013-02-25 17:14:01 UTC (rev 143935)
@@ -103,7 +103,7 @@
QRectF viewportRectInContentCoords = m_viewportItem->mapRectToWebContent(m_viewportItem->boundingRect());
if (contentRect == viewportRectInContentCoords) {
- m_controller->resumeContent();
+ resumeAndUpdateContent();
return;
}
@@ -131,7 +131,7 @@
// This method is called on the end of the pan or pan kinetic animation.
if (!m_isUserInteracting)
- m_controller->resumeContent();
+ resumeAndUpdateContent();
}
void PageViewportControllerClientQt::pageItemPositionChanged()
@@ -333,8 +333,9 @@
updateViewportController();
}
-void PageViewportControllerClientQt::didResumeContent()
+void PageViewportControllerClientQt::resumeAndUpdateContent()
{
+ m_controller->resumeContent();
// Make sure that tiles all around the viewport will be requested.
updateViewportController();
}
@@ -467,7 +468,7 @@
void PageViewportControllerClientQt::pinchGestureCancelled()
{
m_pinchStartScale = -1;
- m_controller->resumeContent();
+ resumeAndUpdateContent();
}
void PageViewportControllerClientQt::didChangeContentsSize(const IntSize& newSize)
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h (143934 => 143935)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2013-02-25 17:05:25 UTC (rev 143934)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.h 2013-02-25 17:14:01 UTC (rev 143935)
@@ -50,7 +50,6 @@
virtual void setViewportPosition(const WebCore::FloatPoint& contentsPoint);
virtual void setPageScaleFactor(float);
- virtual void didResumeContent();
virtual void didChangeContentsSize(const WebCore::IntSize&);
virtual void didChangeVisibleContents();
virtual void didChangeViewportAttributes();
@@ -129,6 +128,7 @@
void animateContentRectVisible(const QRectF& contentRect);
void scaleContent(qreal itemScale, const QPointF& centerInCSSCoordinates = QPointF());
void clearRelativeZoomState();
+ void resumeAndUpdateContent();
ScaleAnimation* m_scaleAnimation;
QPointF m_lastPinchCenterInViewportCoordinates;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
