Changeset 135189 in webkit


Ignore:
Timestamp:
Nov 19, 2012, 1:05:26 PM (12 years ago)
Author:
tony@chromium.org
Message:

Remove 'is' prefix from WebSettings::isWebSecurityEnabled and WebSettings::isSpatialNavigationEnabled
​https://bugs.webkit.org/show_bug.cgi?id=102548

Reviewed by Adam Barth.

Source/WebCore:

This allows us to use Settings.in to generate the code for this.

I didn't rename any of the WebKit API methods with similar names because that would
probably break consumers. It turns out that the getter is only called from
Source/WebKit/efl (most of the time, WebPreferences just sets values on Settings).

No new tests, just a refactor.

  • WebCore.exp.in: Remove symbols that are now inlined.
  • WebCore.order: Remove symbols that are now inlined.
  • dom/Document.cpp:

(WebCore::Document::initSecurityContext): Rename.

  • page/Settings.cpp:

(WebCore::Settings::Settings): Remove code since it will be generated.

  • page/Settings.h:

(Settings): Remove code since it will be generated.

  • page/Settings.in: Add entries to be generated.
  • page/SpatialNavigation.cpp:

(WebCore::isSpatialNavigationEnabled): Fix caller.

Source/WebKit/efl:

Rename call to WebCore::Settings.

  • ewk/ewk_view.cpp:

(_ewk_view_priv_new):

