Changeset 143398 in webkit

Timestamp:

Feb 19, 2013 3:38:15 PM (11 years ago)

Author:

tony@chromium.org

Message:

Convert 3 settings to use Settings.in
​https://bugs.webkit.org/show_bug.cgi?id=109875

Reviewed by Ryosuke Niwa.

Source/WebCore:

Convert mediaEnabled, applicationChromeMode and DOMPasteAllowed to
use Settings.in. They previously had inconsistently named setters.

No new tests, this is a refactoring.

• Source/WebCore/WebCore.exp.in: Remove symbols that are now inlined from exports.
• Source/WebCore/WebCore.order: Remove symbols that no longer exist.
• dom/make_names.pl:

(printConstructorInterior): Rename isMediaEnabled to mediaEnabled.
(printWrapperFunctions): Rename isMediaEnabled to mediaEnabled.

• editing/EditorCommand.cpp:

(WebCore::supportedPaste): Rename isDOMPasteAllowed to DOMPasteAllowed.

• page/Settings.cpp:

(WebCore::Settings::Settings): Remove custom code.

• page/Settings.h:

(Settings): Remove custom code.

• page/Settings.in: Add entries for mediaEnabled, applicationChromeMode and DOMPasteAllowed.
• page/make_settings.pl:

(setterFunctionName): Expand uppercase rules to include DOM.

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::isDefault): Rename inApplicationChromeMode to applicationChromeMode.

• rendering/RenderThemeWin.cpp:

(WebCore::documentIsInApplicationChromeMode): Rename inApplicationChromeMode to applicationChromeMode.

Source/WebKit/efl:

• ewk/ewk_view.cpp:

(_ewk_view_priv_new): Rename isDOMPasteAllowed to DOMPasteAllowed.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebCore/WebCore.order (modified) (1 diff)
• WebCore/dom/make_names.pl (modified) (3 diffs)
• WebCore/editing/EditorCommand.cpp (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (4 diffs)
• WebCore/page/Settings.h (modified) (4 diffs)
• WebCore/page/Settings.in (modified) (1 diff)
• WebCore/page/make_settings.pl (modified) (1 diff)
• WebCore/rendering/RenderTheme.cpp (modified) (1 diff)
• WebCore/rendering/RenderThemeWin.cpp (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/ewk/ewk_view.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Tony Chang  <tony@chromium.org>
+
+        Convert 3 settings to use Settings.in
+        https://bugs.webkit.org/show_bug.cgi?id=109875
+
+        Reviewed by Ryosuke Niwa.
+
+        Convert mediaEnabled, applicationChromeMode and DOMPasteAllowed to
+        use Settings.in. They previously had inconsistently named setters.
+
+        No new tests, this is a refactoring.
+
+        * Source/WebCore/WebCore.exp.in: Remove symbols that are now inlined from exports.
+        * Source/WebCore/WebCore.order: Remove symbols that no longer exist.
+        * dom/make_names.pl:
+        (printConstructorInterior): Rename isMediaEnabled to mediaEnabled.
+        (printWrapperFunctions): Rename isMediaEnabled to mediaEnabled.
+        * editing/EditorCommand.cpp:
+        (WebCore::supportedPaste): Rename isDOMPasteAllowed to DOMPasteAllowed.
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings): Remove custom code.
+        * page/Settings.h:
+        (Settings): Remove custom code.
+        * page/Settings.in: Add entries for mediaEnabled, applicationChromeMode and DOMPasteAllowed.
+        * page/make_settings.pl:
+        (setterFunctionName): Expand uppercase rules to include DOM.
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isDefault): Rename inApplicationChromeMode to applicationChromeMode.
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::documentIsInApplicationChromeMode): Rename inApplicationChromeMode to applicationChromeMode.
+
 2013-02-19  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -983 +983 @@
 __ZN7WebCore8Settings16setUsesPageCacheEb
 __ZN7WebCore8Settings17setPluginsEnabledEb
-__ZN7WebCore8Settings18setDOMPasteAllowedEb
 __ZN7WebCore8Settings18setDefaultFontSizeEi
 __ZN7WebCore8Settings18setFixedFontFamilyERKN3WTF12AtomicStringE11UScriptCode
