[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3d2c7696fe11d00059c1187dec635ced995a2012
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 14:49:23 2010 +0000

    [Qt] LayoutTestController.numberOfPages() should have default parameters
    https://bugs.webkit.org/show_bug.cgi?id=35428
    
    Reviewed by Kenneth Rohde Christiansen.
    
    WebKitTools:
    
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp: maxViewWidth and maxViewHeight moved to
    LayoutTestController to converge to platform independent implementation.
    (WebCore::DumpRenderTree::DumpRenderTree):
    (WebCore::DumpRenderTree::open):
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp: Initialization of maxViewWidth and maxViewHeight added.
    * DumpRenderTree/qt/LayoutTestControllerQt.h:
     - Default parameters for LayoutTestController.numberOfPages() added.
     - maxViewWidth and maxViewHeight members added.
    
    LayoutTests:
    
    * platform/qt/Skipped: printing/css2.1 tests unskipped.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 15cf5a0..4b77347 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-26  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] LayoutTestController.numberOfPages() should have default parameters
+        https://bugs.webkit.org/show_bug.cgi?id=35428
+
+        * platform/qt/Skipped: printing/css2.1 tests unskipped.
+
 2010-02-26  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Xan Lopez.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 84a7150..202e71f 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5097,12 +5097,3 @@ http/tests/loading/307-after-303-after-post.html
 
 # DumpRenderTree code to enable Java is currently a no-op
 java
-
-# Width and height of layoutTestController.numberOfPages should be optional.
-printing/css2.1/page-break-after-000.html
-printing/css2.1/page-break-after-001.html
-printing/css2.1/page-break-after-003.html
-printing/css2.1/page-break-after-004.html
-printing/css2.1/page-break-before-000.html
-printing/css2.1/page-break-before-001.html
-printing/css2.1/page-break-before-002.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2b765df..e776699 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-26  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] LayoutTestController.numberOfPages() should have default parameters
+        https://bugs.webkit.org/show_bug.cgi?id=35428
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp: maxViewWidth and maxViewHeight moved to
+        LayoutTestController to converge to platform independent implementation.
+        (WebCore::DumpRenderTree::DumpRenderTree):
+        (WebCore::DumpRenderTree::open):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp: Initialization of maxViewWidth and maxViewHeight added.
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+         - Default parameters for LayoutTestController.numberOfPages() added.
+         - maxViewWidth and maxViewHeight members added.
+
 2010-02-26  Jamey Hicks  <jamey.hicks at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index e16f9bf..3eca72e 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -84,10 +84,6 @@ extern bool qt_drt_hasDocumentElement(QWebFrame* qFrame);
 
 namespace WebCore {
 
-// Choose some default values.
-const unsigned int maxViewWidth = 800;
-const unsigned int maxViewHeight = 600;
-
 NetworkAccessManager::NetworkAccessManager(QObject* parent)
     : QNetworkAccessManager(parent)
 {
@@ -321,7 +317,7 @@ DumpRenderTree::DumpRenderTree()
 
     // create our primary testing page/view.
     m_mainView = new QWebView(0);
-    m_mainView->resize(QSize(maxViewWidth, maxViewHeight));
+    m_mainView->resize(QSize(LayoutTestController::maxViewWidth, LayoutTestController::maxViewHeight));
     m_page = new WebPage(m_mainView, this);
     m_mainView->setPage(m_page);
     m_mainView->setContextMenuPolicy(Qt::NoContextMenu);
@@ -432,8 +428,8 @@ void DumpRenderTree::open(const QUrl& url)
 
     // W3C SVG tests expect to be 480x360
     bool isW3CTest = url.toString().contains("svg/W3C-SVG-1.1");
-    int width = isW3CTest ? 480 : maxViewWidth;
-    int height = isW3CTest ? 360 : maxViewHeight;
+    int width = isW3CTest ? 480 : LayoutTestController::maxViewWidth;
+    int height = isW3CTest ? 360 : LayoutTestController::maxViewHeight;
     m_mainView->resize(QSize(width, height));
     m_page->setPreferredContentsSize(QSize());
     m_page->setViewportSize(QSize(width, height));
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index a26bc3d..00c182e 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -500,3 +500,6 @@ int LayoutTestController::numberOfPages(float width, float height)
 {
     return qt_drt_numberOfPages(m_drt->webPage()->mainFrame(), width, height);
 }
+
+const unsigned LayoutTestController::maxViewWidth = 800;
+const unsigned LayoutTestController::maxViewHeight = 600;
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index d73794e..12ae72b 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -70,6 +70,9 @@ public:
 
     void reset();
 
+    static const unsigned int maxViewWidth;
+    static const unsigned int maxViewHeight;
+
 protected:
     void timerEvent(QTimerEvent*);
 
@@ -153,7 +156,7 @@ public slots:
     void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
     int workerThreadCount();
     int pageNumberForElementById(const QString& id, float width = 0, float height = 0);
-    int numberOfPages(float width, float height);
+    int numberOfPages(float width = maxViewWidth, float height = maxViewHeight);
 
 private slots:
     void processWork();

-- 
WebKit Debian packaging