Diff
Modified: trunk/LayoutTests/ChangeLog (146299 => 146300)
--- trunk/LayoutTests/ChangeLog 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/LayoutTests/ChangeLog 2013-03-20 04:16:47 UTC (rev 146300)
@@ -1,3 +1,19 @@
+2013-03-19 Tony Chang <t...@chromium.org>
+
+ Move testRunner.setTouchDragDropEnabled to internals.settings
+ https://bugs.webkit.org/show_bug.cgi?id=112739
+
+ Reviewed by Adam Barth.
+
+ Update tests to use internals.settings. This testRunner method was only exposed on
+ Chromium, but now that Settings.in generates internals.settings setters, we can
+ use that instead.
+
+ * fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html:
+ * fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html:
+ * fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html:
+ * touchadjustment/touch-links-longpress.html:
+
2013-03-19 Ryosuke Niwa <rn...@webkit.org>
Fix expected results added in r146224.
Modified: trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html (146299 => 146300)
--- trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html 2013-03-20 04:16:47 UTC (rev 146300)
@@ -20,8 +20,8 @@
if (window.testRunner)
testRunner.dumpAsText();
- if (testRunner.setTouchDragDropEnabled)
- testRunner.setTouchDragDropEnabled(true);
+ if (window.internals)
+ internals.settings.setTouchDragDropEnabled(true);
if (!window.eventSender)
return;
Modified: trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html (146299 => 146300)
--- trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html 2013-03-20 04:16:47 UTC (rev 146300)
@@ -20,8 +20,8 @@
if (window.testRunner)
testRunner.dumpAsText();
- if (testRunner.setTouchDragDropEnabled)
- testRunner.setTouchDragDropEnabled(true);
+ if (window.internals)
+ internals.settings.setTouchDragDropEnabled(true);
if (!window.eventSender)
return;
Modified: trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html (146299 => 146300)
--- trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html 2013-03-20 04:16:47 UTC (rev 146300)
@@ -14,8 +14,8 @@
if (window.testRunner)
testRunner.dumpAsText();
- if (testRunner.setTouchDragDropEnabled)
- testRunner.setTouchDragDropEnabled(true);
+ if (window.internals)
+ internals.settings.setTouchDragDropEnabled(true);
document._ondragstart_ = function() { document.getElementById("result").innerHTML = "PASS"; }
Modified: trunk/LayoutTests/touchadjustment/touch-links-longpress.html (146299 => 146300)
--- trunk/LayoutTests/touchadjustment/touch-links-longpress.html 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/LayoutTests/touchadjustment/touch-links-longpress.html 2013-03-20 04:16:47 UTC (rev 146300)
@@ -89,7 +89,7 @@
function runTests()
{
if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
- testRunner.setTouchDragDropEnabled(true);
+ internals.settings.setTouchDragDropEnabled(true);
description('Tests if a long press gesture on links will trigger a drag/drop when touch adjustment is used.');
testDirectTouches();
testIndirectTouches();
Modified: trunk/Tools/ChangeLog (146299 => 146300)
--- trunk/Tools/ChangeLog 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/Tools/ChangeLog 2013-03-20 04:16:47 UTC (rev 146300)
@@ -1,3 +1,18 @@
+2013-03-19 Tony Chang <t...@chromium.org>
+
+ Move testRunner.setTouchDragDropEnabled to internals.settings
+ https://bugs.webkit.org/show_bug.cgi?id=112739
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ (WebTestRunner::TestRunner::TestRunner): Remove unnecessary code.
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+ (TestRunner): Remove unnecessary code.
+ * DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:
+ (WebTestRunner::WebPreferences::reset):
+ (WebTestRunner::WebPreferences::applyTo): Always set to false.
+
2013-03-19 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Migrate to WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (146299 => 146300)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-03-20 04:16:47 UTC (rev 146300)
@@ -225,7 +225,6 @@
bindMethod("setAllowFileAccessFromFileURLs", &TestRunner::setAllowFileAccessFromFileURLs);
bindMethod("overridePreference", &TestRunner::overridePreference);
bindMethod("setPluginsEnabled", &TestRunner::setPluginsEnabled);
- bindMethod("setTouchDragDropEnabled", &TestRunner::setTouchDragDropEnabled);
// The following modify the state of the TestRunner.
bindMethod("dumpEditingCallbacks", &TestRunner::dumpEditingCallbacks);
@@ -1660,15 +1659,6 @@
result->setNull();
}
-void TestRunner::setTouchDragDropEnabled(const CppArgumentList& arguments, CppVariant* result)
-{
- if (arguments.size() > 0 && arguments[0].isBool()) {
- m_delegate->preferences()->touchDragDropEnabled = arguments[0].toBoolean();
- m_delegate->applyPreferences();
- }
- result->setNull();
-}
-
void TestRunner::showWebInspector(const CppArgumentList&, CppVariant* result)
{
showDevTools();
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (146299 => 146300)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-03-20 04:16:47 UTC (rev 146300)
@@ -303,8 +303,6 @@
// Enable or disable plugins.
void setPluginsEnabled(const CppArgumentList&, CppVariant*);
- void setTouchDragDropEnabled(const CppArgumentList&, CppVariant*);
-
///////////////////////////////////////////////////////////////////////////
// Methods that modify the state of TestRunner
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp (146299 => 146300)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2013-03-20 04:08:49 UTC (rev 146299)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2013-03-20 04:16:47 UTC (rev 146300)
@@ -129,7 +129,6 @@
cssCustomFilterEnabled = false;
shouldRespectImageOrientation = false;
asynchronousSpellCheckingEnabled = false;
- touchDragDropEnabled = false;
}
void WebPreferences::applyTo(WebView* webView)
@@ -197,9 +196,9 @@
settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
settings->setShouldRespectImageOrientation(shouldRespectImageOrientation);
settings->setAsynchronousSpellCheckingEnabled(asynchronousSpellCheckingEnabled);
- settings->setTouchDragDropEnabled(touchDragDropEnabled);
// Fixed values.
+ settings->setTouchDragDropEnabled(false);
settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
settings->setDownloadableBinaryFontsEnabled(true);
settings->setAllowScriptsToCloseWindows(false);
