Changeset 68525 in webkit
- Timestamp:
- Sep 28, 2010 9:20:57 AM (14 years ago)
- Location:
- trunk/WebKit/qt
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r68517 r68525 2364 2364 */ 2365 2365 2366 QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize( QSizeavailableSize) const2366 QWebPage::ViewportConfiguration QWebPage::viewportConfigurationForSize(const QSize& availableSize) const 2367 2367 { 2368 2368 static int desktopWidth = 980; -
trunk/WebKit/qt/Api/qwebpage.h
r68056 r68525 218 218 QWebPage::ViewportConfiguration& operator=(const QWebPage::ViewportConfiguration& other); 219 219 220 inline qreal initialScaleFactor() const { return m_initialScaleFactor; } ;221 inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; } ;222 inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; } ;223 inline qreal devicePixelRatio() const { return m_devicePixelRatio; } ;224 inline bool isUserScalable() const { return m_isUserScalable; } ;225 inline bool isValid() const { return m_isValid; } ;226 inline QSize size() const { return m_size; } ;220 inline qreal initialScaleFactor() const { return m_initialScaleFactor; } 221 inline qreal minimumScaleFactor() const { return m_minimumScaleFactor; } 222 inline qreal maximumScaleFactor() const { return m_maximumScaleFactor; } 223 inline qreal devicePixelRatio() const { return m_devicePixelRatio; } 224 inline bool isUserScalable() const { return m_isUserScalable; } 225 inline bool isValid() const { return m_isValid; } 226 inline QSize size() const { return m_size; } 227 227 228 228 private: … … 277 277 QSize viewportSize() const; 278 278 void setViewportSize(const QSize &size) const; 279 ViewportConfiguration viewportConfigurationForSize( QSizeavailableSize) const;279 ViewportConfiguration viewportConfigurationForSize(const QSize& availableSize) const; 280 280 281 281 QSize preferredContentsSize() const; -
trunk/WebKit/qt/ChangeLog
r68521 r68525 1 2010-09-28 Andreas Kling <andreas.kling@nokia.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt] Clean up QWebPage::ViewportConfiguration API 6 https://bugs.webkit.org/show_bug.cgi?id=46730 7 8 - Pass QSize parameter as const-reference 9 - Style fixes 10 11 * Api/qwebpage.cpp: 12 (QWebPage::viewportConfigurationForSize): 13 * Api/qwebpage.h: 14 1 15 2010-09-28 Andras Becsi <abecsi@webkit.org> 2 16
Note: See TracChangeset
for help on using the changeset viewer.