[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
eric at webkit.org
eric at webkit.org
Fri Feb 26 22:17:04 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit a98968016ae12ed128d2daf5f6899e0f3c61e3f9
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 10 19:26:49 2010 +0000
2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
to make Qt DRT able to get page number.
LayoutTests:
printing/page-break-always.html
printing/pageNumerForElementById.html
printing/css2.1/page-break-before-000.html
printing/css2.1/page-break-after-000.html
printing/css2.1/page-break-after-004.html
printing/css2.1/page-break-before-001.html
printing/css2.1/page-break-after-001.html
printing/css2.1/page-break-after-002.html
printing/css2.1/page-break-before-002.html
printing/css2.1/page-break-inside-000.html
[Qt] Make possible Qt DRT get a page number for element by ID
https://bugs.webkit.org/show_bug.cgi?id=34777
* platform/qt/Skipped:
2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
to make Qt DRT able to get page number.
LayoutTests:
printing/page-break-always.html
printing/pageNumerForElementById.html
printing/css2.1/page-break-before-000.html
printing/css2.1/page-break-after-000.html
printing/css2.1/page-break-after-004.html
printing/css2.1/page-break-before-001.html
printing/css2.1/page-break-after-001.html
printing/css2.1/page-break-after-002.html
printing/css2.1/page-break-before-002.html
printing/css2.1/page-break-inside-000.html
[Qt] Make possible Qt DRT get a page number for element by ID
https://bugs.webkit.org/show_bug.cgi?id=34777
* Api/qwebframe.cpp:
(qt_drt_pageNumberForElementById):
2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
to make Qt DRT able to get page number.
LayoutTests:
printing/page-break-always.html
printing/pageNumerForElementById.html
printing/css2.1/page-break-before-000.html
printing/css2.1/page-break-after-000.html
printing/css2.1/page-break-after-004.html
printing/css2.1/page-break-before-001.html
printing/css2.1/page-break-after-001.html
printing/css2.1/page-break-after-002.html
printing/css2.1/page-break-before-002.html
printing/css2.1/page-break-inside-000.html
[Qt] Make possible Qt DRT get a page number for element by ID
https://bugs.webkit.org/show_bug.cgi?id=34777
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::pageNumberForElementById):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54612 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b7b8067..066a663 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,27 @@
+2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
+ to make Qt DRT able to get page number.
+
+ LayoutTests:
+ printing/page-break-always.html
+ printing/pageNumerForElementById.html
+ printing/css2.1/page-break-before-000.html
+ printing/css2.1/page-break-after-000.html
+ printing/css2.1/page-break-after-004.html
+ printing/css2.1/page-break-before-001.html
+ printing/css2.1/page-break-after-001.html
+ printing/css2.1/page-break-after-002.html
+ printing/css2.1/page-break-before-002.html
+ printing/css2.1/page-break-inside-000.html
+
+ [Qt] Make possible Qt DRT get a page number for element by ID
+ https://bugs.webkit.org/show_bug.cgi?id=34777
+
+ * platform/qt/Skipped:
+
2010-02-10 Jeremy Orlow <jorlow at chromium.org>
Revert 54599 because it breaks a lot of tests on Windows Chrome
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a7b6853..0f7f02e 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5072,11 +5072,6 @@ css2.1/t1505-c524-font-var-00-b.html
# Relies on WebKit API [WebView _loadBackForwardListFromOtherView:]
fast/loader/crash-copying-backforwardlist.html
-# Implement LayoutTestController::pageNumberForElementById().
-printing/page-break-always.html
-printing/pageNumerForElementById.html
-printing/css2.1
-
# Because ENABLE_DASHBOARD_SUPPORT=0 is the default option. (Apple's dashboard support in OS X)
fast/css/dashboard-regions-attr-crash.html
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index aeb7a22..4c1f318 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -220,6 +220,19 @@ QString QWEBKIT_EXPORT qt_drt_counterValueForElementById(QWebFrame* qFrame, cons
return QString();
}
+int QWEBKIT_EXPORT qt_drt_pageNumberForElementById(QWebFrame* qFrame, const QString& id, float width, float height)
+{
+ Frame* frame = QWebFramePrivate::core(qFrame);
+ if (!frame)
+ return -1;
+
+ Element* element = frame->document()->getElementById(AtomicString(id));
+ if (!element)
+ return -1;
+
+ return PrintContext::pageNumberForElement(element, FloatSize(width, height));
+}
+
// Suspend active DOM objects in this frame.
void QWEBKIT_EXPORT qt_suspendActiveDOMObjects(QWebFrame* qFrame)
{
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index e22b929..0ef415b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,28 @@
+2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
+ to make Qt DRT able to get page number.
+
+ LayoutTests:
+ printing/page-break-always.html
+ printing/pageNumerForElementById.html
+ printing/css2.1/page-break-before-000.html
+ printing/css2.1/page-break-after-000.html
+ printing/css2.1/page-break-after-004.html
+ printing/css2.1/page-break-before-001.html
+ printing/css2.1/page-break-after-001.html
+ printing/css2.1/page-break-after-002.html
+ printing/css2.1/page-break-before-002.html
+ printing/css2.1/page-break-inside-000.html
+
+ [Qt] Make possible Qt DRT get a page number for element by ID
+ https://bugs.webkit.org/show_bug.cgi?id=34777
+
+ * Api/qwebframe.cpp:
+ (qt_drt_pageNumberForElementById):
+
2010-02-09 Yael Aharon <yael.aharon at nokia.com>
Reviewed by Adam Barth.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 369a946..44949b8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2010-02-10 Diego Gonzalez <diego.gonzalez at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement pageNumberForElementById() method in Qt DRT LayoutTestController,
+ to make Qt DRT able to get page number.
+
+ LayoutTests:
+ printing/page-break-always.html
+ printing/pageNumerForElementById.html
+ printing/css2.1/page-break-before-000.html
+ printing/css2.1/page-break-after-000.html
+ printing/css2.1/page-break-after-004.html
+ printing/css2.1/page-break-before-001.html
+ printing/css2.1/page-break-after-001.html
+ printing/css2.1/page-break-after-002.html
+ printing/css2.1/page-break-before-002.html
+ printing/css2.1/page-break-inside-000.html
+
+ [Qt] Make possible Qt DRT get a page number for element by ID
+ https://bugs.webkit.org/show_bug.cgi?id=34777
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::pageNumberForElementById):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
2010-02-10 Andras Becsi <abecsi at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 3d0571b..427944d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -49,6 +49,7 @@ extern void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidden, cons
extern void qt_drt_whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
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);
LayoutTestController::LayoutTestController(WebCore::DumpRenderTree* drt)
: QObject()
@@ -454,3 +455,14 @@ int LayoutTestController::workerThreadCount()
{
return qt_drt_workerThreadCount();
}
+
+int LayoutTestController::pageNumberForElementById(const QString& id, float width, float height)
+{
+ // If no size specified, webpage viewport size is used
+ if (!width && !height) {
+ width = m_drt->webPage()->viewportSize().width();
+ height = m_drt->webPage()->viewportSize().height();
+ }
+
+ return qt_drt_pageNumberForElementById(m_drt->webPage()->mainFrame(), id, width, height);
+}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 059daab..3588219 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -148,6 +148,7 @@ public slots:
void setUserStyleSheetEnabled(bool enabled);
void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
int workerThreadCount();
+ int pageNumberForElementById(const QString& id, float width = 0, float height = 0);
private slots:
void processWork();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list