[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:20:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5e10ea5fdb10e91f8f153c0cdae77e65123beb30
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 15:33:38 2010 +0000
2010-11-01 Andreas Kling <kling at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt][WK2] Cleanup viewportAttributesForSize API
Change QSize argument to a const QSize&.
* UIProcess/API/qt/qwkpage.cpp:
(QWKPage::viewportAttributesForSize):
* UIProcess/API/qt/qwkpage.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71029 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 20dbe49..5fb7372 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt][WK2] Cleanup viewportAttributesForSize API
+
+ Change QSize argument to a const QSize&.
+
+ * UIProcess/API/qt/qwkpage.cpp:
+ (QWKPage::viewportAttributesForSize):
+ * UIProcess/API/qt/qwkpage.h:
+
2010-10-31 Darin Adler <darin at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index edb9699..67603b0 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -388,7 +388,7 @@ QWKPage::ViewportAttributes& QWKPage::ViewportAttributes::operator=(const QWKPag
return *this;
}
-QWKPage::ViewportAttributes QWKPage::viewportAttributesForSize(QSize availableSize) const
+QWKPage::ViewportAttributes QWKPage::viewportAttributesForSize(const QSize& availableSize) const
{
static int desktopWidth = 980;
static int deviceDPI = 160;
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index 9b3e4ef..a33cb1b 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -80,7 +80,7 @@ public:
QString title() const;
void setViewportSize(const QSize&);
- ViewportAttributes viewportAttributesForSize(QSize availableSize) const;
+ ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const;
QAction* action(WebAction action) const;
void triggerAction(WebAction action, bool checked = false);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list