diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Tools/DumpRenderTree/chromium | |
parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Tools/DumpRenderTree/chromium')
3 files changed, 5 insertions, 0 deletions
diff --git a/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp b/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp index f31120209..b2d50feb3 100644 --- a/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp +++ b/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp @@ -213,12 +213,14 @@ bool MockWebRTCPeerConnectionHandler::addICECandidate(const WebRTCICECandidate& bool MockWebRTCPeerConnectionHandler::addStream(const WebMediaStreamDescriptor& stream, const WebMediaConstraints&) { m_client->didAddRemoteStream(stream); + m_client->negotiationNeeded(); return true; } void MockWebRTCPeerConnectionHandler::removeStream(const WebMediaStreamDescriptor& stream) { m_client->didRemoveRemoteStream(stream); + m_client->negotiationNeeded(); } void MockWebRTCPeerConnectionHandler::stop() diff --git a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp index f5ae9258c..08002094c 100644 --- a/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp +++ b/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp @@ -218,6 +218,8 @@ static string roleToString(WebAccessibilityRole role) return result.append("Form"); case WebAccessibilityRoleHorizontalRule: return result.append("HorizontalRule"); + case WebAccessibilityRoleLegend: + return result.append("Legend"); default: // Also matches WebAccessibilityRoleUnknown. return result.append("Unknown"); diff --git a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp index bbeba6f9b..c78c9ed12 100644 --- a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp +++ b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp @@ -392,6 +392,7 @@ bool TestWebPlugin::handleInputEvent(const WebKit::WebInputEvent& event, WebKit: case WebKit::WebInputEvent::GestureFlingCancel: eventName = "GestureFlingCancel"; break; case WebKit::WebInputEvent::GestureTap: eventName = "GestureTap"; break; case WebKit::WebInputEvent::GestureTapDown: eventName = "GestureTapDown"; break; + case WebKit::WebInputEvent::GestureTapCancel: eventName = "GestureTapCancel"; break; case WebKit::WebInputEvent::GestureDoubleTap: eventName = "GestureDoubleTap"; break; case WebKit::WebInputEvent::GestureTwoFingerTap: eventName = "GestureTwoFingerTap"; break; case WebKit::WebInputEvent::GestureLongPress: eventName = "GestureLongPress"; break; |