[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:23:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6925e844494bd20fb5431a48003025a09f32c655
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 7 19:41:44 2010 +0000
2010-10-07 Andreas Kling <kling at webkit.org>
Reviewed by Simon Hausmann.
[Qt] API: ViewportConfiguration => ViewportArguments
https://bugs.webkit.org/show_bug.cgi?id=47325
* Api/qwebpage.cpp:
(QWebPage::ViewportAttributes::ViewportAttributes):
(QWebPage::ViewportAttributes::~ViewportAttributes):
(QWebPage::ViewportAttributes::operator=):
(QWebPage::viewportAttributesForSize):
* Api/qwebpage.h:
* Api/qwebpage_p.h:
(QtViewportAttributesPrivate::QtViewportAttributesPrivate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69331 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index e9699d7..a9ab02d 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1572,15 +1572,15 @@ quint16 QWebPagePrivate::inspectorServerPort()
/*!
- \class QWebPage::ViewportConfiguration
+ \class QWebPage::ViewportAttributes
\since 4.7
- \brief The QWebPage::ViewportConfiguration class describes hints that can be applied to a viewport.
+ \brief The QWebPage::ViewportAttributes class describes hints that can be applied to a viewport.
- QWebPage::ViewportConfiguration provides a description of a viewport, such as viewport geometry,
+ QWebPage::ViewportAttributes provides a description of a viewport, such as viewport geometry,
initial scale factor with limits, plus information about whether a user should be able
to scale the contents in the viewport or not, ie. by zooming.
- ViewportConfiguration can be set by a web author using the viewport meta tag extension, documented
+ ViewportAttributes can be set by a web author using the viewport meta tag extension, documented
at \l{http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html}{Safari Reference Library: Using the Viewport Meta Tag}.
All values might not be set, as such when dealing with the hints, the developer needs to
@@ -1590,9 +1590,9 @@ quint16 QWebPagePrivate::inspectorServerPort()
*/
/*!
- Constructs an empty QWebPage::ViewportConfiguration.
+ Constructs an empty QWebPage::ViewportAttributes.
*/
-QWebPage::ViewportConfiguration::ViewportConfiguration()
+QWebPage::ViewportAttributes::ViewportAttributes()
: d(0)
, m_initialScaleFactor(-1.0)
, m_minimumScaleFactor(-1.0)
@@ -1605,9 +1605,9 @@ QWebPage::ViewportConfiguration::ViewportConfiguration()
}
/*!
- Constructs a QWebPage::ViewportConfiguration which is a copy from \a other .
+ Constructs a QWebPage::ViewportAttributes which is a copy from \a other .
*/
-QWebPage::ViewportConfiguration::ViewportConfiguration(const QWebPage::ViewportConfiguration& other)
+QWebPage::ViewportAttributes::ViewportAttributes(const QWebPage::ViewportAttributes& other)
: d(other.d)
, m_initialScaleFactor(other.m_initialScaleFactor)
, m_minimumScaleFactor(other.m_minimumScaleFactor)
@@ -1621,18 +1621,18 @@ QWebPage::ViewportConfiguration::ViewportConfiguration(const QWebPage::ViewportC
}
/*!
- Destroys the QWebPage::ViewportConfiguration.
+ Destroys the QWebPage::ViewportAttributes.
*/
-QWebPage::ViewportConfiguration::~ViewportConfiguration()
+QWebPage::ViewportAttributes::~ViewportAttributes()
{
}
/*!
- Assigns the given QWebPage::ViewportConfiguration to this viewport hints and returns a
+ Assigns the given QWebPage::ViewportAttributes to this viewport hints and returns a
reference to this.
*/
-QWebPage::ViewportConfiguration& QWebPage::ViewportConfiguration::operator=(const QWebPage::ViewportConfiguration& other)
+QWebPage::ViewportAttributes& QWebPage::ViewportAttributes::operator=(const QWebPage::ViewportAttributes& other)
{
if (this != &other) {
d = other.d;
@@ -1647,30 +1647,30 @@ QWebPage::ViewportConfiguration& QWebPage::ViewportConfiguration::operator=(cons
return *this;
}
-/*! \fn inline bool QWebPage::ViewportConfiguration::isValid() const
- Returns whether this is a valid ViewportConfiguration or not.
+/*! \fn inline bool QWebPage::ViewportAttributes::isValid() const
+ Returns whether this is a valid ViewportAttributes or not.
- An invalid ViewportConfiguration will have an empty QSize, negative values for scale factors and
+ An invalid ViewportAttributes will have an empty QSize, negative values for scale factors and
true for the boolean isUserScalable.
*/
-/*! \fn inline QSize QWebPage::ViewportConfiguration::size() const
+/*! \fn inline QSize QWebPage::ViewportAttributes::size() const
Returns the size of the viewport.
*/
-/*! \fn inline qreal QWebPage::ViewportConfiguration::initialScaleFactor() const
+/*! \fn inline qreal QWebPage::ViewportAttributes::initialScaleFactor() const
Returns the initial scale of the viewport as a multiplier.
*/
-/*! \fn inline qreal QWebPage::ViewportConfiguration::minimumScaleFactor() const
+/*! \fn inline qreal QWebPage::ViewportAttributes::minimumScaleFactor() const
Returns the minimum scale value of the viewport as a multiplier.
*/
-/*! \fn inline qreal QWebPage::ViewportConfiguration::maximumScaleFactor() const
+/*! \fn inline qreal QWebPage::ViewportAttributes::maximumScaleFactor() const
Returns the maximum scale value of the viewport as a multiplier.
*/
-/*! \fn inline bool QWebPage::ViewportConfiguration::isUserScalable() const
+/*! \fn inline bool QWebPage::ViewportAttributes::isUserScalable() const
Determines whether or not the scale can be modified by the user.
*/
@@ -2233,12 +2233,12 @@ static QSize queryDeviceSizeForScreenContainingWidget(const QWidget* widget)
both needs to be set.
*/
-QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSize& availableSize) const
+QWebPage::ViewportAttributes QWebPage::viewportAttributesForSize(const QSize& availableSize) const
{
static int desktopWidth = 980;
static int deviceDPI = 160;
- ViewportConfiguration result;
+ ViewportAttributes result;
int deviceWidth = getintenv("QTWEBKIT_DEVICE_WIDTH");
int deviceHeight = getintenv("QTWEBKIT_DEVICE_HEIGHT");
@@ -3647,7 +3647,7 @@ quint64 QWebPage::bytesReceived() const
Page authors can provide the supplied values by using the viewport meta tag. More information
about this can be found at \l{http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html}{Safari Reference Library: Using the Viewport Meta Tag}.
- \sa QWebPage::ViewportConfiguration, setPreferredContentsSize(), QGraphicsWebView::setScale()
+ \sa QWebPage::ViewportAttributes, setPreferredContentsSize(), QGraphicsWebView::setScale()
*/
/*!
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index e71e3da..410c689 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 QtViewportConfigurationPrivate;
+class QtViewportAttributesPrivate;
namespace WebCore {
class ChromeClientQt;
@@ -208,14 +208,14 @@ public:
GeolocationPermissionDomain
};
- class ViewportConfiguration {
+ class ViewportAttributes {
public:
- ViewportConfiguration();
- ViewportConfiguration(const QWebPage::ViewportConfiguration& other);
+ ViewportAttributes();
+ ViewportAttributes(const QWebPage::ViewportAttributes& other);
- ~ViewportConfiguration();
+ ~ViewportAttributes();
- QWebPage::ViewportConfiguration& operator=(const QWebPage::ViewportConfiguration& other);
+ QWebPage::ViewportAttributes& operator=(const QWebPage::ViewportAttributes& other);
inline qreal initialScaleFactor() const { return m_initialScaleFactor; }
inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; }
@@ -226,7 +226,7 @@ public:
inline QSize size() const { return m_size; }
private:
- QSharedDataPointer<QtViewportConfigurationPrivate> d;
+ QSharedDataPointer<QtViewportAttributesPrivate> d;
qreal m_initialScaleFactor;
qreal m_minimumScaleFactor;
qreal m_maximumScaleFactor;
@@ -276,7 +276,7 @@ public:
QSize viewportSize() const;
void setViewportSize(const QSize &size) const;
- ViewportConfiguration viewportConfigurationForSize(const QSize& availableSize) const;
+ ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const;
QSize preferredContentsSize() const;
void setPreferredContentsSize(const QSize &size) const;
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index d2a71d2..1f70293 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -60,13 +60,13 @@ QT_END_NAMESPACE
class QWebInspector;
class QWebPageClient;
-class QtViewportConfigurationPrivate : public QSharedData {
+class QtViewportAttributesPrivate : public QSharedData {
public:
- QtViewportConfigurationPrivate(QWebPage::ViewportConfiguration* qq)
+ QtViewportAttributesPrivate(QWebPage::ViewportAttributes* qq)
: q(qq)
{ }
- QWebPage::ViewportConfiguration* q;
+ QWebPage::ViewportAttributes* q;
};
class QWebPagePrivate {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 6d33f3e..8d67f3e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-07 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] API: ViewportConfiguration => ViewportArguments
+ https://bugs.webkit.org/show_bug.cgi?id=47325
+
+ * Api/qwebpage.cpp:
+ (QWebPage::ViewportAttributes::ViewportAttributes):
+ (QWebPage::ViewportAttributes::~ViewportAttributes):
+ (QWebPage::ViewportAttributes::operator=):
+ (QWebPage::viewportAttributesForSize):
+ * Api/qwebpage.h:
+ * Api/qwebpage_p.h:
+ (QtViewportAttributesPrivate::QtViewportAttributesPrivate):
+
2010-10-07 Luiz Agostini <luiz.agostini at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list