Changeset 49766 in webkit

Timestamp:

Oct 18, 2009 11:51:24 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-18 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Simon Hausmann.

Rename fixedContentsSize property to preferredContentsSize as
agreed upon with Siman Hausmann and Matthias Ettrich.

• Api/qwebpage.cpp: (QWebPage::preferredContentsSize): (QWebPage::setPreferredContentsSize):
• Api/qwebpage.h:
• WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):

2009-10-18 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Simon Hausmann.

Use the setPreferredContentsSize method instead
of setFixedContentsSize, as the method has been renamed.

• DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::DumpRenderTree::open):
• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::setFixedContentsSize):

Location:

trunk

Files:

• WebKit/qt/Api/qwebpage.cpp (modified) (3 diffs)
• WebKit/qt/Api/qwebpage.h (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1957 +1957 @@
 }
 
-QSize QWebPage::fixedContentsSize() const
+QSize QWebPage::preferredContentsSize() const
 {
     QWebFrame* frame = d->mainFrame;
@@ -1970 +1970 @@
 
 /*!
-    \property QWebPage::fixedContentsSize
+    \property QWebPage::preferredContentsSize
     \since 4.6
     \brief the size of the fixed layout
@@ -1978 +1978 @@
     rather than something different.
 */
-void QWebPage::setFixedContentsSize(const QSize &size) const
+void QWebPage::setPreferredContentsSize(const QSize &size) const
 {
     d->fixedLayoutSize = size;

trunk/WebKit/qt/Api/qwebpage.h

@@ -68 +68 @@
     Q_PROPERTY(QString selectedText READ selectedText)
     Q_PROPERTY(QSize viewportSize READ viewportSize WRITE setViewportSize)
-    Q_PROPERTY(QSize fixedContentsSize READ fixedContentsSize WRITE setFixedContentsSize)
+    Q_PROPERTY(QSize preferredContentsSize READ preferredContentsSize WRITE setPreferredContentsSize)
     Q_PROPERTY(bool forwardUnsupportedContent READ forwardUnsupportedContent WRITE setForwardUnsupportedContent)
     Q_PROPERTY(LinkDelegationPolicy linkDelegationPolicy READ linkDelegationPolicy WRITE setLinkDelegationPolicy)
@@ -238 +238 @@
     void setViewportSize(const QSize &size) const;
 
-    QSize fixedContentsSize() const;
-    void setFixedContentsSize(const QSize &size) const;
+    QSize preferredContentsSize() const;
+    void setPreferredContentsSize(const QSize &size) const;
 
     virtual bool event(QEvent*);

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-10-18  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Rename fixedContentsSize property to preferredContentsSize as
+        agreed upon with Siman Hausmann and Matthias Ettrich.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::preferredContentsSize):
+        (QWebPage::setPreferredContentsSize):
+        * Api/qwebpage.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage):
+
 2009-10-16  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -215 +215 @@
 
     QWebPage* page = m_webFrame->page();
-    const QSize fixedLayoutSize = page->fixedContentsSize();
+    const QSize preferredLayoutSize = page->preferredContentsSize();
 
     m_frame->createView(m_webFrame->page()->viewportSize(),
                         backgroundColor, !backgroundColor.alpha(),
-                        fixedLayoutSize.isValid() ? IntSize(fixedLayoutSize) : IntSize(),
-                        fixedLayoutSize.isValid(),
+                        preferredLayoutSize.isValid() ? IntSize(preferredLayoutSize) : IntSize(),
+                        preferredLayoutSize.isValid(),
                         (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Horizontal),
                         (ScrollbarMode)m_webFrame->scrollBarPolicy(Qt::Vertical));

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-10-18  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Use the setPreferredContentsSize method instead
+        of setFixedContentsSize, as the method has been renamed.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::open):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setFixedContentsSize):
+
 2009-10-16  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp

@@ -317 +317 @@
     int height = isW3CTest ? 360 : maxViewHeight;
     m_page->view()->resize(QSize(width, height));
-    m_page->setFixedContentsSize(QSize());
+    m_page->setPreferredContentsSize(QSize());
     m_page->setViewportSize(QSize(width, height));
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -212 +212 @@
 void LayoutTestController::setFixedContentsSize(int width, int height)
 {
-    m_topLoadingFrame->page()->setFixedContentsSize(QSize(width, height));
+    m_topLoadingFrame->page()->setPreferredContentsSize(QSize(width, height));
 }