[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 41b29e440e8de0a896ad325bfeca8292d9f6ef0b
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 16:20:57 2010 +0000

    2010-09-28  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Clean up QWebPage::ViewportConfiguration API
            https://bugs.webkit.org/show_bug.cgi?id=46730
    
            - Pass QSize parameter as const-reference
            - Style fixes
    
            * Api/qwebpage.cpp:
            (QWebPage::viewportConfigurationForSize):
            * Api/qwebpage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 51e3dc3..932103d 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2363,7 +2363,7 @@ static QSize queryDeviceSizeForScreenContainingWidget(const QWidget* widget)
     both needs to be set.
 */
 
-QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(QSize availableSize) const
+QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSize& availableSize) const
 {
     static int desktopWidth = 980;
     static int deviceDPI = 160;
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index a20074f..e71e3da 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -217,13 +217,13 @@ public:
 
         QWebPage::ViewportConfiguration& operator=(const QWebPage::ViewportConfiguration& other);
 
-        inline qreal initialScaleFactor() const { return m_initialScaleFactor; };
-        inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; };
-        inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; };
-        inline qreal devicePixelRatio() const { return m_devicePixelRatio; };
-        inline bool isUserScalable() const { return m_isUserScalable; };
-        inline bool isValid() const { return m_isValid; };
-        inline QSize size() const { return m_size; };
+        inline qreal initialScaleFactor() const { return m_initialScaleFactor; }
+        inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; }
+        inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; }
+        inline qreal devicePixelRatio() const { return m_devicePixelRatio; }
+        inline bool isUserScalable() const { return m_isUserScalable; }
+        inline bool isValid() const { return m_isValid; }
+        inline QSize size() const { return m_size; }
 
     private:
         QSharedDataPointer<QtViewportConfigurationPrivate> d;
@@ -276,7 +276,7 @@ public:
 
     QSize viewportSize() const;
     void setViewportSize(const QSize &size) const;
-    ViewportConfiguration viewportConfigurationForSize(QSize availableSize) const;
+    ViewportConfiguration viewportConfigurationForSize(const QSize& availableSize) const;
 
     QSize preferredContentsSize() const;
     void setPreferredContentsSize(const QSize &size) const;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 03263f4..1bd75e2 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-28  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Clean up QWebPage::ViewportConfiguration API
+        https://bugs.webkit.org/show_bug.cgi?id=46730
+
+        - Pass QSize parameter as const-reference
+        - Style fixes
+
+        * Api/qwebpage.cpp:
+        (QWebPage::viewportConfigurationForSize):
+        * Api/qwebpage.h:
+
 2010-09-28  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.

-- 
WebKit Debian packaging