- Revision
- 135189
- Author
- t...@chromium.org
- Date
- 2012-11-19 13:05:26 -0800 (Mon, 19 Nov 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135188 => 135189)
--- trunk/Source/WebCore/ChangeLog 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/ChangeLog 2012-11-19 21:05:26 UTC (rev 135189)
@@ -1,3 +1,30 @@
+2012-11-19 Tony Chang <t...@chromium.org>
+
+ Remove 'is' prefix from WebSettings::isWebSecurityEnabled and WebSettings::isSpatialNavigationEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=102548
+
+ Reviewed by Adam Barth.
+
+ 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.
+
2012-11-19 Yael Aharon <yael.aha...@intel.com>
[EFL][TexMap] Complie error when considering warnings as errors
Modified: trunk/Source/WebCore/WebCore.exp.in (135188 => 135189)
--- trunk/Source/WebCore/WebCore.exp.in 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-11-19 21:05:26 UTC (rev 135189)
@@ -939,7 +939,6 @@
__ZN7WebCore8Settings21mockScrollbarsEnabledEv
__ZN7WebCore8Settings21setShowRepaintCounterEb
__ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode
-__ZN7WebCore8Settings21setWebSecurityEnabledEb
__ZN7WebCore8Settings22setMinDOMTimerIntervalEd
__ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE11UScriptCode
__ZN7WebCore8Settings23setDefaultFixedFontSizeEi
@@ -956,7 +955,6 @@
__ZN7WebCore8Settings26defaultMinDOMTimerIntervalEv
__ZN7WebCore8Settings27setJavaEnabledForLocalFilesEb
__ZN7WebCore8Settings27setLoadsImagesAutomaticallyEb
-__ZN7WebCore8Settings27setSpatialNavigationEnabledEb
__ZN7WebCore8Settings28setDOMTimerAlignmentIntervalEd
__ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb
__ZN7WebCore8Settings29setDefaultMinDOMTimerIntervalEd
Modified: trunk/Source/WebCore/WebCore.order (135188 => 135189)
--- trunk/Source/WebCore/WebCore.order 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/WebCore.order 2012-11-19 21:05:26 UTC (rev 135189)
@@ -1437,7 +1437,6 @@
__ZN7WebCore8Settings18setFixedFontFamilyERKN3WTF12AtomicStringE
__ZN7WebCore8Settings14setJavaEnabledEb
__ZN7WebCore8Settings20setJavaScriptEnabledEb
-__ZN7WebCore8Settings21setWebSecurityEnabledEb
__ZN7WebCore8Settings18setMinimumFontSizeEi
__ZN7WebCore8Settings25setMinimumLogicalFontSizeEi
__ZN7WebCore8Settings17setPluginsEnabledEb
@@ -1468,7 +1467,6 @@
__ZN7WebCore4Page27pluginAllowedRunTimeChangedEv
__ZN7WebCore27applicationIsAdobeInstallerEv
__ZN7WebCoreL19mainBundleIsEqualToERKN3WTF6StringE
-__ZN7WebCore8Settings27setSpatialNavigationEnabledEb
__ZN7WebCore22applicationIsAppleMailEv
__ZN7WebCore23ApplicationCacheStorage21setDefaultOriginQuotaEx
__ZN7WebCore4Page11PageClientsD1Ev
@@ -13391,7 +13389,6 @@
__ZN7WebCore16VisibleSelection7setBaseERKNS_8PositionE
__ZN7WebCore16VisibleSelection9setExtentERKNS_8PositionE
__ZN7WebCore14FrameSelection23modifyExtendingBackwardENS_15TextGranularityE
-__ZN7WebCore26isSpatialNavigationEnabledEPKNS_5FrameE
__ZN7WebCore14FrameSelection30xPosForVerticalArrowNavigationENS0_13EPositionTypeE
__ZNK7WebCore15VisiblePosition28xOffsetForVerticalNavigationEv
__ZN7WebCore14FrameSelection9setExtentERKNS_15VisiblePositionEb
Modified: trunk/Source/WebCore/dom/Document.cpp (135188 => 135189)
--- trunk/Source/WebCore/dom/Document.cpp 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-11-19 21:05:26 UTC (rev 135189)
@@ -4622,7 +4622,7 @@
}
if (Settings* settings = this->settings()) {
- if (!settings->isWebSecurityEnabled()) {
+ if (!settings->webSecurityEnabled()) {
// Web security is turned off. We should let this document access every other document. This is used primary by testing
// harnesses for web sites.
securityOrigin()->grantUniversalAccess();
Modified: trunk/Source/WebCore/page/Settings.cpp (135188 => 135189)
--- trunk/Source/WebCore/page/Settings.cpp 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-11-19 21:05:26 UTC (rev 135189)
@@ -145,7 +145,6 @@
#endif
#endif
SETTINGS_INITIALIZER_LIST
- , m_isSpatialNavigationEnabled(false)
, m_isJavaEnabled(false)
, m_isJavaEnabledForLocalFiles(true)
, m_loadsImagesAutomatically(false)
@@ -154,7 +153,6 @@
, m_isMediaEnabled(true)
, m_arePluginsEnabled(false)
, m_isScriptEnabled(false)
- , m_isWebSecurityEnabled(true)
, m_textAreasAreResizable(false)
, m_needsAdobeFrameReloadingQuirk(false)
, m_isDOMPasteAllowed(false)
@@ -401,16 +399,6 @@
m_isScriptEnabled = isScriptEnabled;
}
-void Settings::setWebSecurityEnabled(bool isWebSecurityEnabled)
-{
- m_isWebSecurityEnabled = isWebSecurityEnabled;
-}
-
-void Settings::setSpatialNavigationEnabled(bool isSpatialNavigationEnabled)
-{
- m_isSpatialNavigationEnabled = isSpatialNavigationEnabled;
-}
-
void Settings::setJavaEnabled(bool isJavaEnabled)
{
m_isJavaEnabled = isJavaEnabled;
Modified: trunk/Source/WebCore/page/Settings.h (135188 => 135189)
--- trunk/Source/WebCore/page/Settings.h 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/page/Settings.h 2012-11-19 21:05:26 UTC (rev 135189)
@@ -140,14 +140,8 @@
// HTML sandbox attribute into account.
bool isScriptEnabled() const { return m_isScriptEnabled; }
- void setWebSecurityEnabled(bool);
- bool isWebSecurityEnabled() const { return m_isWebSecurityEnabled; }
-
SETTINGS_GETTERS_AND_SETTERS
- void setSpatialNavigationEnabled(bool);
- bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEnabled; }
-
void setJavaEnabled(bool);
bool isJavaEnabled() const { return m_isJavaEnabled; }
@@ -337,7 +331,6 @@
SETTINGS_MEMBER_VARIABLES
- bool m_isSpatialNavigationEnabled : 1;
bool m_isJavaEnabled : 1;
bool m_isJavaEnabledForLocalFiles : 1;
bool m_loadsImagesAutomatically : 1;
@@ -346,7 +339,6 @@
bool m_isMediaEnabled : 1;
bool m_arePluginsEnabled : 1;
bool m_isScriptEnabled : 1;
- bool m_isWebSecurityEnabled : 1;
bool m_textAreasAreResizable : 1;
bool m_needsAdobeFrameReloadingQuirk : 1;
bool m_isDOMPasteAllowed : 1;
Modified: trunk/Source/WebCore/page/Settings.in (135188 => 135189)
--- trunk/Source/WebCore/page/Settings.in 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/page/Settings.in 2012-11-19 21:05:26 UTC (rev 135189)
@@ -156,3 +156,5 @@
frameFlatteningEnabled initial=false
allowCustomScrollbarInMainFrame initial=true
+webSecurityEnabled initial=true
+spatialNavigationEnabled initial=false
Modified: trunk/Source/WebCore/page/SpatialNavigation.cpp (135188 => 135189)
--- trunk/Source/WebCore/page/SpatialNavigation.cpp 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebCore/page/SpatialNavigation.cpp 2012-11-19 21:05:26 UTC (rev 135189)
@@ -92,7 +92,7 @@
bool isSpatialNavigationEnabled(const Frame* frame)
{
- return (frame && frame->settings() && frame->settings()->isSpatialNavigationEnabled());
+ return (frame && frame->settings() && frame->settings()->spatialNavigationEnabled());
}
static RectsAlignment alignmentForRects(FocusDirection direction, const LayoutRect& curRect, const LayoutRect& targetRect, const LayoutSize& viewSize)
Modified: trunk/Source/WebKit/efl/ChangeLog (135188 => 135189)
--- trunk/Source/WebKit/efl/ChangeLog 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-11-19 21:05:26 UTC (rev 135189)
@@ -1,3 +1,15 @@
+2012-11-19 Tony Chang <t...@chromium.org>
+
+ Remove 'is' prefix from WebSettings::isWebSecurityEnabled and WebSettings::isSpatialNavigationEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=102548
+
+ Reviewed by Adam Barth.
+
+ Rename call to WebCore::Settings.
+
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+
2012-11-16 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r134694.
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (135188 => 135189)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-19 20:58:56 UTC (rev 135188)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-19 21:05:26 UTC (rev 135189)
@@ -889,7 +889,7 @@
priv->settings.resizableTextareas = priv->pageSettings->textAreasAreResizable();
priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();
priv->settings.caretBrowsing = priv->pageSettings->caretBrowsingEnabled();
- priv->settings.spatialNavigation = priv->pageSettings->isSpatialNavigationEnabled();
+ priv->settings.spatialNavigation = priv->pageSettings->spatialNavigationEnabled();
priv->settings.localStorage = priv->pageSettings->localStorageEnabled();
priv->settings.offlineAppCache = true; // XXX no function to read setting; this keeps the original setting
priv->settings.pageCache = priv->pageSettings->usesPageCache();
