Changeset 101899 in webkit


Ignore:
Timestamp:
Dec 2, 2011 8:46:07 PM (12 years ago)
Author:
mihnea@adobe.com
Message:

[CSSRegions]More renaming for region style rules.
https://bugs.webkit.org/show_bug.cgi?id=73526

Reviewed by Eric Seidel.

Source/WebCore:

Rename isRegionStyleRule() -> isRegionRule()
WEBKIT_REGION_STYLE_RULE -> WEBKIT_REGION_RULE.

  • bindings/objc/DOMCSS.mm:

(kitClass):

  • bindings/v8/custom/V8CSSRuleCustom.cpp:

(WebCore::toV8):

  • css/CSSGrammar.y:
  • css/CSSParser.cpp:

(WebCore::CSSParser::createRegionRule):

  • css/CSSParser.h:
  • css/CSSRule.cpp:

(WebCore::CSSRule::cssText):
(WebCore::CSSRule::destroy):

  • css/CSSRule.h:

(WebCore::CSSRule::isRegionRule):

  • css/CSSRule.idl:
  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::addRegionRule):
(WebCore::RuleSet::addRulesFromSheet):

  • css/CSSStyleSelector.h:
  • css/WebKitCSSRegionRule.cpp:

(WebCore::WebKitCSSRegionRule::WebKitCSSRegionRule):

  • css/tokenizer.flex:

LayoutTests:

Rename WEBKIT_REGION_STYLE_RULE -> WEBKIT_REGION_RULE.

  • fast/dom/Window/window-properties-expected.txt:
  • fast/regions/parsing-region-style-rule.html:
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/mac/fast/dom/Window/window-properties-expected.txt:
  • platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
  • platform/qt/fast/dom/Window/window-properties-expected.txt:
  • platform/win/fast/dom/Window/window-properties-expected.txt:
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r101898 r101899  
     12011-12-02  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]More renaming for region style rules.
     4        https://bugs.webkit.org/show_bug.cgi?id=73526
     5
     6        Reviewed by Eric Seidel.
     7
     8        Rename WEBKIT_REGION_STYLE_RULE -> WEBKIT_REGION_RULE.
     9
     10        * fast/dom/Window/window-properties-expected.txt:
     11        * fast/regions/parsing-region-style-rule.html:
     12        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     13        * platform/mac/fast/dom/Window/window-properties-expected.txt:
     14        * platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
     15        * platform/qt/fast/dom/Window/window-properties-expected.txt:
     16        * platform/win/fast/dom/Window/window-properties-expected.txt:
     17
    1182011-12-02  Tom Sepez  <tsepez@chromium.org>
    219
  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r100164 r101899  
    212212window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    213213window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    214 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     214window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    215215window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    216216window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    236236window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    237237window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    238 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     238window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    239239window.CSSMediaRule [object CSSMediaRuleConstructor]
    240240window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    248248window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    249249window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    250 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     250window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    251251window.CSSMediaRule.prototype.deleteRule [function]
    252252window.CSSMediaRule.prototype.insertRule [function]
     
    262262window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    263263window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    264 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     264window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    265265window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    266266window.CSSPrimitiveValue.CSS_ATTR [number]
     
    338338window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
    339339window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
    340 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number]
     340window.CSSRule.WEBKIT_REGION_RULE [number]
    341341window.CSSRule.prototype [object CSSRulePrototype]
    342342window.CSSRule.prototype.CHARSET_RULE [number]
     
    349349window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    350350window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    351 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     351window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    352352window.CSSRuleList [object CSSRuleListConstructor]
    353353window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/LayoutTests/fast/regions/parsing-region-style-rule.html

    r97738 r101899  
    5555        for (var idx = 0; idx < cssRules.length; idx++) {
    5656            var cssRule = cssRules.item(idx);
    57             if (cssRule.type == CSSRule.WEBKIT_REGION_STYLE_RULE)
     57            if (cssRule.type == CSSRule.WEBKIT_REGION_RULE)
    5858                actualRegionStyleRulesText.push(cssRule.cssText);
    5959        }
  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r101771 r101899  
    211211window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    212212window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    213 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     213window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    214214window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    215215window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    223223window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    224224window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    225 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     225window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number]
    226226window.CSSImportRule [object CSSImportRuleConstructor]
    227227window.CSSImportRule.prototype [object CSSImportRulePrototype]
     
    235235window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    236236window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    237 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     237window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    238238window.CSSMediaRule [object CSSMediaRuleConstructor]
    239239window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    247247window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    248248window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    249 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     249window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    250250window.CSSMediaRule.prototype.deleteRule [function]
    251251window.CSSMediaRule.prototype.insertRule [function]
     
    261261window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    262262window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    263 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     263window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    264264window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    265265window.CSSPrimitiveValue.CSS_ATTR [number]
     
    337337window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
    338338window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
    339 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number]
     339window.CSSRule.WEBKIT_REGION_RULE [number]
    340340window.CSSRule.prototype [object CSSRulePrototype]
    341341window.CSSRule.prototype.CHARSET_RULE [number]
     
    348348window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    349349window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    350 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     350window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    351351window.CSSRuleList [object CSSRuleListConstructor]
    352352window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt

    r101724 r101899  
    236236window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    237237window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    238 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     238window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    239239window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    240240window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    248248window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    249249window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    250 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     250window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number]
    251251window.CSSImportRule [object CSSImportRuleConstructor]
    252252window.CSSImportRule.prototype [object CSSImportRulePrototype]
     
    260260window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    261261window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    262 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     262window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    263263window.CSSMediaRule [object CSSMediaRuleConstructor]
    264264window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    272272window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    273273window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    274 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     274window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    275275window.CSSMediaRule.prototype.deleteRule [function]
    276276window.CSSMediaRule.prototype.insertRule [function]
     
    286286window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    287287window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    288 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     288window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    289289window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    290290window.CSSPrimitiveValue.CSS_ATTR [number]
     
    362362window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
    363363window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
    364 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number]
     364window.CSSRule.WEBKIT_REGION_RULE [number]
    365365window.CSSRule.prototype [object CSSRulePrototype]
    366366window.CSSRule.prototype.CHARSET_RULE [number]
     
    373373window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    374374window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    375 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     375window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    376376window.CSSRuleList [object CSSRuleListConstructor]
    377377window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt

    r100164 r101899  
    210210window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    211211window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    212 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     212window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    213213window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    214214window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    222222window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    223223window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    224 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     224window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number]
    225225window.CSSImportRule [object CSSImportRuleConstructor]
    226226window.CSSImportRule.prototype [object CSSImportRulePrototype]
     
    234234window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    235235window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    236 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     236window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    237237window.CSSMediaRule [object CSSMediaRuleConstructor]
    238238window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    246246window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    247247window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    248 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     248window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    249249window.CSSMediaRule.prototype.deleteRule [function]
    250250window.CSSMediaRule.prototype.insertRule [function]
     
    260260window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    261261window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    262 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     262window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    263263window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    264264window.CSSPrimitiveValue.CSS_ATTR [number]
     
    346346window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    347347window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    348 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     348window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    349349window.CSSRuleList [object CSSRuleListConstructor]
    350350window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt

    r101748 r101899  
    209209window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    210210window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    211 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     211window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    212212window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    213213window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    221221window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    222222window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    223 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     223window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number]
    224224window.CSSImportRule [object CSSImportRuleConstructor]
    225225window.CSSImportRule.prototype [object CSSImportRulePrototype]
     
    233233window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    234234window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    235 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     235window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    236236window.CSSMediaRule [object CSSMediaRuleConstructor]
    237237window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    245245window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    246246window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    247 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     247window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    248248window.CSSMediaRule.prototype.deleteRule [function]
    249249window.CSSMediaRule.prototype.insertRule [function]
     
    259259window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    260260window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    261 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     261window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    262262window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    263263window.CSSPrimitiveValue.CSS_ATTR [number]
     
    335335window.CSSRule.WEBKIT_KEYFRAMES_RULE [number]
    336336window.CSSRule.WEBKIT_KEYFRAME_RULE [number]
    337 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number]
     337window.CSSRule.WEBKIT_REGION_RULE [number]
    338338window.CSSRule.prototype [object CSSRulePrototype]
    339339window.CSSRule.prototype.CHARSET_RULE [number]
     
    346346window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    347347window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    348 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     348window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    349349window.CSSRuleList [object CSSRuleListConstructor]
    350350window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt

    r100164 r101899  
    212212window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    213213window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    214 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     214window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number]
    215215window.CSSFontFaceRule [object CSSFontFaceRuleConstructor]
    216216window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype]
     
    224224window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    225225window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    226 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     226window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number]
    227227window.CSSImportRule [object CSSImportRuleConstructor]
    228228window.CSSImportRule.prototype [object CSSImportRulePrototype]
     
    236236window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    237237window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    238 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     238window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number]
    239239window.CSSMediaRule [object CSSMediaRuleConstructor]
    240240window.CSSMediaRule.prototype [object CSSMediaRulePrototype]
     
    248248window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    249249window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    250 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     250window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number]
    251251window.CSSMediaRule.prototype.deleteRule [function]
    252252window.CSSMediaRule.prototype.insertRule [function]
     
    262262window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    263263window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    264 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     264window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number]
    265265window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor]
    266266window.CSSPrimitiveValue.CSS_ATTR [number]
     
    348348window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number]
    349349window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number]
    350 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number]
     350window.CSSRule.prototype.WEBKIT_REGION_RULE [number]
    351351window.CSSRuleList [object CSSRuleListConstructor]
    352352window.CSSRuleList.prototype [object CSSRuleListPrototype]
  • trunk/Source/WebCore/ChangeLog

    r101898 r101899  
     12011-12-02  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]More renaming for region style rules.
     4        https://bugs.webkit.org/show_bug.cgi?id=73526
     5
     6        Reviewed by Eric Seidel.
     7
     8        Rename isRegionStyleRule() -> isRegionRule()
     9        WEBKIT_REGION_STYLE_RULE -> WEBKIT_REGION_RULE.
     10
     11        * bindings/objc/DOMCSS.mm:
     12        (kitClass):
     13        * bindings/v8/custom/V8CSSRuleCustom.cpp:
     14        (WebCore::toV8):
     15        * css/CSSGrammar.y:
     16        * css/CSSParser.cpp:
     17        (WebCore::CSSParser::createRegionRule):
     18        * css/CSSParser.h:
     19        * css/CSSRule.cpp:
     20        (WebCore::CSSRule::cssText):
     21        (WebCore::CSSRule::destroy):
     22        * css/CSSRule.h:
     23        (WebCore::CSSRule::isRegionRule):
     24        * css/CSSRule.idl:
     25        * css/CSSStyleSelector.cpp:
     26        (WebCore::CSSStyleSelector::addRegionRule):
     27        (WebCore::RuleSet::addRulesFromSheet):
     28        * css/CSSStyleSelector.h:
     29        * css/WebKitCSSRegionRule.cpp:
     30        (WebCore::WebKitCSSRegionRule::WebKitCSSRegionRule):
     31        * css/tokenizer.flex:
     32
    1332011-12-02  Tom Sepez  <tsepez@chromium.org>
    234
  • trunk/Source/WebCore/bindings/objc/DOMCSS.mm

    r97738 r101899  
    9090        case DOM_WEBKIT_KEYFRAME_RULE:
    9191            return [DOMWebKitCSSKeyframeRule class];
    92         case DOM_WEBKIT_REGION_STYLE_RULE:
     92        case DOM_WEBKIT_REGION_RULE:
    9393            return [DOMCSSUnknownRule class];
    9494    }
  • trunk/Source/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp

    r97738 r101899  
    6969    case CSSRule::WEBKIT_KEYFRAMES_RULE:
    7070        return toV8(static_cast<WebKitCSSKeyframesRule*>(impl));
    71     case CSSRule::WEBKIT_REGION_STYLE_RULE:
     71    case CSSRule::WEBKIT_REGION_RULE:
    7272        return V8CSSRule::wrap(impl);
    7373    }
  • trunk/Source/WebCore/css/CSSGrammar.y

    r100092 r101899  
    142142%token WEBKIT_MEDIAQUERY_SYM
    143143%token WEBKIT_SELECTOR_SYM
    144 %token WEBKIT_REGION_STYLE_RULE_SYM
     144%token WEBKIT_REGION_RULE_SYM
    145145%token <marginBox> TOPLEFTCORNER_SYM
    146146%token <marginBox> TOPLEFT_SYM
     
    798798
    799799region:
    800     WEBKIT_REGION_STYLE_RULE_SYM WHITESPACE region_selector '{' maybe_space block_rule_list save_block {
     800    WEBKIT_REGION_RULE_SYM WHITESPACE region_selector '{' maybe_space block_rule_list save_block {
    801801        if ($3)
    802             $$ = static_cast<CSSParser*>(parser)->createRegionStylingRule($3, $6);
     802            $$ = static_cast<CSSParser*>(parser)->createRegionRule($3, $6);
    803803        else
    804804            $$ = 0;
  • trunk/Source/WebCore/css/CSSParser.cpp

    r101593 r101899  
    77257725}
    77267726
    7727 CSSRule* CSSParser::createRegionStylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules)
     7727CSSRule* CSSParser::createRegionRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules)
    77287728{
    77297729    if (!regionSelector || !rules)
  • trunk/Source/WebCore/css/CSSParser.h

    r101288 r101899  
    240240    CSSRule* createFontFaceRule();
    241241    CSSRule* createPageRule(PassOwnPtr<CSSParserSelector> pageSelector);
    242     CSSRule* createRegionStylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules);
     242    CSSRule* createRegionRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules);
    243243    CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox);
    244244    void startDeclarationsForMarginBox();
  • trunk/Source/WebCore/css/CSSRule.cpp

    r101593 r101899  
    6262    case WEBKIT_KEYFRAME_RULE:
    6363        return static_cast<const WebKitCSSKeyframeRule*>(this)->cssText();
    64     case WEBKIT_REGION_STYLE_RULE:
     64    case WEBKIT_REGION_RULE:
    6565        return static_cast<const WebKitCSSRegionRule*>(this)->cssText();
    6666    }
     
    9999        delete static_cast<WebKitCSSKeyframeRule*>(this);
    100100        return;
    101     case WEBKIT_REGION_STYLE_RULE:
     101    case WEBKIT_REGION_RULE:
    102102        delete static_cast<WebKitCSSRegionRule*>(this);
    103103        return;
  • trunk/Source/WebCore/css/CSSRule.h

    r101218 r101899  
    5353        WEBKIT_KEYFRAMES_RULE = 8,
    5454        WEBKIT_KEYFRAME_RULE,
    55         WEBKIT_REGION_STYLE_RULE
     55        WEBKIT_REGION_RULE
    5656    };
    5757
     
    6565    bool isPageRule() const { return type() == PAGE_RULE; }
    6666    bool isStyleRule() const { return type() == STYLE_RULE; }
    67     bool isRegionStyleRule() const { return type() == WEBKIT_REGION_STYLE_RULE; }
     67    bool isRegionRule() const { return type() == WEBKIT_REGION_RULE; }
    6868    bool isImportRule() const { return type() == IMPORT_RULE; }
    6969
  • trunk/Source/WebCore/css/CSSRule.idl

    r97738 r101899  
    4040        const unsigned short WEBKIT_KEYFRAMES_RULE = 8;
    4141        const unsigned short WEBKIT_KEYFRAME_RULE = 9;
    42         const unsigned short WEBKIT_REGION_STYLE_RULE = 10;
     42        const unsigned short WEBKIT_REGION_RULE = 10;
    4343
    4444        readonly attribute unsigned short   type;
  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r101812 r101899  
    431431}
    432432
    433 void CSSStyleSelector::addRegionStyleRule(PassRefPtr<WebKitCSSRegionRule> regionStyleRule)
     433void CSSStyleSelector::addRegionRule(PassRefPtr<WebKitCSSRegionRule> regionStyleRule)
    434434{
    435435    m_regionStyleRules.append(regionStyleRule);
     
    19751975        } else if (rule->isKeyframesRule())
    19761976            styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(rule));
    1977         else if (rule->isRegionStyleRule() && styleSelector)
    1978             styleSelector->addRegionStyleRule(static_cast<WebKitCSSRegionRule*>(rule));
     1977        else if (rule->isRegionRule() && styleSelector)
     1978            styleSelector->addRegionRule(static_cast<WebKitCSSRegionRule*>(rule));
    19791979    }
    19801980    if (m_autoShrinkToFitEnabled)
  • trunk/Source/WebCore/css/CSSStyleSelector.h

    r101812 r101899  
    201201    void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule>);
    202202    void addPageStyle(PassRefPtr<CSSPageRule>);
    203     void addRegionStyleRule(PassRefPtr<WebKitCSSRegionRule>);
     203    void addRegionRule(PassRefPtr<WebKitCSSRegionRule>);
    204204
    205205    bool checkRegionStyle(Element*);
  • trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp

    r101593 r101899  
    3737namespace WebCore {
    3838WebKitCSSRegionRule::WebKitCSSRegionRule(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules)
    39     : CSSRule(parent, CSSRule::WEBKIT_REGION_STYLE_RULE)
     39    : CSSRule(parent, CSSRule::WEBKIT_REGION_RULE)
    4040    , m_ruleList(rules)
    4141{
  • trunk/Source/WebCore/css/tokenizer.flex

    r99086 r101899  
    8181"@-webkit-keyframes"    {yyTok = WEBKIT_KEYFRAMES_SYM; return yyTok; }
    8282"@-webkit-keyframe-rule" {yyTok = WEBKIT_KEYFRAME_RULE_SYM; return yyTok; }
    83 "@-webkit-region"       {yyTok = WEBKIT_REGION_STYLE_RULE_SYM; return yyTok;}
     83"@-webkit-region"       {yyTok = WEBKIT_REGION_RULE_SYM; return yyTok;}
    8484
    8585"@"{ident}              {yyTok = ATKEYWORD; return yyTok; }
Note: See TracChangeset for help on using the changeset viewer.