@@ -999 +998 @@
 __ZN7WebCore8Settings23setDefaultFixedFontSizeEi
 __ZN7WebCore8Settings23setPictographFontFamilyERKN3WTF12AtomicStringE11UScriptCode
-__ZN7WebCore8Settings24setApplicationChromeModeEb
 __ZN7WebCore8Settings24setDNSPrefetchingEnabledEb
 __ZN7WebCore8Settings24setMockScrollbarsEnabledEb

trunk/Source/WebCore/WebCore.order

@@ -1449 +1449 @@
 __ZN7WebCore8Settings24setUsesOverlayScrollbarsEb
 __ZN7WebCore8Settings24setTextAreasAreResizableEb
-__ZN7WebCore8Settings18setDOMPasteAllowedEb
 __ZN7WebCore8Settings16setUsesPageCacheEb
 __ZN7WebCore8Settings29setAuthorAndUserStylesEnabledEb
-__ZN7WebCore8Settings24setApplicationChromeModeEb
 __ZN7WebCore8Settings25setUserStyleSheetLocationERKNS_4KURLE
 __ZN7WebCore4Page29userStyleSheetLocationChangedEv

trunk/Source/WebCore/dom/make_names.pl

@@ -370 +370 @@
         print F <<END
     Settings* settings = document->settings();
-    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
+    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
         return 0;
     
@@ -1019 +1019 @@
 {
     Settings* settings = element->document()->settings();
-    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
+    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
         return CREATE_DOM_WRAPPER(exec, globalObject, $parameters{namespace}Element, element.get());
     return CREATE_DOM_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get());
@@ -1070 +1070 @@
 {
     Settings* settings = element->document()->settings();
-    if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
+    if (!MediaPlayer::isAvailable() || (settings && !settings->mediaEnabled()))
         return createV8$parameters{namespace}DirectWrapper(element, creationContext, isolate);
     return wrap(static_cast<${JSInterfaceName}*>(element), creationContext, isolate);

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -1180 +1180 @@
 
     Settings* settings = frame->settings();
-    bool defaultValue = settings && settings->javaScriptCanAccessClipboard() && settings->isDOMPasteAllowed();
+    bool defaultValue = settings && settings->javaScriptCanAccessClipboard() && settings->DOMPasteAllowed();
 
     EditorClient* client = frame->editor()->client();

trunk/Source/WebCore/page/Settings.cpp

@@ -167 +167 @@
     , m_privateBrowsingEnabled(false)
     , m_areImagesEnabled(true)
-    , m_isMediaEnabled(true)
     , m_arePluginsEnabled(false)
     , m_isScriptEnabled(false)
     , m_textAreasAreResizable(false)
     , m_needsAdobeFrameReloadingQuirk(false)
-    , m_isDOMPasteAllowed(false)
     , m_usesPageCache(false)
     , m_authorAndUserStylesEnabled(true)
     , m_fontRenderingMode(0)
-    , m_inApplicationChromeMode(false)
     , m_isCSSCustomFilterEnabled(false)
 #if ENABLE(CSS_STICKY_POSITION)
@@ -444 +441 @@
 }
 
-void Settings::setMediaEnabled(bool isMediaEnabled)
-{
-    m_isMediaEnabled = isMediaEnabled;
-}
-
 void Settings::setPluginsEnabled(bool arePluginsEnabled)
 {
@@ -487 +479 @@
 {
     m_needsAdobeFrameReloadingQuirk = shouldNotReloadIFramesForUnchangedSRC;
-}
-
-void Settings::setDOMPasteAllowed(bool DOMPasteAllowed)
-{
-    m_isDOMPasteAllowed = DOMPasteAllowed;
 }
 
@@ -571 +558 @@
 }
 
-void Settings::setApplicationChromeMode(bool mode)
-{
-    m_inApplicationChromeMode = mode;
-}
-
 #if USE(SAFARI_THEME)
 void Settings::setShouldPaintNativeControls(bool shouldPaintNativeControls)

trunk/Source/WebCore/page/Settings.h

@@ -153 +153 @@
         bool areImagesEnabled() const { return m_areImagesEnabled; }
 
-        void setMediaEnabled(bool);
-        bool isMediaEnabled() const { return m_isMediaEnabled; }
-
         void setPluginsEnabled(bool);
         bool arePluginsEnabled() const { return m_arePluginsEnabled; }
