Changeset 139016 in webkit


Ignore:
Timestamp:
Jan 7, 2013 5:00:44 PM (11 years ago)
Author:
tony@chromium.org
Message:

Remove more internals.settings that are autogenerated
​https://bugs.webkit.org/show_bug.cgi?id=106253

Reviewed by Adam Barth.

Source/WebCore:

Remove 8 methods that are autogenerated by Settings.in.

No new tests, this is a refactor and is convered by existing tests.

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::Backup::Backup): Remove backup.
(WebCore::InternalSettings::Backup::restoreTo): Remove restore.

  • testing/InternalSettings.h:

(Backup): Remove member variables and functions.
(InternalSettings):

  • testing/InternalSettings.idl: Remove functions.

LayoutTests:

These tests were manually trying to reset setMediaPlaybackRequiresUserGesture
when the test ended because they weren't using the InternalSettings::Backup to
save/restore the prefs. The autogenerated code will properly reset these prefs
before the next test.

  • media/no-autoplay-with-user-gesture-requirement.html:
  • media/video-load-require-user-gesture.html:
  • media/video-play-require-user-gesture.html:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r139013 r139016  
     12013-01-07  Tony Chang  <tony@chromium.org>
     2
     3        Remove more internals.settings that are autogenerated
     4        https://bugs.webkit.org/show_bug.cgi?id=106253
     5
     6        Reviewed by Adam Barth.
     7
     8        These tests were manually trying to reset setMediaPlaybackRequiresUserGesture
     9        when the test ended because they weren't using the InternalSettings::Backup to
     10        save/restore the prefs. The autogenerated code will properly reset these prefs
     11        before the next test.
     12
     13        * media/no-autoplay-with-user-gesture-requirement.html:
     14        * media/video-load-require-user-gesture.html:
     15        * media/video-play-require-user-gesture.html:
     16
    1172013-01-07  Emil A Eklund  <eae@chromium.org>
    218

  • trunk/LayoutTests/media/no-autoplay-with-user-gesture-requirement.html

    r120264 r139016  
    88                window.internals.settings.setMediaPlaybackRequiresUserGesture(true);
    99
    10             function cleanGestureRequirement()
    11             {
    12                 if (window.internals)
    13                     window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
    14             }
    15 
    1610            function testPlay()
    1711            {
    18                 cleanGestureRequirement();
    1912                failTest("play event should not fire without user gesture.");
    2013            }
    … …  
    2316            {
    2417                testExpected("video.paused", true);
    25                 cleanGestureRequirement();
    2618                endTest();
    2719            }

  • trunk/LayoutTests/media/video-load-require-user-gesture.html

    r135866 r139016  
    1212            function finishTest(success)
    1313            {
    14                 if (window.internals)
    15                     window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
    16 
    1714                if (success)
    1815                    endTest();

  • trunk/LayoutTests/media/video-play-require-user-gesture.html

    r114586 r139016  
    1010                window.internals.settings.setMediaPlaybackRequiresUserGesture(true);
    1111
    12             function cleanGestureRequirement() {
    13                 if (window.internals)
    14                     window.internals.settings.setMediaPlaybackRequiresUserGesture(false);
    15             }
    16 
    1712            function click()
    1813            {
    … …  
    2217                        playCoords = mediaControlsButtonCoordinates(video, "play-button");
    2318                    } catch (exception) {
    24                         cleanGestureRequirement();
    2519                        failTest(exception.description);
    2620                        return;
    … …  
    3933            {
    4034                if (userGestureInitiated == 0) {
    41                     cleanGestureRequirement();
    4235                    failTest("Should not play without user gesture.");
    4336                } else {
    … …  
    5548                    run("video.webkitEnterFullScreen()");
    5649                } catch(ex) {
    57                     cleanGestureRequirement();
    5850                    failTest("video.webkitEnterFullScreen() still requires user gesture.");
    5951                }
    60                 cleanGestureRequirement();
    6152                endTest();
    6253            }

  • trunk/Source/WebCore/ChangeLog

    r139015 r139016  
     12013-01-07  Tony Chang  <tony@chromium.org>
     2
     3        Remove more internals.settings that are autogenerated
     4        https://bugs.webkit.org/show_bug.cgi?id=106253
     5
     6        Reviewed by Adam Barth.
     7
     8        Remove 8 methods that are autogenerated by Settings.in.
     9
     10        No new tests, this is a refactor and is convered by existing tests.
     11
     12        * testing/InternalSettings.cpp:
     13        (WebCore::InternalSettings::Backup::Backup): Remove backup.
     14        (WebCore::InternalSettings::Backup::restoreTo): Remove restore.
     15        * testing/InternalSettings.h:
     16        (Backup): Remove member variables and functions.
     17        (InternalSettings):
     18        * testing/InternalSettings.idl: Remove functions.
     19
    1202013-01-07  Ryosuke Niwa  <rniwa@webkit.org>
    221

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r138840 r139016  
    6464
    6565InternalSettings::Backup::Backup(Settings* settings)
    66     : m_originalFixedElementsLayoutRelativeToFrame(settings->fixedElementsLayoutRelativeToFrame())
    67     , m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
     66    : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::cssExclusionsEnabled())
    6867    , m_originalCSSVariablesEnabled(settings->cssVariablesEnabled())
    6968#if ENABLE(SHADOW_DOM)
    … …  
    7675    , m_originalEditingBehavior(settings->editingBehaviorType())
    7776    , m_originalUnifiedSpellCheckerEnabled(settings->unifiedTextCheckerEnabled())
    78     , m_originalFixedPositionCreatesStackingContext(settings->fixedPositionCreatesStackingContext())
    79     , m_originalSyncXHRInDocumentsEnabled(settings->syncXHRInDocumentsEnabled())
    80     , m_originalWindowFocusRestricted(settings->windowFocusRestricted())
    81     , m_originalDeviceSupportsTouch(settings->deviceSupportsTouch())
    82     , m_originalDeviceSupportsMouse(settings->deviceSupportsMouse())
    8377#if ENABLE(TEXT_AUTOSIZING)
    8478    , m_originalTextAutosizingEnabled(settings->textAutosizingEnabled())
    … …  
    10599void InternalSettings::Backup::restoreTo(Settings* settings)
    106100{
    107     settings->setFixedElementsLayoutRelativeToFrame(m_originalFixedElementsLayoutRelativeToFrame);
    108101    RuntimeEnabledFeatures::setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
    109102    settings->setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
    … …  
    117110    settings->setEditingBehaviorType(m_originalEditingBehavior);
    118111    settings->setUnifiedTextCheckerEnabled(m_originalUnifiedSpellCheckerEnabled);
    119     settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
    120     settings->setSyncXHRInDocumentsEnabled(m_originalSyncXHRInDocumentsEnabled);
    121     settings->setWindowFocusRestricted(m_originalWindowFocusRestricted);
    122     settings->setDeviceSupportsTouch(m_originalDeviceSupportsTouch);
    123     settings->setDeviceSupportsMouse(m_originalDeviceSupportsMouse);
    124112#if ENABLE(TEXT_AUTOSIZING)
    125113    settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled);
    … …  
    203191}
    204192
    205 void InternalSettings::setFixedElementsLayoutRelativeToFrame(bool enabled, ExceptionCode& ec)
    206 {
    207     InternalSettingsGuardForSettings();
    208     settings()->setFixedElementsLayoutRelativeToFrame(enabled);
    209 }
    210 
    211193void InternalSettings::setUnifiedTextCheckingEnabled(bool enabled, ExceptionCode& ec)
    212194{
    … …  
    263245}
    264246
    265 void InternalSettings::setDeviceSupportsTouch(bool enabled, ExceptionCode& ec)
    266 {
    267     InternalSettingsGuardForSettings();
    268     settings()->setDeviceSupportsTouch(enabled);
    269 }
    270 
    271 void InternalSettings::setDeviceSupportsMouse(bool enabled, ExceptionCode& ec)
    272 {
    273     InternalSettingsGuardForSettings();
    274     settings()->setDeviceSupportsMouse(enabled);
    275 }
    276 
    277247typedef void (Settings::*SetFontFamilyFunction)(const AtomicString&, UScriptCode);
    278248static void setFontFamily(Settings* settings, const String& family, const String& script, SetFontFamilyFunction setter)
    … …  
    416386    InternalSettingsGuardForSettings();
    417387    m_page->setCanStartMedia(enabled);
    418 }
    419 
    420 void InternalSettings::setMediaPlaybackRequiresUserGesture(bool enabled, ExceptionCode& ec)
    421 {
    422     InternalSettingsGuardForSettings();
    423     settings()->setMediaPlaybackRequiresUserGesture(enabled);
    424388}
    425389
    … …  
    435399    else
    436400        ec = SYNTAX_ERR;
    437 }
    438 
    439 void InternalSettings::setFixedPositionCreatesStackingContext(bool creates, ExceptionCode& ec)
    440 {
    441     InternalSettingsGuardForSettings();
    442     settings()->setFixedPositionCreatesStackingContext(creates);
    443 }
    444 
    445 void InternalSettings::setSyncXHRInDocumentsEnabled(bool enabled, ExceptionCode& ec)
    446 {
    447     InternalSettingsGuardForSettings();
    448     settings()->setSyncXHRInDocumentsEnabled(enabled);
    449 }
    450 
    451 void InternalSettings::setWindowFocusRestricted(bool restricted, ExceptionCode& ec)
    452 {
    453     InternalSettingsGuardForSettings();
    454     settings()->setWindowFocusRestricted(restricted);
    455401}
    456402
    … …  
    504450}
    505451
    506 void InternalSettings::setMemoryInfoEnabled(bool enabled, ExceptionCode& ec)
    507 {
    508     InternalSettingsGuardForSettings();
    509     settings()->setMemoryInfoEnabled(enabled);
    510 }
    511 
    512452void InternalSettings::setStorageBlockingPolicy(const String& mode, ExceptionCode& ec)
    513453{

  • trunk/Source/WebCore/testing/InternalSettings.h

    r138840 r139016  
    5050        void restoreTo(Settings*);
    5151
    52         bool m_originalFixedElementsLayoutRelativeToFrame;
    5352        bool m_originalCSSExclusionsEnabled;
    5453        bool m_originalCSSVariablesEnabled;
    … …  
    6261        EditingBehaviorType m_originalEditingBehavior;
    6362        bool m_originalUnifiedSpellCheckerEnabled;
    64         bool m_originalFixedPositionCreatesStackingContext;
    65         bool m_originalSyncXHRInDocumentsEnabled;
    66         bool m_originalWindowFocusRestricted;
    67         bool m_originalDeviceSupportsTouch;
    68         bool m_originalDeviceSupportsMouse;
    6963#if ENABLE(TEXT_AUTOSIZING)
    7064        bool m_originalTextAutosizingEnabled;
    … …  
    10195    void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
    10296    void setUsesOverlayScrollbars(bool enabled, ExceptionCode&);
    103     void setFixedElementsLayoutRelativeToFrame(bool, ExceptionCode&);
    10497    void setUnifiedTextCheckingEnabled(bool, ExceptionCode&);
    10598    bool unifiedTextCheckingEnabled(ExceptionCode&);
    10699    void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&);
    107     void setDeviceSupportsTouch(bool enabled, ExceptionCode&);
    108     void setDeviceSupportsMouse(bool enabled, ExceptionCode&);
    109100    void setShadowDOMEnabled(bool enabled, ExceptionCode&);
    110101    void setAuthorShadowDOMForAnyElementEnabled(bool);
    … …  
    128119    bool cssVariablesEnabled(ExceptionCode&);
    129120    void setCanStartMedia(bool, ExceptionCode&);
    130     void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
    131121    void setEditingBehavior(const String&, ExceptionCode&);
    132     void setFixedPositionCreatesStackingContext(bool, ExceptionCode&);
    133     void setSyncXHRInDocumentsEnabled(bool, ExceptionCode&);
    134     void setWindowFocusRestricted(bool, ExceptionCode&);
    135122    void setDialogElementEnabled(bool, ExceptionCode&);
    136123    void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);
    137124    bool shouldDisplayTrackKind(const String& kind, ExceptionCode&);
    138     void setMemoryInfoEnabled(bool, ExceptionCode&);
    139125    void setStorageBlockingPolicy(const String&, ExceptionCode&);
    140126    void setLangAttributeAwareFormControlUIEnabled(bool);

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r138840 r139016  
    2929] interface InternalSettings : InternalSettingsGenerated {
    3030    void setMockScrollbarsEnabled(in boolean enabled) raises(DOMException);
    31     void setFixedElementsLayoutRelativeToFrame(in boolean enabled) raises(DOMException);
    3231    void setUnifiedTextCheckingEnabled(in boolean enabled) raises (DOMException);
    3332    boolean unifiedTextCheckingEnabled() raises (DOMException);
    3433    void setTouchEventEmulationEnabled(in boolean enabled) raises(DOMException);
    35     void setDeviceSupportsTouch(in boolean enabled) raises(DOMException);
    36     void setDeviceSupportsMouse(in boolean enabled) raises(DOMException);
    3734    void setShadowDOMEnabled(in boolean enabled) raises(DOMException);
    3835    void setAuthorShadowDOMForAnyElementEnabled(in boolean isEnabled);
    … …  
    5653    boolean cssVariablesEnabled() raises(DOMException);
    5754    void setCanStartMedia(in boolean enabled) raises(DOMException);
    58     void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
    5955    void setEditingBehavior(in DOMString behavior) raises(DOMException);
    60     void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
    61     void setSyncXHRInDocumentsEnabled(in boolean enabled) raises(DOMException);
    62     void setWindowFocusRestricted(in boolean restricted) raises(DOMException);
    6356    void setDialogElementEnabled(in boolean enabled) raises(DOMException);
    6457    void setLangAttributeAwareFormControlUIEnabled(in boolean enabled);
    … …  
    6659    [Conditional=VIDEO_TRACK] void setShouldDisplayTrackKind(in DOMString kind, in boolean enabled) raises (DOMException);
    6760    [Conditional=VIDEO_TRACK] boolean shouldDisplayTrackKind(in DOMString trackKind) raises (DOMException);
    68     void setMemoryInfoEnabled(in boolean enabled) raises(DOMException);
    6961    void setStorageBlockingPolicy(in DOMString policy) raises(DOMException);
    7062    void setImagesEnabled(in boolean enabled) raises(DOMException);
Note: See TracChangeset for help on using the changeset viewer.