Changeset 101899 in webkit
- Timestamp:
- Dec 2, 2011 8:46:07 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r101898 r101899 1 2011-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 1 18 2011-12-02 Tom Sepez <tsepez@chromium.org> 2 19 -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r100164 r101899 212 212 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 213 213 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 214 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]214 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 215 215 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 216 216 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 236 236 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 237 237 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 238 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]238 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 239 239 window.CSSMediaRule [object CSSMediaRuleConstructor] 240 240 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 248 248 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 249 249 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 250 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]250 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 251 251 window.CSSMediaRule.prototype.deleteRule [function] 252 252 window.CSSMediaRule.prototype.insertRule [function] … … 262 262 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 263 263 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 264 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]264 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 265 265 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 266 266 window.CSSPrimitiveValue.CSS_ATTR [number] … … 338 338 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 339 339 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 340 window.CSSRule.WEBKIT_REGION_ STYLE_RULE [number]340 window.CSSRule.WEBKIT_REGION_RULE [number] 341 341 window.CSSRule.prototype [object CSSRulePrototype] 342 342 window.CSSRule.prototype.CHARSET_RULE [number] … … 349 349 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 350 350 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 351 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]351 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 352 352 window.CSSRuleList [object CSSRuleListConstructor] 353 353 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/fast/regions/parsing-region-style-rule.html
r97738 r101899 55 55 for (var idx = 0; idx < cssRules.length; idx++) { 56 56 var cssRule = cssRules.item(idx); 57 if (cssRule.type == CSSRule.WEBKIT_REGION_ STYLE_RULE)57 if (cssRule.type == CSSRule.WEBKIT_REGION_RULE) 58 58 actualRegionStyleRulesText.push(cssRule.cssText); 59 59 } -
trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
r101771 r101899 211 211 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 212 212 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 213 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]213 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 214 214 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 215 215 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 223 223 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 224 224 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 225 window.CSSFontFaceRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]225 window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number] 226 226 window.CSSImportRule [object CSSImportRuleConstructor] 227 227 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 235 235 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 236 236 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 237 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]237 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 238 238 window.CSSMediaRule [object CSSMediaRuleConstructor] 239 239 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 247 247 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 248 248 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 249 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]249 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 250 250 window.CSSMediaRule.prototype.deleteRule [function] 251 251 window.CSSMediaRule.prototype.insertRule [function] … … 261 261 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 262 262 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 263 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]263 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 264 264 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 265 265 window.CSSPrimitiveValue.CSS_ATTR [number] … … 337 337 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 338 338 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 339 window.CSSRule.WEBKIT_REGION_ STYLE_RULE [number]339 window.CSSRule.WEBKIT_REGION_RULE [number] 340 340 window.CSSRule.prototype [object CSSRulePrototype] 341 341 window.CSSRule.prototype.CHARSET_RULE [number] … … 348 348 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 349 349 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 350 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]350 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 351 351 window.CSSRuleList [object CSSRuleListConstructor] 352 352 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt
r101724 r101899 236 236 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 237 237 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 238 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]238 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 239 239 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 240 240 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 248 248 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 249 249 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 250 window.CSSFontFaceRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]250 window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number] 251 251 window.CSSImportRule [object CSSImportRuleConstructor] 252 252 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 260 260 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 261 261 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 262 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]262 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 263 263 window.CSSMediaRule [object CSSMediaRuleConstructor] 264 264 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 272 272 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 273 273 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 274 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]274 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 275 275 window.CSSMediaRule.prototype.deleteRule [function] 276 276 window.CSSMediaRule.prototype.insertRule [function] … … 286 286 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 287 287 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 288 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]288 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 289 289 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 290 290 window.CSSPrimitiveValue.CSS_ATTR [number] … … 362 362 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 363 363 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 364 window.CSSRule.WEBKIT_REGION_ STYLE_RULE [number]364 window.CSSRule.WEBKIT_REGION_RULE [number] 365 365 window.CSSRule.prototype [object CSSRulePrototype] 366 366 window.CSSRule.prototype.CHARSET_RULE [number] … … 373 373 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 374 374 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 375 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]375 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 376 376 window.CSSRuleList [object CSSRuleListConstructor] 377 377 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt
r100164 r101899 210 210 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 211 211 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 212 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]212 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 213 213 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 214 214 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 222 222 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 223 223 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 224 window.CSSFontFaceRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]224 window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number] 225 225 window.CSSImportRule [object CSSImportRuleConstructor] 226 226 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 234 234 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 235 235 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 236 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]236 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 237 237 window.CSSMediaRule [object CSSMediaRuleConstructor] 238 238 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 246 246 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 247 247 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 248 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]248 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 249 249 window.CSSMediaRule.prototype.deleteRule [function] 250 250 window.CSSMediaRule.prototype.insertRule [function] … … 260 260 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 261 261 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 262 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]262 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 263 263 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 264 264 window.CSSPrimitiveValue.CSS_ATTR [number] … … 346 346 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 347 347 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 348 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]348 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 349 349 window.CSSRuleList [object CSSRuleListConstructor] 350 350 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt
r101748 r101899 209 209 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 210 210 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 211 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]211 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 212 212 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 213 213 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 221 221 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 222 222 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 223 window.CSSFontFaceRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]223 window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number] 224 224 window.CSSImportRule [object CSSImportRuleConstructor] 225 225 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 233 233 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 234 234 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 235 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]235 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 236 236 window.CSSMediaRule [object CSSMediaRuleConstructor] 237 237 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 245 245 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 246 246 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 247 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]247 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 248 248 window.CSSMediaRule.prototype.deleteRule [function] 249 249 window.CSSMediaRule.prototype.insertRule [function] … … 259 259 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 260 260 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 261 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]261 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 262 262 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 263 263 window.CSSPrimitiveValue.CSS_ATTR [number] … … 335 335 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 336 336 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 337 window.CSSRule.WEBKIT_REGION_ STYLE_RULE [number]337 window.CSSRule.WEBKIT_REGION_RULE [number] 338 338 window.CSSRule.prototype [object CSSRulePrototype] 339 339 window.CSSRule.prototype.CHARSET_RULE [number] … … 346 346 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 347 347 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 348 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]348 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 349 349 window.CSSRuleList [object CSSRuleListConstructor] 350 350 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt
r100164 r101899 212 212 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 213 213 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 214 window.CSSCharsetRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]214 window.CSSCharsetRule.prototype.WEBKIT_REGION_RULE [number] 215 215 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 216 216 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 224 224 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 225 225 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 226 window.CSSFontFaceRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]226 window.CSSFontFaceRule.prototype.WEBKIT_REGION_RULE [number] 227 227 window.CSSImportRule [object CSSImportRuleConstructor] 228 228 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 236 236 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 237 237 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 238 window.CSSImportRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]238 window.CSSImportRule.prototype.WEBKIT_REGION_RULE [number] 239 239 window.CSSMediaRule [object CSSMediaRuleConstructor] 240 240 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 248 248 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 249 249 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 250 window.CSSMediaRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]250 window.CSSMediaRule.prototype.WEBKIT_REGION_RULE [number] 251 251 window.CSSMediaRule.prototype.deleteRule [function] 252 252 window.CSSMediaRule.prototype.insertRule [function] … … 262 262 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 263 263 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 264 window.CSSPageRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]264 window.CSSPageRule.prototype.WEBKIT_REGION_RULE [number] 265 265 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 266 266 window.CSSPrimitiveValue.CSS_ATTR [number] … … 348 348 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 349 349 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 350 window.CSSRule.prototype.WEBKIT_REGION_ STYLE_RULE [number]350 window.CSSRule.prototype.WEBKIT_REGION_RULE [number] 351 351 window.CSSRuleList [object CSSRuleListConstructor] 352 352 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/Source/WebCore/ChangeLog
r101898 r101899 1 2011-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 1 33 2011-12-02 Tom Sepez <tsepez@chromium.org> 2 34 -
trunk/Source/WebCore/bindings/objc/DOMCSS.mm
r97738 r101899 90 90 case DOM_WEBKIT_KEYFRAME_RULE: 91 91 return [DOMWebKitCSSKeyframeRule class]; 92 case DOM_WEBKIT_REGION_ STYLE_RULE:92 case DOM_WEBKIT_REGION_RULE: 93 93 return [DOMCSSUnknownRule class]; 94 94 } -
trunk/Source/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
r97738 r101899 69 69 case CSSRule::WEBKIT_KEYFRAMES_RULE: 70 70 return toV8(static_cast<WebKitCSSKeyframesRule*>(impl)); 71 case CSSRule::WEBKIT_REGION_ STYLE_RULE:71 case CSSRule::WEBKIT_REGION_RULE: 72 72 return V8CSSRule::wrap(impl); 73 73 } -
trunk/Source/WebCore/css/CSSGrammar.y
r100092 r101899 142 142 %token WEBKIT_MEDIAQUERY_SYM 143 143 %token WEBKIT_SELECTOR_SYM 144 %token WEBKIT_REGION_ STYLE_RULE_SYM144 %token WEBKIT_REGION_RULE_SYM 145 145 %token <marginBox> TOPLEFTCORNER_SYM 146 146 %token <marginBox> TOPLEFT_SYM … … 798 798 799 799 region: 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 { 801 801 if ($3) 802 $$ = static_cast<CSSParser*>(parser)->createRegion StylingRule($3, $6);802 $$ = static_cast<CSSParser*>(parser)->createRegionRule($3, $6); 803 803 else 804 804 $$ = 0; -
trunk/Source/WebCore/css/CSSParser.cpp
r101593 r101899 7725 7725 } 7726 7726 7727 CSSRule* CSSParser::createRegion StylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules)7727 CSSRule* CSSParser::createRegionRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules) 7728 7728 { 7729 7729 if (!regionSelector || !rules) -
trunk/Source/WebCore/css/CSSParser.h
r101288 r101899 240 240 CSSRule* createFontFaceRule(); 241 241 CSSRule* createPageRule(PassOwnPtr<CSSParserSelector> pageSelector); 242 CSSRule* createRegion StylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules);242 CSSRule* createRegionRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules); 243 243 CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox); 244 244 void startDeclarationsForMarginBox(); -
trunk/Source/WebCore/css/CSSRule.cpp
r101593 r101899 62 62 case WEBKIT_KEYFRAME_RULE: 63 63 return static_cast<const WebKitCSSKeyframeRule*>(this)->cssText(); 64 case WEBKIT_REGION_ STYLE_RULE:64 case WEBKIT_REGION_RULE: 65 65 return static_cast<const WebKitCSSRegionRule*>(this)->cssText(); 66 66 } … … 99 99 delete static_cast<WebKitCSSKeyframeRule*>(this); 100 100 return; 101 case WEBKIT_REGION_ STYLE_RULE:101 case WEBKIT_REGION_RULE: 102 102 delete static_cast<WebKitCSSRegionRule*>(this); 103 103 return; -
trunk/Source/WebCore/css/CSSRule.h
r101218 r101899 53 53 WEBKIT_KEYFRAMES_RULE = 8, 54 54 WEBKIT_KEYFRAME_RULE, 55 WEBKIT_REGION_ STYLE_RULE55 WEBKIT_REGION_RULE 56 56 }; 57 57 … … 65 65 bool isPageRule() const { return type() == PAGE_RULE; } 66 66 bool isStyleRule() const { return type() == STYLE_RULE; } 67 bool isRegion StyleRule() const { return type() == WEBKIT_REGION_STYLE_RULE; }67 bool isRegionRule() const { return type() == WEBKIT_REGION_RULE; } 68 68 bool isImportRule() const { return type() == IMPORT_RULE; } 69 69 -
trunk/Source/WebCore/css/CSSRule.idl
r97738 r101899 40 40 const unsigned short WEBKIT_KEYFRAMES_RULE = 8; 41 41 const unsigned short WEBKIT_KEYFRAME_RULE = 9; 42 const unsigned short WEBKIT_REGION_ STYLE_RULE = 10;42 const unsigned short WEBKIT_REGION_RULE = 10; 43 43 44 44 readonly attribute unsigned short type; -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r101812 r101899 431 431 } 432 432 433 void CSSStyleSelector::addRegion StyleRule(PassRefPtr<WebKitCSSRegionRule> regionStyleRule)433 void CSSStyleSelector::addRegionRule(PassRefPtr<WebKitCSSRegionRule> regionStyleRule) 434 434 { 435 435 m_regionStyleRules.append(regionStyleRule); … … 1975 1975 } else if (rule->isKeyframesRule()) 1976 1976 styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(rule)); 1977 else if (rule->isRegion StyleRule() && styleSelector)1978 styleSelector->addRegion StyleRule(static_cast<WebKitCSSRegionRule*>(rule));1977 else if (rule->isRegionRule() && styleSelector) 1978 styleSelector->addRegionRule(static_cast<WebKitCSSRegionRule*>(rule)); 1979 1979 } 1980 1980 if (m_autoShrinkToFitEnabled) -
trunk/Source/WebCore/css/CSSStyleSelector.h
r101812 r101899 201 201 void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule>); 202 202 void addPageStyle(PassRefPtr<CSSPageRule>); 203 void addRegion StyleRule(PassRefPtr<WebKitCSSRegionRule>);203 void addRegionRule(PassRefPtr<WebKitCSSRegionRule>); 204 204 205 205 bool checkRegionStyle(Element*); -
trunk/Source/WebCore/css/WebKitCSSRegionRule.cpp
r101593 r101899 37 37 namespace WebCore { 38 38 WebKitCSSRegionRule::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) 40 40 , m_ruleList(rules) 41 41 { -
trunk/Source/WebCore/css/tokenizer.flex
r99086 r101899 81 81 "@-webkit-keyframes" {yyTok = WEBKIT_KEYFRAMES_SYM; return yyTok; } 82 82 "@-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;} 84 84 85 85 "@"{ident} {yyTok = ATKEYWORD; return yyTok; }
Note: See TracChangeset
for help on using the changeset viewer.