Diff
Modified: trunk/LayoutTests/ChangeLog (86840 => 86841)
--- trunk/LayoutTests/ChangeLog 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/LayoutTests/ChangeLog 2011-05-19 12:39:43 UTC (rev 86841)
@@ -1,3 +1,12 @@
+2011-05-19 Zsolt Fehér <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Implement eventSender.scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=60015
+
+ * platform/qt/Skipped: Unskip fast/transforms/selection-bounds-in-transformed-view.html.
+
2011-05-19 Csaba Osztrogonác <[email protected]>
[Qt] Skip failing tests after r86834.
Modified: trunk/LayoutTests/platform/qt/Skipped (86840 => 86841)
--- trunk/LayoutTests/platform/qt/Skipped 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-05-19 12:39:43 UTC (rev 86841)
@@ -671,9 +671,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=58396
http/tests/misc/favicon-loads-with-icon-loading-override.html
-# Missing eventSender.scalePageBy() implementation
-fast/transforms/selection-bounds-in-transformed-view.html
-
# ============================================================================= #
# Failing SVG tests
# ============================================================================= #
Modified: trunk/Source/WebKit/qt/ChangeLog (86840 => 86841)
--- trunk/Source/WebKit/qt/ChangeLog 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-05-19 12:39:43 UTC (rev 86841)
@@ -1,3 +1,14 @@
+2011-05-19 Zsolt Fehér <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Implement eventSender.scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=60015
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::scalePageBy):
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2011-05-18 Yi Shen <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (86840 => 86841)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-05-19 12:39:43 UTC (rev 86841)
@@ -780,6 +780,12 @@
return res;
}
+void DumpRenderTreeSupportQt::scalePageBy(QWebFrame* frame, float scalefactor, const QPoint& origin)
+{
+ WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
+ coreFrame->scalePage(scalefactor, origin);
+}
+
void DumpRenderTreeSupportQt::activeMockDeviceOrientationClient(bool b)
{
#if ENABLE(DEVICE_ORIENTATION)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (86840 => 86841)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-05-19 12:39:43 UTC (rev 86841)
@@ -192,6 +192,8 @@
static void simulateDesktopNotificationClick(const QString& title);
static QString viewportAsText(QWebPage*, int deviceDPI, const QSize& deviceSize, const QSize& availableSize);
+ static void scalePageBy(QWebFrame*, float scale, const QPoint& origin);
+
static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
static QString responseMimeType(QWebFrame*);
static void clearOpener(QWebFrame*);
Modified: trunk/Tools/ChangeLog (86840 => 86841)
--- trunk/Tools/ChangeLog 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Tools/ChangeLog 2011-05-19 12:39:43 UTC (rev 86841)
@@ -1,3 +1,16 @@
+2011-05-19 Zsolt Fehér <[email protected]>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Implement eventSender.scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=60015
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+ * DumpRenderTree/qt/EventSenderQt.cpp:
+ (EventSender::scalePageBy):
+ * DumpRenderTree/qt/EventSenderQt.h:
+
2011-05-19 Kenichi Ishibashi <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (86840 => 86841)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2011-05-19 12:39:43 UTC (rev 86841)
@@ -564,6 +564,7 @@
#endif
clearHistory(m_page);
+ DumpRenderTreeSupportQt::scalePageBy(m_page->mainFrame(), 1, QPoint(0, 0));
DumpRenderTreeSupportQt::clearFrameName(m_page->mainFrame());
m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
Modified: trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp (86840 => 86841)
--- trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp 2011-05-19 12:39:43 UTC (rev 86841)
@@ -511,6 +511,12 @@
frame->setTextSizeMultiplier(frame->textSizeMultiplier() / ZOOM_STEP);
}
+void EventSender::scalePageBy(float scaleFactor, float x, float y)
+{
+ if (QWebFrame* frame = m_page->mainFrame())
+ DumpRenderTreeSupportQt::scalePageBy(frame, scaleFactor, QPoint(x, y));
+}
+
QWebFrame* EventSender::frameUnderMouse() const
{
QWebFrame* frame = m_page->mainFrame();
Modified: trunk/Tools/DumpRenderTree/qt/EventSenderQt.h (86840 => 86841)
--- trunk/Tools/DumpRenderTree/qt/EventSenderQt.h 2011-05-19 12:35:40 UTC (rev 86840)
+++ trunk/Tools/DumpRenderTree/qt/EventSenderQt.h 2011-05-19 12:39:43 UTC (rev 86841)
@@ -77,6 +77,7 @@
void zoomPageOut();
void textZoomIn();
void textZoomOut();
+ void scalePageBy(float scaleFactor, float x, float y);
void clearTouchPoints();
void releaseTouchPoint(int index);
