Changeset 69331 in webkit
- Timestamp:
- Oct 7, 2010 12:41:44 PM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r69316 r69331 1573 1573 1574 1574 /*! 1575 \class QWebPage::Viewport Configuration1575 \class QWebPage::ViewportAttributes 1576 1576 \since 4.7 1577 \brief The QWebPage::Viewport Configurationclass describes hints that can be applied to a viewport.1578 1579 QWebPage::Viewport Configurationprovides 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, 1580 1580 initial scale factor with limits, plus information about whether a user should be able 1581 1581 to scale the contents in the viewport or not, ie. by zooming. 1582 1582 1583 Viewport Configurationcan be set by a web author using the viewport meta tag extension, documented1583 ViewportAttributes can be set by a web author using the viewport meta tag extension, documented 1584 1584 at \l{http://developer.apple.com/safari/library/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html}{Safari Reference Library: Using the Viewport Meta Tag}. 1585 1585 … … 1591 1591 1592 1592 /*! 1593 Constructs an empty QWebPage::Viewport Configuration.1594 */ 1595 QWebPage::Viewport Configuration::ViewportConfiguration()1593 Constructs an empty QWebPage::ViewportAttributes. 1594 */ 1595 QWebPage::ViewportAttributes::ViewportAttributes() 1596 1596 : d(0) 1597 1597 , m_initialScaleFactor(-1.0) … … 1606 1606 1607 1607 /*! 1608 Constructs a QWebPage::Viewport Configurationwhich is a copy from \a other .1609 */ 1610 QWebPage::Viewport Configuration::ViewportConfiguration(const QWebPage::ViewportConfiguration& other)1608 Constructs a QWebPage::ViewportAttributes which is a copy from \a other . 1609 */ 1610 QWebPage::ViewportAttributes::ViewportAttributes(const QWebPage::ViewportAttributes& other) 1611 1611 : d(other.d) 1612 1612 , m_initialScaleFactor(other.m_initialScaleFactor) … … 1622 1622 1623 1623 /*! 1624 Destroys the QWebPage::Viewport Configuration.1625 */ 1626 QWebPage::Viewport Configuration::~ViewportConfiguration()1627 { 1628 1629 } 1630 1631 /*! 1632 Assigns the given QWebPage::Viewport Configurationto this viewport hints and returns a1624 Destroys the QWebPage::ViewportAttributes. 1625 */ 1626 QWebPage::ViewportAttributes::~ViewportAttributes() 1627 { 1628 1629 } 1630 1631 /*! 1632 Assigns the given QWebPage::ViewportAttributes to this viewport hints and returns a 1633 1633 reference to this. 1634 1634 */ 1635 QWebPage::Viewport Configuration& QWebPage::ViewportConfiguration::operator=(const QWebPage::ViewportConfiguration& other)1635 QWebPage::ViewportAttributes& QWebPage::ViewportAttributes::operator=(const QWebPage::ViewportAttributes& other) 1636 1636 { 1637 1637 if (this != &other) { … … 1648 1648 } 1649 1649 1650 /*! \fn inline bool QWebPage::Viewport Configuration::isValid() const1651 Returns whether this is a valid Viewport Configurationor not.1652 1653 An invalid Viewport Configurationwill have an empty QSize, negative values for scale factors and1650 /*! \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 1654 1654 true for the boolean isUserScalable. 1655 1655 */ 1656 1656 1657 /*! \fn inline QSize QWebPage::Viewport Configuration::size() const1657 /*! \fn inline QSize QWebPage::ViewportAttributes::size() const 1658 1658 Returns the size of the viewport. 1659 1659 */ 1660 1660 1661 /*! \fn inline qreal QWebPage::Viewport Configuration::initialScaleFactor() const1661 /*! \fn inline qreal QWebPage::ViewportAttributes::initialScaleFactor() const 1662 1662 Returns the initial scale of the viewport as a multiplier. 1663 1663 */ 1664 1664 1665 /*! \fn inline qreal QWebPage::Viewport Configuration::minimumScaleFactor() const1665 /*! \fn inline qreal QWebPage::ViewportAttributes::minimumScaleFactor() const 1666 1666 Returns the minimum scale value of the viewport as a multiplier. 1667 1667 */ 1668 1668 1669 /*! \fn inline qreal QWebPage::Viewport Configuration::maximumScaleFactor() const1669 /*! \fn inline qreal QWebPage::ViewportAttributes::maximumScaleFactor() const 1670 1670 Returns the maximum scale value of the viewport as a multiplier. 1671 1671 */ 1672 1672 1673 /*! \fn inline bool QWebPage::Viewport Configuration::isUserScalable() const1673 /*! \fn inline bool QWebPage::ViewportAttributes::isUserScalable() const 1674 1674 Determines whether or not the scale can be modified by the user. 1675 1675 */ … … 2234 2234 */ 2235 2235 2236 QWebPage::Viewport Configuration QWebPage::viewportConfigurationForSize(const QSize& availableSize) const2236 QWebPage::ViewportAttributes QWebPage::viewportAttributesForSize(const QSize& availableSize) const 2237 2237 { 2238 2238 static int desktopWidth = 980; 2239 2239 static int deviceDPI = 160; 2240 2240 2241 Viewport Configurationresult;2241 ViewportAttributes result; 2242 2242 2243 2243 int deviceWidth = getintenv("QTWEBKIT_DEVICE_WIDTH"); … … 3648 3648 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}. 3649 3649 3650 \sa QWebPage::Viewport Configuration, setPreferredContentsSize(), QGraphicsWebView::setScale()3650 \sa QWebPage::ViewportAttributes, setPreferredContentsSize(), QGraphicsWebView::setScale() 3651 3651 */ 3652 3652 -
trunk/WebKit/qt/Api/qwebpage.h
r68525 r69331 49 49 class QWebPagePrivate; 50 50 class QWebPluginFactory; 51 class QtViewport ConfigurationPrivate;51 class QtViewportAttributesPrivate; 52 52 53 53 namespace WebCore { … … 209 209 }; 210 210 211 class Viewport Configuration{211 class ViewportAttributes { 212 212 public: 213 Viewport Configuration();214 Viewport Configuration(const QWebPage::ViewportConfiguration& other);215 216 ~Viewport Configuration();217 218 QWebPage::Viewport Configuration& 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); 219 219 220 220 inline qreal initialScaleFactor() const { return m_initialScaleFactor; } … … 227 227 228 228 private: 229 QSharedDataPointer<QtViewport ConfigurationPrivate> d;229 QSharedDataPointer<QtViewportAttributesPrivate> d; 230 230 qreal m_initialScaleFactor; 231 231 qreal m_minimumScaleFactor; … … 277 277 QSize viewportSize() const; 278 278 void setViewportSize(const QSize &size) const; 279 Viewport Configuration viewportConfigurationForSize(const QSize& availableSize) const;279 ViewportAttributes viewportAttributesForSize(const QSize& availableSize) const; 280 280 281 281 QSize preferredContentsSize() const; -
trunk/WebKit/qt/Api/qwebpage_p.h
r69217 r69331 61 61 class QWebPageClient; 62 62 63 class QtViewport ConfigurationPrivate : public QSharedData {63 class QtViewportAttributesPrivate : public QSharedData { 64 64 public: 65 QtViewport ConfigurationPrivate(QWebPage::ViewportConfiguration* qq)65 QtViewportAttributesPrivate(QWebPage::ViewportAttributes* qq) 66 66 : q(qq) 67 67 { } 68 68 69 QWebPage::Viewport Configuration* q;69 QWebPage::ViewportAttributes* q; 70 70 }; 71 71 -
trunk/WebKit/qt/ChangeLog
r69316 r69331 1 2010-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 1 17 2010-10-07 Luiz Agostini <luiz.agostini@openbossa.org> 2 18
Note: See TracChangeset
for help on using the changeset viewer.