Changeset 146300 in webkit


Ignore:
Timestamp:
Mar 19, 2013, 9:16:47 PM (12 years ago)
Author:
tony@chromium.org
Message:

Move testRunner.setTouchDragDropEnabled to internals.settings
​https://bugs.webkit.org/show_bug.cgi?id=112739

Reviewed by Adam Barth.

Tools:

  • 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.

LayoutTests:

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:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r146298 r146300  
     12013-03-19  Tony Chang  <tony@chromium.org>
     2
     3        Move testRunner.setTouchDragDropEnabled to internals.settings
     4        https://bugs.webkit.org/show_bug.cgi?id=112739
     5
     6        Reviewed by Adam Barth.
     7
     8        Update tests to use internals.settings. This testRunner method was only exposed on
     9        Chromium, but now that Settings.in generates internals.settings setters, we can
     10        use that instead.
     11
     12        * fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html:
     13        * fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html:
     14        * fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html:
     15        * touchadjustment/touch-links-longpress.html:
     16
    1172013-03-19  Ryosuke Niwa  <rniwa@webkit.org>
    218

  • trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-iframe-triggers-drag.html

    r140292 r146300  
    2121        testRunner.dumpAsText();
    2222
    23     if (testRunner.setTouchDragDropEnabled)
    24         testRunner.setTouchDragDropEnabled(true);
     23    if (window.internals)
     24        internals.settings.setTouchDragDropEnabled(true);
    2525
    2626    if (!window.eventSender)

  • trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-in-nested-iframes-triggers-drag.html

    r140292 r146300  
    2121        testRunner.dumpAsText();
    2222
    23     if (testRunner.setTouchDragDropEnabled)
    24         testRunner.setTouchDragDropEnabled(true);
     23    if (window.internals)
     24        internals.settings.setTouchDragDropEnabled(true);
    2525
    2626    if (!window.eventSender)

  • trunk/LayoutTests/fast/events/touch/gesture/long-press-on-draggable-element-triggers-drag.html

    r135789 r146300  
    1515        testRunner.dumpAsText();
    1616
    17     if (testRunner.setTouchDragDropEnabled)
    18         testRunner.setTouchDragDropEnabled(true);
     17    if (window.internals)
     18        internals.settings.setTouchDragDropEnabled(true);
    1919
    2020    document.ondragstart = function() { document.getElementById("result").innerHTML = "PASS"; }

  • trunk/LayoutTests/touchadjustment/touch-links-longpress.html

    r135789 r146300  
    9090    {
    9191        if (window.testRunner && window.internals && internals.touchNodeAdjustedToBestClickableNode) {
    92             testRunner.setTouchDragDropEnabled(true);
     92            internals.settings.setTouchDragDropEnabled(true);
    9393            description('Tests if a long press gesture on links will trigger a drag/drop when touch adjustment is used.');
    9494            testDirectTouches();

  • trunk/Tools/ChangeLog

    r146299 r146300  
     12013-03-19  Tony Chang  <tony@chromium.org>
     2
     3        Move testRunner.setTouchDragDropEnabled to internals.settings
     4        https://bugs.webkit.org/show_bug.cgi?id=112739
     5
     6        Reviewed by Adam Barth.
     7
     8        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
     9        (WebTestRunner::TestRunner::TestRunner): Remove unnecessary code.
     10        * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
     11        (TestRunner): Remove unnecessary code.
     12        * DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:
     13        (WebTestRunner::WebPreferences::reset):
     14        (WebTestRunner::WebPreferences::applyTo): Always set to false.
     15
    1162013-03-19  Mark Pilgrim  <pilgrim@chromium.org>
    217

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp

    r146139 r146300  
    226226    bindMethod("overridePreference", &TestRunner::overridePreference);
    227227    bindMethod("setPluginsEnabled", &TestRunner::setPluginsEnabled);
    228     bindMethod("setTouchDragDropEnabled", &TestRunner::setTouchDragDropEnabled);
    229228
    230229    // The following modify the state of the TestRunner.
    … …  
    16611660}
    16621661
    1663 void TestRunner::setTouchDragDropEnabled(const CppArgumentList& arguments, CppVariant* result)
    1664 {
    1665     if (arguments.size() > 0 && arguments[0].isBool()) {
    1666         m_delegate->preferences()->touchDragDropEnabled = arguments[0].toBoolean();
    1667         m_delegate->applyPreferences();
    1668     }
    1669     result->setNull();
    1670 }
    1671 
    16721662void TestRunner::showWebInspector(const CppArgumentList&, CppVariant* result)
    16731663{

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h

    r146139 r146300  
    304304    void setPluginsEnabled(const CppArgumentList&, CppVariant*);
    305305
    306     void setTouchDragDropEnabled(const CppArgumentList&, CppVariant*);
    307 
    308306    ///////////////////////////////////////////////////////////////////////////
    309307    // Methods that modify the state of TestRunner

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp

    r146240 r146300  
    130130    shouldRespectImageOrientation = false;
    131131    asynchronousSpellCheckingEnabled = false;
    132     touchDragDropEnabled = false;
    133132}
    134133
    … …  
    198197    settings->setShouldRespectImageOrientation(shouldRespectImageOrientation);
    199198    settings->setAsynchronousSpellCheckingEnabled(asynchronousSpellCheckingEnabled);
    200     settings->setTouchDragDropEnabled(touchDragDropEnabled);
    201199
    202200    // Fixed values.
     201    settings->setTouchDragDropEnabled(false);
    203202    settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
    204203    settings->setDownloadableBinaryFontsEnabled(true);
Note: See TracChangeset for help on using the changeset viewer.