Changeset 69331 in webkit


Ignore:
Timestamp:
Oct 7, 2010 12:41:44 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-07 Andreas Kling <​kling@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):
Location:
trunk/WebKit/qt
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/qt/Api/qwebpage.cpp

    r69316 r69331  
    15731573
    15741574/*!
    1575     \class QWebPage::ViewportConfiguration
     1575    \class QWebPage::ViewportAttributes
    15761576    \since 4.7
    1577     \brief The QWebPage::ViewportConfiguration class describes hints that can be applied to a viewport.
    1578 
    1579     QWebPage::ViewportConfiguration provides a description of a viewport, such as viewport geometry,
     1577    \brief The QWebPage::ViewportAttributes class describes hints that can be applied to a viewport.
     1578
     1579    QWebPage::ViewportAttributes provides a description of a viewport, such as viewport geometry,
    15801580    initial scale factor with limits, plus information about whether a user should be able
    15811581    to scale the contents in the viewport or not, ie. by zooming.
    15821582
    1583     ViewportConfiguration can be set by a web author using the viewport meta tag extension, documented
     1583    ViewportAttributes can be set by a web author using the viewport meta tag extension, documented
    15841584    at \l{http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html}{Safari Reference Library: Using the Viewport Meta Tag}.
    15851585
    … …  
    15911591
    15921592/*!
    1593     Constructs an empty QWebPage::ViewportConfiguration.
    1594 */
    1595 QWebPage::ViewportConfiguration::ViewportConfiguration()
     1593    Constructs an empty QWebPage::ViewportAttributes.
     1594*/
     1595QWebPage::ViewportAttributes::ViewportAttributes()
    15961596    : d(0)
    15971597    , m_initialScaleFactor(-1.0)
    … …  
    16061606
    16071607/*!
    1608     Constructs a QWebPage::ViewportConfiguration which is a copy from \a other .
    1609 */
    1610 QWebPage::ViewportConfiguration::ViewportConfiguration(const QWebPage::ViewportConfiguration& other)
     1608    Constructs a QWebPage::ViewportAttributes which is a copy from \a other .
     1609*/
     1610QWebPage::ViewportAttributes::ViewportAttributes(const QWebPage::ViewportAttributes& other)
    16111611    : d(other.d)
    16121612    , m_initialScaleFactor(other.m_initialScaleFactor)
    … …  
    16221622
    16231623/*!
    1624     Destroys the QWebPage::ViewportConfiguration.
    1625 */
    1626 QWebPage::ViewportConfiguration::~ViewportConfiguration()
    1627 {
    1628 
    1629 }
    1630 
    1631 /*!
    1632     Assigns the given QWebPage::ViewportConfiguration to this viewport hints and returns a
     1624    Destroys the QWebPage::ViewportAttributes.
     1625*/
     1626QWebPage::ViewportAttributes::~ViewportAttributes()
     1627{
     1628
     1629}
     1630
     1631/*!
     1632    Assigns the given QWebPage::ViewportAttributes to this viewport hints and returns a
    16331633    reference to this.
    16341634*/
    1635 QWebPage::ViewportConfiguration& QWebPage::ViewportConfiguration::operator=(const QWebPage::ViewportConfiguration& other)
     1635QWebPage::ViewportAttributes& QWebPage::ViewportAttributes::operator=(const QWebPage::ViewportAttributes& other)
    16361636{
    16371637    if (this != &other) {
    … …  
    16481648}
    16491649
    1650 /*! \fn inline bool QWebPage::ViewportConfiguration::isValid() const
    1651     Returns whether this is a valid ViewportConfiguration or not.
    1652 
    1653     An invalid ViewportConfiguration will have an empty QSize, negative values for scale factors and
     1650/*! \fn inline bool QWebPage::ViewportAttributes::isValid() const
     1651    Returns whether this is a valid ViewportAttributes or not.
     1652
     1653    An invalid ViewportAttributes will have an empty QSize, negative values for scale factors and
    16541654    true for the boolean isUserScalable.
    16551655*/
    16561656
    1657 /*! \fn inline QSize QWebPage::ViewportConfiguration::size() const
     1657/*! \fn inline QSize QWebPage::ViewportAttributes::size() const
    16581658    Returns the size of the viewport.
    16591659*/
    16601660
    1661 /*! \fn inline qreal QWebPage::ViewportConfiguration::initialScaleFactor() const
     1661/*! \fn inline qreal QWebPage::ViewportAttributes::initialScaleFactor() const
    16621662    Returns the initial scale of the viewport as a multiplier.
    16631663*/
    16641664
    1665 /*! \fn inline qreal QWebPage::ViewportConfiguration::minimumScaleFactor() const
     1665/*! \fn inline qreal QWebPage::ViewportAttributes::minimumScaleFactor() const
    16661666    Returns the minimum scale value of the viewport as a multiplier.
    16671667*/
    16681668
    1669 /*! \fn inline qreal QWebPage::ViewportConfiguration::maximumScaleFactor() const
     1669/*! \fn inline qreal QWebPage::ViewportAttributes::maximumScaleFactor() const
    16701670    Returns the maximum scale value of the viewport as a multiplier.
    16711671*/
    16721672
    1673 /*! \fn inline bool QWebPage::ViewportConfiguration::isUserScalable() const
     1673/*! \fn inline bool QWebPage::ViewportAttributes::isUserScalable() const
    16741674    Determines whether or not the scale can be modified by the user.
    16751675*/
    … …  
    22342234*/
    22352235
    2236 QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSize& availableSize) const
     2236QWebPage::ViewportAttributes QWebPage::viewportAttributesForSize(const QSize& availableSize) const
    22372237{
    22382238    static int desktopWidth = 980;
    22392239    static int deviceDPI = 160;
    22402240
    2241     ViewportConfiguration result;
     2241    ViewportAttributes result;
    22422242
    22432243    int deviceWidth = getintenv("QTWEBKIT_DEVICE_WIDTH");
    … …  
    36483648    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}.
    36493649
    3650     \sa QWebPage::ViewportConfiguration, setPreferredContentsSize(), QGraphicsWebView::setScale()
     3650    \sa QWebPage::ViewportAttributes, setPreferredContentsSize(), QGraphicsWebView::setScale()
    36513651*/
    36523652

  • trunk/WebKit/qt/Api/qwebpage.h

    r68525 r69331  
    4949class QWebPagePrivate;
    5050class QWebPluginFactory;
    51 class QtViewportConfigurationPrivate;
     51class QtViewportAttributesPrivate;
    5252
    5353namespace WebCore {
    … …  
    209209    };
    210210
    211     class ViewportConfiguration {
     211    class ViewportAttributes {
    212212    public:
    213         ViewportConfiguration();
    214         ViewportConfiguration(const QWebPage::ViewportConfiguration& other);
    215 
    216         ~ViewportConfiguration();
    217 
    218         QWebPage::ViewportConfiguration& operator=(const QWebPage::ViewportConfiguration& other);
     213        ViewportAttributes();
     214        ViewportAttributes(const QWebPage::ViewportAttributes& other);
     215
     216        ~ViewportAttributes();
     217
     218        QWebPage::ViewportAttributes& operator=(const QWebPage::ViewportAttributes& other);
    219219
    220220        inline qreal initialScaleFactor() const { return m_initialScaleFactor; }
    … …  
    227227
    228228    private:
    229         QSharedDataPointer<QtViewportConfigurationPrivate> d;
     229        QSharedDataPointer<QtViewportAttributesPrivate> d;
    230230        qreal m_initialScaleFactor;
    231231        qreal m_minimumScaleFactor;
    … …  
    277277    QSize viewportSize() const;
    278278    void setViewportSize(const QSize &size) const;
    279     ViewportConfiguration viewportConfigurationForSize(const QSize& availableSize) const;
     279    ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const;
    280280
    281281    QSize preferredContentsSize() const;

  • trunk/WebKit/qt/Api/qwebpage_p.h

    r69217 r69331  
    6161class QWebPageClient;
    6262
    63 class QtViewportConfigurationPrivate : public QSharedData {
     63class QtViewportAttributesPrivate : public QSharedData {
    6464public:
    65     QtViewportConfigurationPrivate(QWebPage::ViewportConfiguration* qq)
     65    QtViewportAttributesPrivate(QWebPage::ViewportAttributes* qq)
    6666        : q(qq)
    6767    { }
    6868
    69     QWebPage::ViewportConfiguration* q;
     69    QWebPage::ViewportAttributes* q;
    7070};
    7171

  • trunk/WebKit/qt/ChangeLog

    r69316 r69331  
     12010-10-07  Andreas Kling  <kling@webkit.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] API: ViewportConfiguration => ViewportArguments
     6        https://bugs.webkit.org/show_bug.cgi?id=47325
     7
     8        * Api/qwebpage.cpp:
     9        (QWebPage::ViewportAttributes::ViewportAttributes):
     10        (QWebPage::ViewportAttributes::~ViewportAttributes):
     11        (QWebPage::ViewportAttributes::operator=):
     12        (QWebPage::viewportAttributesForSize):
     13        * Api/qwebpage.h:
     14        * Api/qwebpage_p.h:
     15        (QtViewportAttributesPrivate::QtViewportAttributesPrivate):
     16
    1172010-10-07  Luiz Agostini  <luiz.agostini@openbossa.org>
    218
Note: See TracChangeset for help on using the changeset viewer.