diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-09-20 14:01:09 +0200 |
commit | 6dbcd09121fe266c7704a524b5cbd7f2754659c0 (patch) | |
tree | 5ae0d16cec0cc61f576d51c57b3a4613c7e91e22 /Tools/DumpRenderTree | |
parent | 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (diff) | |
download | qtwebkit-6dbcd09121fe266c7704a524b5cbd7f2754659c0.tar.gz |
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)
New snapshot with prospective build fix for incorrect QtWebKit master module header file creation
Diffstat (limited to 'Tools/DumpRenderTree')
14 files changed, 47 insertions, 8 deletions
diff --git a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp index 78414a25a..cc930e166 100644 --- a/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp +++ b/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp @@ -637,7 +637,7 @@ void DumpRenderTree::didReceiveTitleForFrame(const String& title, WebCore::Frame printf("%s - didReceiveTitle: %s\n", drtFrameDescription(frame).utf8().data(), title.utf8().data()); if (gTestRunner->dumpTitleChanges()) - printf("TITLE CHANGED: %s\n", title.utf8().data()); + printf("TITLE CHANGED: '%s'\n", title.utf8().data()); } // ChromeClient delegates. diff --git a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp index 08002094c..c0278cd57 100644 --- a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp +++ b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp @@ -348,6 +348,7 @@ AccessibilityUIElement::AccessibilityUIElement(const WebAccessibilityObject& obj bindProperty("isCollapsed", &AccessibilityUIElement::isCollapsedGetterCallback); bindProperty("hasPopup", &AccessibilityUIElement::hasPopupGetterCallback); bindProperty("isValid", &AccessibilityUIElement::isValidGetterCallback); + bindProperty("isReadOnly", &AccessibilityUIElement::isReadOnlyGetterCallback); bindProperty("orientation", &AccessibilityUIElement::orientationGetterCallback); // @@ -584,6 +585,11 @@ void AccessibilityUIElement::isValidGetterCallback(CppVariant* result) result->set(!accessibilityObject().isDetached()); } +void AccessibilityUIElement::isReadOnlyGetterCallback(CppVariant* result) +{ + result->set(accessibilityObject().isReadOnly()); +} + void AccessibilityUIElement::orientationGetterCallback(CppVariant* result) { result->set(getOrientation(accessibilityObject())); diff --git a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.h b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.h index 0710b4d80..d9e73e57e 100644 --- a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.h +++ b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.h @@ -90,6 +90,7 @@ private: void isCollapsedGetterCallback(CppVariant*); void hasPopupGetterCallback(CppVariant*); void isValidGetterCallback(CppVariant*); + void isReadOnlyGetterCallback(CppVariant*); void orientationGetterCallback(CppVariant*); // Bound methods. diff --git a/Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp b/Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp index 236012865..23b65d071 100644 --- a/Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp +++ b/Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp @@ -1188,6 +1188,10 @@ void EventSender::gestureEvent(WebInputEvent::Type type, const CppArgumentList& case WebInputEvent::GestureTapDown: event.x = point.x; event.y = point.y; + if (arguments.size() >= 4) { + event.data.tapDown.width = static_cast<float>(arguments[2].toDouble()); + event.data.tapDown.height = static_cast<float>(arguments[3].toDouble()); + } break; case WebInputEvent::GestureTapCancel: event.x = point.x; diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp index 87a913fc6..87faaf248 100644 --- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp +++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp @@ -1192,7 +1192,7 @@ void WebViewHost::didReceiveTitle(WebFrame* frame, const WebString& title, WebTe } if (testRunner()->shouldDumpTitleChanges()) - printf("TITLE CHANGED: %s\n", title8.data()); + printf("TITLE CHANGED: '%s'\n", title8.data()); setPageTitle(title); testRunner()->setTitleTextDirection(direction); diff --git a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp index 6e23dd301..09d7d4033 100644 --- a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp +++ b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp @@ -292,6 +292,8 @@ void DumpRenderTreeChrome::resetDefaultsToConsistentValues() ewk_history_clear(ewk_view_history_get(mainView())); + ewk_frame_feed_focus_in(mainFrame()); + ewk_cookies_clear(); ewk_cookies_policy_set(EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY); @@ -311,6 +313,7 @@ void DumpRenderTreeChrome::resetDefaultsToConsistentValues() DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(mainView(), false); DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false); DumpRenderTreeSupportEfl::setMinimumLogicalFontSize(mainView(), 9); + DumpRenderTreeSupportEfl::setCSSRegionsEnabled(mainView(), true); // Reset capacities for the memory cache for dead objects. static const unsigned cacheTotalCapacity = 8192 * 1024; @@ -513,7 +516,7 @@ void DumpRenderTreeChrome::onFrameTitleChanged(void*, Evas_Object* frame, void* } if (!done && gTestRunner->dumpTitleChanges()) - printf("TITLE CHANGED: %s\n", (titleText && titleText->string) ? titleText->string : ""); + printf("TITLE CHANGED: '%s'\n", (titleText && titleText->string) ? titleText->string : ""); if (!done && gTestRunner->dumpHistoryDelegateCallbacks()) printf("WebView updated the title for history URL \"%s\" to \"%s\".\n", ewk_frame_uri_get(frame) diff --git a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp index e43e7e075..2e380c569 100644 --- a/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp +++ b/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp @@ -707,6 +707,8 @@ void TestRunner::overridePreference(JSStringRef key, JSStringRef value) DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(browser->mainView(), toBool(value)); else if (equals(key, "WebKitCSSGridLayoutEnabled")) DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled(browser->mainView(), toBool(value)); + else if (equals(key, "WebKitCSSRegionsEnabled")) + DumpRenderTreeSupportEfl::setCSSRegionsEnabled(browser->mainView(), toBool(value)); else if (equals(key, "WebKitWebAudioEnabled")) ewk_view_setting_web_audio_set(browser->mainView(), toBool(value)); else diff --git a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp index eecade97c..ad27436c2 100644 --- a/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp +++ b/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp @@ -944,7 +944,7 @@ static gboolean webViewScriptConfirm(WebKitWebView* view, WebKitWebFrame* frame, static void webViewTitleChanged(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer data) { if (gTestRunner->dumpTitleChanges() && !done) - printf("TITLE CHANGED: %s\n", title ? title : ""); + printf("TITLE CHANGED: '%s'\n", title ? title : ""); } static bool webViewNavigationPolicyDecisionRequested(WebKitWebView* view, WebKitWebFrame* frame, diff --git a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm index 88cc7c920..274ea96b5 100644 --- a/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm +++ b/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm @@ -344,7 +344,7 @@ } if (gTestRunner->dumpTitleChanges()) - printf("TITLE CHANGED: %s\n", [title UTF8String]); + printf("TITLE CHANGED: '%s'\n", [title UTF8String]); } - (void)webView:(WebView *)sender didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index be984e3eb..abe08aa26 100755 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -1002,7 +1002,7 @@ void DumpRenderTree::dump() void DumpRenderTree::titleChanged(const QString &s) { if (m_controller->shouldDumpTitleChanges()) - printf("TITLE CHANGED: %s\n", s.toUtf8().data()); + printf("TITLE CHANGED: '%s'\n", s.toUtf8().data()); } void DumpRenderTree::connectFrame(QWebFrame *frame) diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp index 58a75a728..f0c64c369 100644 --- a/Tools/DumpRenderTree/qt/EventSenderQt.cpp +++ b/Tools/DumpRenderTree/qt/EventSenderQt.cpp @@ -29,6 +29,7 @@ #include "config.h" #include "EventSenderQt.h" +#include <QGestureEvent> #include <QGraphicsSceneMouseEvent> #include <QtTest/QtTest> #include <qpa/qwindowsysteminterface.h> @@ -59,6 +60,9 @@ static unsigned startOfQueue; EventSender::EventSender(QWebPage* parent) : QObject(parent) +#ifndef QT_NO_GESTURES + , m_tapGesture(parent) +#endif { m_page = parent; m_mouseButtonPressed = false; @@ -531,6 +535,17 @@ void EventSender::sendTouchEvent(QEvent::Type type) } } +#ifndef QT_NO_GESTURES +void EventSender::gestureTap(int x, int y) +{ + m_tapGesture.setPosition(QPointF(x, y)); + m_gestures.clear(); + m_gestures.append(&m_tapGesture); + QGestureEvent event(m_gestures); + sendEvent(m_page, &event); +} +#endif + void EventSender::zoomPageIn() { if (QWebFrame* frame = m_page->mainFrame()) diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.h b/Tools/DumpRenderTree/qt/EventSenderQt.h index 1c4db0208..8a4d9362a 100644 --- a/Tools/DumpRenderTree/qt/EventSenderQt.h +++ b/Tools/DumpRenderTree/qt/EventSenderQt.h @@ -36,6 +36,7 @@ #include <QBasicTimer> #include <QEvent> #include <QEventLoop> +#include <QGesture> #include <QMouseEvent> #include <QObject> #include <QPoint> @@ -83,6 +84,9 @@ public Q_SLOTS: void clearTouchPoints(); void releaseTouchPoint(int index); void cancelTouchPoint(int index); +#ifndef QT_NO_GESTURES + void gestureTap(int x, int y); +#endif protected: void timerEvent(QTimerEvent*); @@ -112,6 +116,10 @@ private: QBasicTimer m_clickTimer; QList<QTouchEvent::TouchPoint> m_touchPoints; Qt::KeyboardModifiers m_touchModifiers; +#ifndef QT_NO_GESTURES + QTapGesture m_tapGesture; + QList<QGesture*> m_gestures; +#endif bool m_touchActive; }; #endif // EventSenderQt_h diff --git a/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp b/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp index 28d1317a6..0ea40fa17 100644 --- a/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp +++ b/Tools/DumpRenderTree/win/FrameLoadDelegate.cpp @@ -180,7 +180,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didReceiveTitle( printf("%s - didReceiveTitle: %S\n", descriptionSuitableForTestResult(frame).c_str(), title); if (::gTestRunner->dumpTitleChanges() && !done) - printf("TITLE CHANGED: %S\n", title ? title : L""); + printf("TITLE CHANGED: '%S'\n", title ? title : L""); return S_OK; } diff --git a/Tools/DumpRenderTree/wx/DumpRenderTreeWx.cpp b/Tools/DumpRenderTree/wx/DumpRenderTreeWx.cpp index 0f8788504..538ff249d 100644 --- a/Tools/DumpRenderTree/wx/DumpRenderTreeWx.cpp +++ b/Tools/DumpRenderTree/wx/DumpRenderTreeWx.cpp @@ -129,7 +129,7 @@ public: void OnReceivedTitleEvent(WebViewReceivedTitleEvent& event) { if (gTestRunner->dumpTitleChanges() && !done) - wxFprintf(stdout, "TITLE CHANGED: %S\n", event.GetTitle()); + wxFprintf(stdout, "TITLE CHANGED: '%S'\n", event.GetTitle()); } void OnWindowObjectClearedEvent(WebViewWindowObjectClearedEvent& event) |