1 files changed, 12 insertions, 10 deletions

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index dda4a6a..b1441ff 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -48,7 +48,7 @@ class QWebHitTestResult;
 class QWebNetworkInterface;
 class QWebPagePrivate;
 class QWebPluginFactory;
-class QtViewportHintsPrivate;
+class QtViewportConfigurationPrivate;
 
 namespace WebCore {
     class ChromeClientQt;
@@ -207,34 +207,35 @@ public:
         GeolocationPermissionDomain
     };
 
-    class ViewportHints {
+    class ViewportConfiguration {
     public:
-        ViewportHints();
-        ViewportHints(const QWebPage::ViewportHints& other);
+        ViewportConfiguration();
+        ViewportConfiguration(const QWebPage::ViewportConfiguration& other);
 
-        ~ViewportHints();
+        ~ViewportConfiguration();
 
-        QWebPage::ViewportHints& operator=(const QWebPage::ViewportHints& other);
+        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 int targetDensityDpi() const { return m_targetDensityDpi; };
+        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<QtViewportHintsPrivate> d;
+        QSharedDataPointer<QtViewportConfigurationPrivate> d;
         qreal m_initialScaleFactor;
         qreal m_minimumScaleFactor;
         qreal m_maximumScaleFactor;
-        int m_targetDensityDpi;
+        qreal m_devicePixelRatio;
         bool m_isUserScalable;
         bool m_isValid;
         QSize m_size;
 
         friend class WebCore::ChromeClientQt;
+        friend class QWebPage;
     };
 
 
@@ -274,6 +275,7 @@ public:
 
     QSize viewportSize() const;
     void setViewportSize(const QSize &size) const;
+    ViewportConfiguration viewportConfigurationForSize(QSize availableSize) const;
 
     QSize preferredContentsSize() const;
     void setPreferredContentsSize(const QSize &size) const;
@@ -384,7 +386,7 @@ Q_SIGNALS:
     void saveFrameStateRequested(QWebFrame* frame, QWebHistoryItem* item);
     void restoreFrameStateRequested(QWebFrame* frame);
 
-    void viewportChangeRequested(const QWebPage::ViewportHints& hints);
+    void viewportChangeRequested();
 
     void requestPermissionFromUser(QWebFrame* frame, QWebPage::PermissionDomain domain);
     void checkPermissionFromUser(QWebFrame* frame, QWebPage::PermissionDomain domain, QWebPage::PermissionPolicy& policy);