@@ -187 +184 @@
         bool needsAcrobatFrameReloadingQuirk() const { return m_needsAdobeFrameReloadingQuirk; }
 
-        void setDOMPasteAllowed(bool);
-        bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
-        
         static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
         static double defaultMinDOMTimerInterval();
@@ -213 +207 @@
         void setFontRenderingMode(FontRenderingMode mode);
         FontRenderingMode fontRenderingMode() const;
-
-        void setApplicationChromeMode(bool);
-        bool inApplicationChromeMode() const { return m_inApplicationChromeMode; }
 
         void setCSSCustomFilterEnabled(bool enabled) { m_isCSSCustomFilterEnabled = enabled; }
@@ -340 +331 @@
         bool m_privateBrowsingEnabled : 1;
         bool m_areImagesEnabled : 1;
-        bool m_isMediaEnabled : 1;
         bool m_arePluginsEnabled : 1;
         bool m_isScriptEnabled : 1;
         bool m_textAreasAreResizable : 1;
         bool m_needsAdobeFrameReloadingQuirk : 1;
-        bool m_isDOMPasteAllowed : 1;
         bool m_usesPageCache : 1;
         bool m_authorAndUserStylesEnabled : 1;
         unsigned m_fontRenderingMode : 1;
-        bool m_inApplicationChromeMode : 1;
         bool m_isCSSCustomFilterEnabled : 1;
 #if ENABLE(CSS_STICKY_POSITION)

trunk/Source/WebCore/page/Settings.in

@@ -154 +154 @@
 syncXHRInDocumentsEnabled initial=true
 cookieEnabled initial=true
+mediaEnabled initial=true
+applicationChromeMode initial=false
+DOMPasteAllowed initial=false
 
 threadedHTMLParser initial=false, conditional=THREADED_HTML_PARSER

trunk/Source/WebCore/page/make_settings.pl

@@ -217 +217 @@
     my $setterFunctionName = "set" . $settingName;
     substr($setterFunctionName, 3, 1) = uc(substr($setterFunctionName, 3, 1));
-    if (substr($settingName, 0, 3) eq "css" || substr($settingName, 0, 3) eq "xss" || substr($settingName, 0, 3) eq "ftp") {
-        substr($setterFunctionName, 3, 3) = uc(substr($setterFunctionName, 3, 3));
+    my @prefixesToUpperCase = ("css", "xss", "ftp", "dom");
+    foreach my $prefix (@prefixesToUpperCase) {
+        my $prefixLength = length($prefix);
+        if (substr($settingName, 0, $prefixLength) eq $prefix) {
+            substr($setterFunctionName, $prefixLength, $prefixLength) = uc(substr($setterFunctionName, 3, 3));
+        }
     }
     return $setterFunctionName;

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -855 +855 @@
 
     Settings* settings = o->document()->settings();
-    if (!settings || !settings->inApplicationChromeMode())
+    if (!settings || !settings->applicationChromeMode())
         return false;
     

trunk/Source/WebCore/rendering/RenderThemeWin.cpp

@@ -146 +146 @@
 {
     Settings* settings = document->settings();
-    return settings && settings->inApplicationChromeMode();
+    return settings && settings->applicationChromeMode();
 }
 

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-02-19  Tony Chang  <tony@chromium.org>
+
+        Convert 3 settings to use Settings.in
+        https://bugs.webkit.org/show_bug.cgi?id=109875
+
+        Reviewed by Ryosuke Niwa.
+
+        * ewk/ewk_view.cpp:
+        (_ewk_view_priv_new): Rename isDOMPasteAllowed to DOMPasteAllowed.
+
 2013-02-18  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -898 +898 @@
     priv->settings.shouldDisplayTextDescriptions = priv->pageSettings->shouldDisplayTextDescriptions();
 #endif
-    priv->settings.scriptsCanAccessClipboard = priv->pageSettings->javaScriptCanAccessClipboard() && priv->pageSettings->isDOMPasteAllowed();
+    priv->settings.scriptsCanAccessClipboard = priv->pageSettings->javaScriptCanAccessClipboard() && priv->pageSettings->DOMPasteAllowed();
     priv->settings.resizableTextareas = priv->pageSettings->textAreasAreResizable();
     priv->settings.privateBrowsing = priv->pageSettings->privateBrowsingEnabled();