[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b007e61dcaf57d0ec28c70f3caf52f6b45d3d21a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 19:06:22 2010 +0000

    2010-02-17  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Ariya Hidayat.
    
            Make possible Qt DRT to get total number of pages to be printed
    
            LayoutTests:
                printing/numberOfPages.html
    
            [Qt] DRT: Get total number of pages to be printed
            https://bugs.webkit.org/show_bug.cgi?id=34955
    
            * Api/qwebframe.cpp:
            (qt_drt_numberOfPages):
            (qt_drt_evaluateScriptInIsolatedWorld):
    2010-02-17  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Ariya Hidayat.
    
            Make possible Qt DRT to get total number of pages to be printed
    
            LayoutTests:
                printing/numberOfPages.html
    
            [Qt] DRT: Get total number of pages to be printed
            https://bugs.webkit.org/show_bug.cgi?id=34955
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::numberOfPages):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index d372290..d341c6a 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -233,6 +233,15 @@ int QWEBKIT_EXPORT qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QStr
     return PrintContext::pageNumberForElement(element, FloatSize(width, height));
 }
 
+int QWEBKIT_EXPORT qt_drt_numberOfPages(QWebFrame* qFrame, float width, float height)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (!frame)
+        return -1;
+
+    return PrintContext::numberOfPages(frame, FloatSize(width, height));
+}
+
 // Suspend active DOM objects in this frame.
 void QWEBKIT_EXPORT qt_suspendActiveDOMObjects(QWebFrame* qFrame)
 {
@@ -249,6 +258,13 @@ void QWEBKIT_EXPORT qt_resumeActiveDOMObjects(QWebFrame* qFrame)
         frame->document()->resumeActiveDOMObjects();
 }                        
 
+void QWEBKIT_EXPORT qt_drt_evaluateScriptInIsolatedWorld(QWebFrame* qFrame, int worldId, const QString& script)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (frame)
+        JSC::JSValue result = frame->script()->executeScriptInWorld(mainThreadNormalWorld(), script, true).jsValue();
+}
+
 QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame,
                              WebCore::HTMLFrameOwnerElement* ownerFrameElement,
                              const WebCore::String& frameName)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 99dbaa4..b3ece42 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-17  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Make possible Qt DRT to get total number of pages to be printed
+
+        LayoutTests:
+            printing/numberOfPages.html
+
+        [Qt] DRT: Get total number of pages to be printed
+        https://bugs.webkit.org/show_bug.cgi?id=34955
+
+        * Api/qwebframe.cpp:
+        (qt_drt_numberOfPages):
+        (qt_drt_evaluateScriptInIsolatedWorld):
+
 2010-02-16  Ariya Hidayat  <ariya.hidayat at gmail.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f15cdce..ea2da92 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-17  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Make possible Qt DRT to get total number of pages to be printed
+
+        LayoutTests:
+            printing/numberOfPages.html
+
+        [Qt] DRT: Get total number of pages to be printed
+        https://bugs.webkit.org/show_bug.cgi?id=34955
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::numberOfPages):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-02-17  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index f20bd44..a26bc3d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -52,6 +52,7 @@ extern void qt_drt_whiteListAccessFromOrigin(const QString& sourceOrigin, const
 extern QString qt_drt_counterValueForElementById(QWebFrame* qFrame, const QString& id);
 extern int qt_drt_workerThreadCount();
 extern int qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QString& id, float width, float height);
+extern int qt_drt_numberOfPages(QWebFrame* qFrame, float width, float height);
 extern void qt_drt_webinspector_executeScript(QWebPage* page, long callId, const QString& script);
 extern void qt_drt_webinspector_show(QWebPage *page);
 extern void qt_drt_webinspector_close(QWebPage *page);
@@ -494,3 +495,8 @@ int LayoutTestController::pageNumberForElementById(const QString& id, float widt
 
     return qt_drt_pageNumberForElementById(m_drt->webPage()->mainFrame(), id, width, height);
 }
+
+int LayoutTestController::numberOfPages(float width, float height)
+{
+    return qt_drt_numberOfPages(m_drt->webPage()->mainFrame(), width, height);
+}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 922ffa8..d73794e 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -153,6 +153,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);
 
 private slots:
     void processWork();

-- 
WebKit Debian packaging