summaryrefslogtreecommitdiff
path: root/Tools/DumpRenderTree/chromium
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
commita59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch)
treefa539db054a20a67bff2fc891c33b0f4ec632916 /Tools/DumpRenderTree/chromium
parentcfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff)
downloadqtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Tools/DumpRenderTree/chromium')
-rw-r--r--Tools/DumpRenderTree/chromium/TestShell.cpp3
-rw-r--r--Tools/DumpRenderTree/chromium/TestWebPlugin.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/Tools/DumpRenderTree/chromium/TestShell.cpp b/Tools/DumpRenderTree/chromium/TestShell.cpp
index 4c42dc0dd..2bccb6a32 100644
--- a/Tools/DumpRenderTree/chromium/TestShell.cpp
+++ b/Tools/DumpRenderTree/chromium/TestShell.cpp
@@ -255,8 +255,9 @@ void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels)
m_testRunner->setShouldDumpFrameLoadCallbacks(true);
if (testUrl.find("compositing/") != string::npos || testUrl.find("compositing\\") != string::npos) {
+ if (!m_softwareCompositingEnabled)
+ m_prefs.accelerated2dCanvasEnabled = true;
m_prefs.acceleratedCompositingForVideoEnabled = true;
- m_prefs.accelerated2dCanvasEnabled = true;
m_prefs.deferred2dCanvasEnabled = true;
m_prefs.mockScrollbarsEnabled = true;
m_prefs.applyTo(m_webView);
diff --git a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
index 414db2c1c..146884613 100644
--- a/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
+++ b/Tools/DumpRenderTree/chromium/TestWebPlugin.cpp
@@ -459,6 +459,7 @@ bool TestWebPlugin::handleInputEvent(const WebKit::WebInputEvent& event, WebKit:
case WebKit::WebInputEvent::GestureDoubleTap: eventName = "GestureDoubleTap"; break;
case WebKit::WebInputEvent::GestureTwoFingerTap: eventName = "GestureTwoFingerTap"; break;
case WebKit::WebInputEvent::GestureLongPress: eventName = "GestureLongPress"; break;
+ case WebKit::WebInputEvent::GestureLongTap: eventName = "GestureLongTap"; break;
case WebKit::WebInputEvent::GesturePinchBegin: eventName = "GesturePinchBegin"; break;
case WebKit::WebInputEvent::GesturePinchEnd: eventName = "GesturePinchEnd"; break;
case WebKit::WebInputEvent::GesturePinchUpdate: eventName = "GesturePinchUpdate"; break;