Title: [112265] trunk/Source/WebKit2
- Revision
- 112265
- Author
- [email protected]
- Date
- 2012-03-27 07:42:47 -0700 (Tue, 27 Mar 2012)
Log Message
[Qt][WK2] Merge setVisibleContentsRect with setFixedVisibleContentRect
https://bugs.webkit.org/show_bug.cgi?id=82289
Reviewed by Kenneth Rohde Christiansen.
As we scroll, we constantly send 2 messages. Those 2 messages can be merged into one.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::_q_contentViewportChanged):
* UIProcess/WebPageProxy.cpp:
(WebKit):
* UIProcess/WebPageProxy.h:
(WebPageProxy):
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
(WebKit::LayerTreeHostQt::setVisibleContentsRect):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (112264 => 112265)
--- trunk/Source/WebKit2/ChangeLog 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-27 14:42:47 UTC (rev 112265)
@@ -1,3 +1,22 @@
+2012-03-27 Yael Aharon <[email protected]>
+
+ [Qt][WK2] Merge setVisibleContentsRect with setFixedVisibleContentRect
+ https://bugs.webkit.org/show_bug.cgi?id=82289
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ As we scroll, we constantly send 2 messages. Those 2 messages can be merged into one.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::_q_contentViewportChanged):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit):
+ * UIProcess/WebPageProxy.h:
+ (WebPageProxy):
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+ (WebKit::LayerTreeHostQt::setVisibleContentsRect):
+
2012-03-27 Carlos Garcia Campos <[email protected]>
[SOUP] Implement missing methods in CookieJarSoup
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (112264 => 112265)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-27 14:42:47 UTC (rev 112265)
@@ -642,7 +642,6 @@
float scale = pageView->contentsScale();
drawingArea->setVisibleContentsRect(visibleRect, scale, trajectoryVector);
- webPageProxy->setFixedVisibleContentRect(visibleRect);
}
void QQuickWebViewFlickablePrivate::_q_suspend()
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (112264 => 112265)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-27 14:42:47 UTC (rev 112265)
@@ -844,14 +844,6 @@
}
#if USE(TILED_BACKING_STORE)
-void WebPageProxy::setFixedVisibleContentRect(const IntRect& rect)
-{
- if (!isValid())
- return;
-
- process()->send(Messages::WebPage::SetFixedVisibleContentRect(rect), m_pageID);
-}
-
void WebPageProxy::setViewportSize(const IntSize& size)
{
if (!isValid())
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (112264 => 112265)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-03-27 14:42:47 UTC (rev 112265)
@@ -378,7 +378,6 @@
PlatformWidget viewWidget();
#endif
#if USE(TILED_BACKING_STORE)
- void setFixedVisibleContentRect(const WebCore::IntRect&);
void setViewportSize(const WebCore::IntSize&);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (112264 => 112265)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-03-27 14:42:47 UTC (rev 112265)
@@ -105,7 +105,6 @@
ResumeActiveDOMObjectsAndAnimations()
#if USE(TILED_BACKING_STORE)
- SetFixedVisibleContentRect(WebCore::IntRect rect)
SetViewportSize(WebCore::IntSize size)
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (112264 => 112265)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-03-27 14:32:49 UTC (rev 112264)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-03-27 14:42:47 UTC (rev 112265)
@@ -443,6 +443,8 @@
}
scheduleLayerFlush();
+ if (m_webPage->useFixedLayout())
+ m_webPage->setFixedVisibleContentRect(rect);
}
void LayerTreeHostQt::renderNextFrame()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
