Changeset 147034 in webkit

Timestamp:

Mar 27, 2013 5:25:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Add a settings to disallow initializing background-size if background shorthand doesn't include it.
​https://bugs.webkit.org/show_bug.cgi?id=113363

Source/WebCore:

Patch by KyungTae Kim <​ktf.kim@samsung.com> and Yongjun Zhang <​yongjun_zhang@apple.com> on 2013-03-27
Reviewed by David Kilzer.

This is based on KyungTae Kim's patch in ​https://bugs.webkit.org/show_bug.cgi?id=97761. Many legacy sites set
background-size first and then set background for setting background-image. For backward-compatibility
in some WebKit based clients, if 'background' shorthand have no 'background-size' attribute, we could add
a settings to let the css parser not initialize 'background-size'.

Test: fast/backgrounds/background-shorthand-after-set-backgroundSize.html

• css/CSSParser.cpp:

(WebCore::CSSParserContext::CSSParserContext): initialize useLegacyBackgroundSizeShorthandBehavior.
(WebCore::operator==):
(WebCore::CSSParser::useLegacyBackgroundSizeShorthandBehavior): add a method to return if we want background-size

to be initialized by background shorthand.

(WebCore):
(WebCore::CSSParser::parseFillShorthand): don't initialize background-size in background shorthand if we have

useLegacyBackgroundSizeShorthandBehavior set to true.

• css/CSSParser.h:

(CSSParser):

• css/CSSParserMode.h: add member useLegacyBackgroundSizeShorthandBehavior to CSSParserContext.

(CSSParserContext):

• page/Settings.in: initialize useLegacyBackgroundSizeShorthandBehavior to false.
• testing/InternalSettings.cpp:

(WebCore::InternalSettings::Backup::Backup): add the new settings useLegacyBackgroundSizeShorthandBehavior to Backup.
(WebCore::InternalSettings::Backup::restoreTo): restore useLegacyBackgroundSizeShorthandBehavior from Backup.
(WebCore::InternalSettings::setUseLegacyBackgroundSizeShorthandBehavior):
(WebCore):

• testing/InternalSettings.h:

(Backup):
(InternalSettings):

• testing/InternalSettings.idl: add a JS testing API setUseLegacyBackgroundSizeShorthandBehavior to turn on/off

the new settings.

LayoutTests:

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2013-03-27
Reviewed by David Kilzer.

Add test for the new settings useLegacyBackgroundSizeShorthandBehavior.

• fast/backgrounds/background-shorthand-after-set-backgroundSize-expected.txt: Added.
• fast/backgrounds/background-shorthand-after-set-backgroundSize.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/background-shorthand-after-set-backgroundSize-expected.txt (added)
• LayoutTests/fast/backgrounds/background-shorthand-after-set-backgroundSize.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (5 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)
• Source/WebCore/css/CSSParserMode.h (modified) (1 diff)
• Source/WebCore/page/Settings.in (modified) (1 diff)
• Source/WebCore/testing/InternalSettings.cpp (modified) (3 diffs)
• Source/WebCore/testing/InternalSettings.h (modified) (2 diffs)
• Source/WebCore/testing/InternalSettings.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-27  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Add a settings to disallow initializing background-size if background shorthand doesn't include it.
+        https://bugs.webkit.org/show_bug.cgi?id=113363
+
+        Reviewed by David Kilzer.
+
+        Add test for the new settings useLegacyBackgroundSizeShorthandBehavior.
+
+        * fast/backgrounds/background-shorthand-after-set-backgroundSize-expected.txt: Added.
+        * fast/backgrounds/background-shorthand-after-set-backgroundSize.html: Added.
+
 2013-03-27  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  KyungTae Kim <ktf.kim@samsung.com> and Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Add a settings to disallow initializing background-size if background shorthand doesn't include it.
+        https://bugs.webkit.org/show_bug.cgi?id=113363
+
+        Reviewed by David Kilzer.
+
+        This is based on KyungTae Kim's patch in https://bugs.webkit.org/show_bug.cgi?id=97761.  Many legacy sites set
+        background-size first and then set background for setting background-image.  For backward-compatibility
+        in some WebKit based clients, if 'background' shorthand have no 'background-size' attribute, we could add
+        a settings to let the css parser not initialize 'background-size'.
+
+        Test: fast/backgrounds/background-shorthand-after-set-backgroundSize.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParserContext::CSSParserContext): initialize useLegacyBackgroundSizeShorthandBehavior.
+        (WebCore::operator==):
+        (WebCore::CSSParser::useLegacyBackgroundSizeShorthandBehavior): add a method to return if we want background-size
+            to be initialized by background shorthand.
+        (WebCore):
+        (WebCore::CSSParser::parseFillShorthand): don't initialize background-size in background shorthand if we have
+            useLegacyBackgroundSizeShorthandBehavior set to true.
+        * css/CSSParser.h:
+        (CSSParser):
+        * css/CSSParserMode.h: add member useLegacyBackgroundSizeShorthandBehavior to CSSParserContext.
+        (CSSParserContext):
+        * page/Settings.in: initialize useLegacyBackgroundSizeShorthandBehavior to false.
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup): add the new settings useLegacyBackgroundSizeShorthandBehavior to Backup.
+        (WebCore::InternalSettings::Backup::restoreTo): restore useLegacyBackgroundSizeShorthandBehavior from Backup.
+        (WebCore::InternalSettings::setUseLegacyBackgroundSizeShorthandBehavior):
+        (WebCore):
+        * testing/InternalSettings.h:
+        (Backup):
+        (InternalSettings):
+        * testing/InternalSettings.idl: add a JS testing API setUseLegacyBackgroundSizeShorthandBehavior to turn on/off
+            the new settings.
+
 2013-03-27  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -266 +266 @@
     , needsSiteSpecificQuirks(false)
     , enforcesCSSMIMETypeInNoQuirksMode(true)