Location:
trunk/Source
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r135188 r135189  
     12012-11-19  Tony Chang  <tony@chromium.org>
     2
     3        Remove 'is' prefix from WebSettings::isWebSecurityEnabled and WebSettings::isSpatialNavigationEnabled
     4        https://bugs.webkit.org/show_bug.cgi?id=102548
     5
     6        Reviewed by Adam Barth.
     7
     8        This allows us to use Settings.in to generate the code for this.
     9
     10        I didn't rename any of the WebKit API methods with similar names because that would
     11        probably break consumers.  It turns out that the getter is only called from
     12        Source/WebKit/efl (most of the time, WebPreferences just sets values on Settings).
     13
     14        No new tests, just a refactor.
     15
     16        * WebCore.exp.in: Remove symbols that are now inlined.
     17        * WebCore.order: Remove symbols that are now inlined.
     18        * dom/Document.cpp:
     19        (WebCore::Document::initSecurityContext): Rename.
     20        * page/Settings.cpp:
     21        (WebCore::Settings::Settings): Remove code since it will be generated.
     22        * page/Settings.h:
     23        (Settings): Remove code since it will be generated.
     24        * page/Settings.in: Add entries to be generated.
     25        * page/SpatialNavigation.cpp:
     26        (WebCore::isSpatialNavigationEnabled): Fix caller.
     27
    1282012-11-19  Yael Aharon  <yael.aharon@intel.com>
    229

  • trunk/Source/WebCore/WebCore.exp.in

    r135179 r135189  
    940940__ZN7WebCore8Settings21setShowRepaintCounterEb
    941941__ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode
    942 __ZN7WebCore8Settings21setWebSecurityEnabledEb
    943942__ZN7WebCore8Settings22setMinDOMTimerIntervalEd
    944943__ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode
    … …  
    957956__ZN7WebCore8Settings27setJavaEnabledForLocalFilesEb
    958957__ZN7WebCore8Settings27setLoadsImagesAutomaticallyEb
    959 __ZN7WebCore8Settings27setSpatialNavigationEnabledEb
    960958__ZN7WebCore8Settings28setDOMTimerAlignmentIntervalEd
    961959__ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb

  • trunk/Source/WebCore/WebCore.order

    r135009 r135189  
    14381438__ZN7WebCore8Settings14setJavaEnabledEb
    14391439__ZN7WebCore8Settings20setJavaScriptEnabledEb
    1440 __ZN7WebCore8Settings21setWebSecurityEnabledEb
    14411440__ZN7WebCore8Settings18setMinimumFontSizeEi
    14421441__ZN7WebCore8Settings25setMinimumLogicalFontSizeEi
    … …  
    14691468__ZN7WebCore27applicationIsAdobeInstallerEv
    14701469__ZN7WebCoreL19mainBundleIsEqualToERKN3WTF6StringE
    1471 __ZN7WebCore8Settings27setSpatialNavigationEnabledEb
    14721470__ZN7WebCore22applicationIsAppleMailEv
    14731471__ZN7WebCore23ApplicationCacheStorage21setDefaultOriginQuotaEx
    … …  
    1339213390__ZN7WebCore16VisibleSelection9setExtentERKNS_8PositionE
    1339313391__ZN7WebCore14FrameSelection23modifyExtendingBackwardENS_15TextGranularityE
    13394 __ZN7WebCore26isSpatialNavigationEnabledEPKNS_5FrameE
    1339513392__ZN7WebCore14FrameSelection30xPosForVerticalArrowNavigationENS0_13EPositionTypeE
    1339613393__ZNK7WebCore15VisiblePosition28xOffsetForVerticalNavigationEv

  • trunk/Source/WebCore/dom/Document.cpp

    r135093 r135189  
    46234623
    46244624    if (Settings* settings = this->settings()) {
    4625         if (!settings->isWebSecurityEnabled()) {
     4625        if (!settings->webSecurityEnabled()) {
    46264626            // Web security is turned off. We should let this document access every other document. This is used primary by testing
    46274627            // harnesses for web sites.

  • trunk/Source/WebCore/page/Settings.cpp

    r134960 r135189  
    146146#endif
    147147    SETTINGS_INITIALIZER_LIST
    148     , m_isSpatialNavigationEnabled(false)
    149148    , m_isJavaEnabled(false)
    150149    , m_isJavaEnabledForLocalFiles(true)
    … …  
    155154    , m_arePluginsEnabled(false)
    156155    , m_isScriptEnabled(false)
    157     , m_isWebSecurityEnabled(true)
    158156    , m_textAreasAreResizable(false)
    159157    , m_needsAdobeFrameReloadingQuirk(false)
    … …  
    402400}
    403401
    404 void Settings::setWebSecurityEnabled(bool isWebSecurityEnabled)
    405 {
    406     m_isWebSecurityEnabled = isWebSecurityEnabled;
    407 }
    408 
    409 void Settings::setSpatialNavigationEnabled(bool isSpatialNavigationEnabled)
    410 {
    411     m_isSpatialNavigationEnabled = isSpatialNavigationEnabled;
    412 }
    413 
    414402void Settings::setJavaEnabled(bool isJavaEnabled)
    415403{

  • trunk/Source/WebCore/page/Settings.h

    r134828 r135189  
    141141        bool isScriptEnabled() const { return m_isScriptEnabled; }
    142142
    143         void setWebSecurityEnabled(bool);
    144         bool isWebSecurityEnabled() const { return m_isWebSecurityEnabled; }
    145 
    146143        SETTINGS_GETTERS_AND_SETTERS
    147 
    148         void setSpatialNavigationEnabled(bool);
    149         bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEnabled; }
    150144
    151145        void setJavaEnabled(bool);
    … …  
    338332        SETTINGS_MEMBER_VARIABLES
    339333
    340         bool m_isSpatialNavigationEnabled : 1;
    341334        bool m_isJavaEnabled : 1;
    342335        bool m_isJavaEnabledForLocalFiles : 1;
    … …  
    347340        bool m_arePluginsEnabled : 1;
    348341        bool m_isScriptEnabled : 1;
    349         bool m_isWebSecurityEnabled : 1;
    350342        bool m_textAreasAreResizable : 1;
    351343        bool m_needsAdobeFrameReloadingQuirk : 1;

  • trunk/Source/WebCore/page/Settings.in

    r134878 r135189  
    157157
    158158allowCustomScrollbarInMainFrame initial=true
     159webSecurityEnabled initial=true
     160spatialNavigationEnabled initial=false

  • trunk/Source/WebCore/page/SpatialNavigation.cpp

    r128006 r135189  
    9393bool isSpatialNavigationEnabled(const Frame* frame)
    9494{
    95     return (frame && frame->settings() && frame->settings()->isSpatialNavigationEnabled());
     95    return (frame && frame->settings() && frame->settings()->spatialNavigationEnabled());
    9696}
    9797

  • trunk/Source/WebKit/efl/ChangeLog

    r134932 r135189  
     12012-11-19  Tony Chang  <tony@chromium.org>
     2
     3        Remove 'is' prefix from WebSettings::isWebSecurityEnabled and WebSettings::isSpatialNavigationEnabled
     4        https://bugs.webkit.org/show_bug.cgi?id=102548
     5
     6        Reviewed by Adam Barth.
     7
     8        Rename call to WebCore::Settings.
     9
     10        * ewk/ewk_view.cpp:
     11        (_ewk_view_priv_new):
     12
    1132012-11-16  Sheriff Bot  <webkit.review.bot@gmail.com>
    214

  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r134765 r135189  
    890890    priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();
    891891    priv->settings.caretBrowsing = priv->pageSettings->caretBrowsingEnabled();
    892     priv->settings.spatialNavigation = priv->pageSettings->isSpatialNavigationEnabled();
     892    priv->settings.spatialNavigation = priv->pageSettings->spatialNavigationEnabled();
    893893    priv->settings.localStorage = priv->pageSettings->localStorageEnabled();
    894894    priv->settings.offlineAppCache = true; // XXX no function to read setting; this keeps the original setting
Note: See TracChangeset for help on using the changeset viewer.