Title: [90694] trunk/Source/WebKit2
- Revision
- 90694
- Author
- commit-qu...@webkit.org
- Date
- 2011-07-10 11:33:56 -0700 (Sun, 10 Jul 2011)
Log Message
[Qt][WK2] Move setResizesToContentsUsingLayoutSize() to the touch specific page proxy
https://bugs.webkit.org/show_bug.cgi?id=64238
Patch by Benjamin Poulain <benja...@webkit.org> on 2011-07-10
Reviewed by Andreas Kling.
The method is specific to the touch view, so it should be in QTouchWebPageProxy instead
of QtWebPageProxy.
* UIProcess/qt/QtWebPageProxy.cpp:
* UIProcess/qt/QtWebPageProxy.h:
* UIProcess/qt/qtouchwebpageproxy.cpp:
(QTouchWebPageProxy::setResizesToContentsUsingLayoutSize):
* UIProcess/qt/qtouchwebpageproxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90693 => 90694)
--- trunk/Source/WebKit2/ChangeLog 2011-07-10 18:04:07 UTC (rev 90693)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-10 18:33:56 UTC (rev 90694)
@@ -1,3 +1,19 @@
+2011-07-10 Benjamin Poulain <benja...@webkit.org>
+
+ [Qt][WK2] Move setResizesToContentsUsingLayoutSize() to the touch specific page proxy
+ https://bugs.webkit.org/show_bug.cgi?id=64238
+
+ Reviewed by Andreas Kling.
+
+ The method is specific to the touch view, so it should be in QTouchWebPageProxy instead
+ of QtWebPageProxy.
+
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ * UIProcess/qt/QtWebPageProxy.h:
+ * UIProcess/qt/qtouchwebpageproxy.cpp:
+ (QTouchWebPageProxy::setResizesToContentsUsingLayoutSize):
+ * UIProcess/qt/qtouchwebpageproxy.h:
+
2011-07-09 Noel Gordon <noel.gor...@gmail.com>
Reviewed by Adam Roben.
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (90693 => 90694)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-10 18:04:07 UTC (rev 90693)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-10 18:33:56 UTC (rev 90694)
@@ -619,11 +619,6 @@
return m_history;
}
-void QtWebPageProxy::setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize)
-{
- m_webPageProxy->setResizesToContentsUsingLayoutSize(targetLayoutSize);
-}
-
void QtWebPageProxy::triggerAction(WebAction webAction, bool)
{
switch (webAction) {
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (90693 => 90694)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-10 18:04:07 UTC (rev 90693)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-10 18:33:56 UTC (rev 90694)
@@ -171,8 +171,6 @@
void setActualVisibleContentsRect(const QRect& rect) const;
- void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
-
QAction* navigationAction(QtWebKit::NavigationAction) const;
QAction* action(WebAction action) const;
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp (90693 => 90694)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-10 18:04:07 UTC (rev 90693)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-10 18:33:56 UTC (rev 90694)
@@ -81,6 +81,11 @@
return QtWebPageProxy::handleEvent(ev);
}
+void QTouchWebPageProxy::setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize)
+{
+ m_webPageProxy->setResizesToContentsUsingLayoutSize(targetLayoutSize);
+}
+
void QTouchWebPageProxy::touchEvent(QTouchEvent* event)
{
#if ENABLE(TOUCH_EVENTS)
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h (90693 => 90694)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-10 18:04:07 UTC (rev 90693)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-10 18:33:56 UTC (rev 90694)
@@ -38,6 +38,8 @@
virtual bool handleEvent(QEvent*);
+ void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
+
protected:
virtual void paintContent(QPainter* painter, const QRect& area);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