+    , useLegacyBackgroundSizeShorthandBehavior(false)
 {
 }
@@ -284 +285 @@
     , needsSiteSpecificQuirks(document->settings() ? document->settings()->needsSiteSpecificQuirks() : false)
     , enforcesCSSMIMETypeInNoQuirksMode(!document->settings() || document->settings()->enforceCSSMIMETypeInNoQuirksMode())
+    , useLegacyBackgroundSizeShorthandBehavior(document->settings() ? document->settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
 {
 }
@@ -302 +304 @@
 #endif
         && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
-        && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode;
+        && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
+        && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior;
 }
 
@@ -3127 +3130 @@
 }
 
+bool CSSParser::useLegacyBackgroundSizeShorthandBehavior() const
+{
+    return m_context.useLegacyBackgroundSizeShorthandBehavior;
+}
+
 const int cMaxFillProperties = 9;
 
@@ -3257 +3265 @@
         } else if ((properties[i] == CSSPropertyBackgroundClip || properties[i] == CSSPropertyWebkitMaskClip) && !foundClip)
             // Value is already set while updating origin
+            continue;
+        else if (properties[i] == CSSPropertyBackgroundSize && !parsedProperty[i] && useLegacyBackgroundSizeShorthandBehavior())
             continue;
         else

trunk/Source/WebCore/css/CSSParser.h

@@ -598 +598 @@
 #endif
 
+    bool useLegacyBackgroundSizeShorthandBehavior() const;
+
     int (CSSParser::*m_lexFunc)(void*);
 

trunk/Source/WebCore/css/CSSParserMode.h

@@ -75 +75 @@
     bool needsSiteSpecificQuirks;
     bool enforcesCSSMIMETypeInNoQuirksMode;
+    bool useLegacyBackgroundSizeShorthandBehavior;
 };
 

trunk/Source/WebCore/page/Settings.in

@@ -207 +207 @@
 
 selectionIncludesAltImageText initial=false
+useLegacyBackgroundSizeShorthandBehavior initial=false

trunk/Source/WebCore/testing/InternalSettings.cpp

@@ -99 +99 @@
     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL())
     , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings->timeWithoutMouseMovementBeforeHidingControls())
+    , m_useLegacyBackgroundSizeShorthandBehavior(settings->useLegacyBackgroundSizeShorthandBehavior())
 {
 }
@@ -136 +137 @@
     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
     settings->setTimeWithoutMouseMovementBeforeHidingControls(m_originalTimeWithoutMouseMovementBeforeHidingControls);
+    settings->setUseLegacyBackgroundSizeShorthandBehavior(m_useLegacyBackgroundSizeShorthandBehavior);
 }
 
@@ -492 +494 @@
 }
 
-}
+void InternalSettings::setUseLegacyBackgroundSizeShorthandBehavior(bool enabled, ExceptionCode& ec)
+{
+    InternalSettingsGuardForSettings();
+    settings()->setUseLegacyBackgroundSizeShorthandBehavior(enabled);
+}
+
+}

trunk/Source/WebCore/testing/InternalSettings.h

@@ -84 +84 @@
         String m_defaultVideoPosterURL;
         bool m_originalTimeWithoutMouseMovementBeforeHidingControls;
+        bool m_useLegacyBackgroundSizeShorthandBehavior;
     };
 
@@ -128 +129 @@
     void setDefaultVideoPosterURL(const String& url, ExceptionCode&);
     void setTimeWithoutMouseMovementBeforeHidingControls(double time, ExceptionCode&);
+    void setUseLegacyBackgroundSizeShorthandBehavior(bool enabled, ExceptionCode&);
 
 private:

trunk/Source/WebCore/testing/InternalSettings.idl

@@ -60 +60 @@
     void setDefaultVideoPosterURL(in DOMString poster) raises(DOMException);
     void setTimeWithoutMouseMovementBeforeHidingControls(in double time) raises(DOMException);
+    void setUseLegacyBackgroundSizeShorthandBehavior(in boolean enabled) raises(DOMException);
 };