Changeset 97738 in webkit
- Timestamp:
- Oct 18, 2011 4:50:49 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r97736 r97738 1 2011-10-18 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSS Regions]Parse @-webkit-region rule 4 https://bugs.webkit.org/show_bug.cgi?id=70021 5 6 Reviewed by David Hyatt. 7 8 * fast/dom/Window/window-properties-expected.txt: 9 * fast/regions/parsing-region-style-rule-expected.txt: Added. 10 * fast/regions/parsing-region-style-rule.html: Added. 11 * platform/gtk/fast/dom/Window/window-properties-expected.txt: 12 * platform/mac/fast/dom/Window/window-properties-expected.txt: 13 * platform/qt-wk2/fast/dom/Window/window-properties-expected.txt: 14 * platform/win/fast/dom/Window/window-properties-expected.txt: 15 1 16 2011-10-18 Philippe Normand <pnormand@igalia.com> 2 17 -
trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt
r94898 r97738 213 213 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 214 214 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 215 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 215 216 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 216 217 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 224 225 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 225 226 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 227 window.CSSFontFaceRule.prototype.WEBKIT_REGIONS_STYLE_RULE [number] 226 228 window.CSSImportRule [object CSSImportRuleConstructor] 227 229 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 235 237 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 236 238 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 239 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 237 240 window.CSSMediaRule [object CSSMediaRuleConstructor] 238 241 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 246 249 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 247 250 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 251 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 248 252 window.CSSMediaRule.prototype.deleteRule [function] 249 253 window.CSSMediaRule.prototype.insertRule [function] … … 259 263 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 260 264 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 265 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 261 266 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 262 267 window.CSSPrimitiveValue.CSS_ATTR [number] … … 334 339 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 335 340 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 341 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number] 336 342 window.CSSRule.prototype [object CSSRulePrototype] 337 343 window.CSSRule.prototype.CHARSET_RULE [number] … … 344 350 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 345 351 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 352 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 346 353 window.CSSRuleList [object CSSRuleListConstructor] 347 354 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
r95527 r97738 213 213 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 214 214 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 215 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 215 216 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 216 217 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 224 225 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 225 226 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 227 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 226 228 window.CSSImportRule [object CSSImportRuleConstructor] 227 229 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 235 237 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 236 238 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 239 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 237 240 window.CSSMediaRule [object CSSMediaRuleConstructor] 238 241 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 246 249 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 247 250 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 251 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 248 252 window.CSSMediaRule.prototype.deleteRule [function] 249 253 window.CSSMediaRule.prototype.insertRule [function] … … 259 263 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 260 264 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 265 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 261 266 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 262 267 window.CSSPrimitiveValue.CSS_ATTR [number] … … 344 349 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 345 350 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 351 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 346 352 window.CSSRuleList [object CSSRuleListConstructor] 347 353 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt
r96774 r97738 238 238 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 239 239 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 240 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 240 241 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 241 242 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 249 250 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 250 251 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 252 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 251 253 window.CSSImportRule [object CSSImportRuleConstructor] 252 254 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 260 262 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 261 263 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 264 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 262 265 window.CSSMediaRule [object CSSMediaRuleConstructor] 263 266 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 271 274 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 272 275 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 276 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 273 277 window.CSSMediaRule.prototype.deleteRule [function] 274 278 window.CSSMediaRule.prototype.insertRule [function] … … 284 288 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 285 289 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 290 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 286 291 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 287 292 window.CSSPrimitiveValue.CSS_ATTR [number] … … 359 364 window.CSSRule.WEBKIT_KEYFRAMES_RULE [number] 360 365 window.CSSRule.WEBKIT_KEYFRAME_RULE [number] 366 window.CSSRule.WEBKIT_REGION_STYLE_RULE [number] 361 367 window.CSSRule.prototype [object CSSRulePrototype] 362 368 window.CSSRule.prototype.CHARSET_RULE [number] … … 369 375 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 370 376 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 377 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 371 378 window.CSSRuleList [object CSSRuleListConstructor] 372 379 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/qt-wk2/fast/dom/Window/window-properties-expected.txt
r94898 r97738 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 214 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 214 215 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 222 223 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 223 224 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 225 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 224 226 window.CSSImportRule [object CSSImportRuleConstructor] 225 227 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 233 235 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 234 236 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 237 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 235 238 window.CSSMediaRule [object CSSMediaRuleConstructor] 236 239 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 244 247 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 245 248 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 249 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 246 250 window.CSSMediaRule.prototype.deleteRule [function] 247 251 window.CSSMediaRule.prototype.insertRule [function] … … 257 261 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 258 262 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 263 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 259 264 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 260 265 window.CSSPrimitiveValue.CSS_ATTR [number] … … 342 347 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 343 348 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 349 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 344 350 window.CSSRuleList [object CSSRuleListConstructor] 345 351 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/LayoutTests/platform/win/fast/dom/Window/window-properties-expected.txt
r96764 r97738 213 213 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 214 214 window.CSSCharsetRule.prototype.WEBKIT_KEYFRAME_RULE [number] 215 window.CSSCharsetRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 215 216 window.CSSFontFaceRule [object CSSFontFaceRuleConstructor] 216 217 window.CSSFontFaceRule.prototype [object CSSFontFaceRulePrototype] … … 224 225 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 225 226 window.CSSFontFaceRule.prototype.WEBKIT_KEYFRAME_RULE [number] 227 window.CSSFontFaceRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 226 228 window.CSSImportRule [object CSSImportRuleConstructor] 227 229 window.CSSImportRule.prototype [object CSSImportRulePrototype] … … 235 237 window.CSSImportRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 236 238 window.CSSImportRule.prototype.WEBKIT_KEYFRAME_RULE [number] 239 window.CSSImportRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 237 240 window.CSSMediaRule [object CSSMediaRuleConstructor] 238 241 window.CSSMediaRule.prototype [object CSSMediaRulePrototype] … … 246 249 window.CSSMediaRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 247 250 window.CSSMediaRule.prototype.WEBKIT_KEYFRAME_RULE [number] 251 window.CSSMediaRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 248 252 window.CSSMediaRule.prototype.deleteRule [function] 249 253 window.CSSMediaRule.prototype.insertRule [function] … … 259 263 window.CSSPageRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 260 264 window.CSSPageRule.prototype.WEBKIT_KEYFRAME_RULE [number] 265 window.CSSPageRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 261 266 window.CSSPrimitiveValue [object CSSPrimitiveValueConstructor] 262 267 window.CSSPrimitiveValue.CSS_ATTR [number] … … 344 349 window.CSSRule.prototype.WEBKIT_KEYFRAMES_RULE [number] 345 350 window.CSSRule.prototype.WEBKIT_KEYFRAME_RULE [number] 351 window.CSSRule.prototype.WEBKIT_REGION_STYLE_RULE [number] 346 352 window.CSSRuleList [object CSSRuleListConstructor] 347 353 window.CSSRuleList.prototype [object CSSRuleListPrototype] -
trunk/Source/WebCore/CMakeLists.txt
r97721 r97738 455 455 css/CSSPropertySourceData.cpp 456 456 css/CSSReflectValue.cpp 457 css/CSSRegionStyleRule.cpp 457 458 css/CSSRule.cpp 458 459 css/CSSRuleList.cpp -
trunk/Source/WebCore/ChangeLog
r97732 r97738 1 2011-10-18 Mihnea Ovidenie <mihnea@adobe.com> 2 3 [CSS Regions]Parse @-webkit-region rule 4 https://bugs.webkit.org/show_bug.cgi?id=70021 5 6 Reviewed by David Hyatt. 7 8 Test: fast/regions/parsing-region-style-rule.html 9 10 * CMakeLists.txt: 11 * GNUmakefile.list.am: 12 * WebCore.gypi: 13 * WebCore.pro: 14 * WebCore.vcproj/WebCore.vcproj: 15 * WebCore.xcodeproj/project.pbxproj: 16 * bindings/objc/DOMCSS.mm: 17 (kitClass): 18 * bindings/v8/custom/V8CSSRuleCustom.cpp: 19 (WebCore::toV8): 20 * css/CSSGrammar.y: 21 * css/CSSMediaRule.cpp: 22 (WebCore::CSSMediaRule::cssText): 23 * css/CSSParser.cpp: 24 (WebCore::CSSParser::setReusableRegionSelectorVector): 25 (WebCore::CSSParser::createRegionStylingRule): 26 * css/CSSParser.h: 27 (WebCore::CSSParser::reusableRegionSelectorVector): 28 * css/CSSRegionStyleRule.cpp: Added. 29 (WebCore::CSSRegionStyleRule::CSSRegionStyleRule): 30 (WebCore::CSSRegionStyleRule::~CSSRegionStyleRule): 31 (WebCore::CSSRegionStyleRule::cssText): 32 * css/CSSRegionStyleRule.h: Added. 33 * css/CSSRule.h: 34 * css/CSSRule.idl: 35 * css/CSSRuleList.cpp: 36 (WebCore::CSSRuleList::item): 37 (WebCore::CSSRuleList::rulesText): 38 * css/CSSRuleList.h: 39 * css/CSSSelectorList.cpp: 40 (WebCore::CSSSelectorList::selectorsText): 41 * css/CSSSelectorList.h: 42 * css/CSSStyleSelector.cpp: 43 (WebCore::CSSStyleSelector::addRegionStyleRule): 44 (WebCore::RuleSet::addRulesFromSheet): 45 * css/CSSStyleSelector.h: 46 * css/StyleBase.h: 47 (WebCore::StyleBase::isRegionStyleRule): 48 * css/tokenizer.flex: 49 1 50 2011-10-11 Pavel Podivilov <podivilov@chromium.org> 2 51 -
trunk/Source/WebCore/GNUmakefile.list.am
r97721 r97738 996 996 Source/WebCore/css/CSSReflectValue.cpp \ 997 997 Source/WebCore/css/CSSReflectValue.h \ 998 Source/WebCore/css/CSSRegionStyleRule.cpp \ 999 Source/WebCore/css/CSSRegionStyleRule.h \ 998 1000 Source/WebCore/css/CSSRule.cpp \ 999 1001 Source/WebCore/css/CSSRule.h \ -
trunk/Source/WebCore/WebCore.gypi
r97721 r97738 2381 2381 'css/CSSPropertySourceData.cpp', 2382 2382 'css/CSSReflectValue.cpp', 2383 'css/CSSRegionStyleRule.cpp', 2384 'css/CSSRegionStyleRule.h', 2383 2385 'css/CSSRule.cpp', 2384 2386 'css/CSSRule.h', -
trunk/Source/WebCore/WebCore.pro
r97721 r97738 420 420 css/CSSPropertySourceData.cpp \ 421 421 css/CSSReflectValue.cpp \ 422 css/CSSRegionStyleRule.cpp \ 422 423 css/CSSRule.cpp \ 423 424 css/CSSRuleList.cpp \ … … 1455 1456 css/CSSPropertyLonghand.h \ 1456 1457 css/CSSReflectValue.h \ 1458 css/CSSRegionStyleRule.h \ 1457 1459 css/CSSRule.h \ 1458 1460 css/CSSRuleList.h \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r97721 r97738 33287 33287 </File> 33288 33288 <File 33289 RelativePath="..\css\CSSRegionStyleRule.cpp" 33290 > 33291 </File> 33292 <File 33293 RelativePath="..\css\CSSRegionStyleRule.h" 33294 > 33295 </File> 33296 <File 33289 33297 RelativePath="..\css\CSSRule.cpp" 33290 33298 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r97721 r97738 2909 2909 8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */; }; 2910 2910 8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */; }; 2911 8AA61CFF144D595B00F37350 /* CSSRegionStyleRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */; }; 2912 8AA61D00144D595B00F37350 /* CSSRegionStyleRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */; }; 2911 2913 8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */; }; 2912 2914 8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */; }; … … 7087 7089 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySlider.h; sourceTree = "<group>"; }; 7088 7090 070DD8F50F01868000727DEB /* mediaControls.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mediaControls.css; sourceTree = "<group>"; }; 7091 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = "<group>"; }; 7089 7092 0753860014489E9800B78452 /* CachedCues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedCues.cpp; sourceTree = "<group>"; }; 7090 7093 0753860114489E9800B78452 /* CachedCues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedCues.h; sourceTree = "<group>"; }; 7091 0735EE690F40C5E4004A2604 /* MediaPlayerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerProxy.h; sourceTree = "<group>"; };7092 7094 076F0D0912B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaPlayerPrivateAVFoundation.cpp; sourceTree = "<group>"; }; 7093 7095 076F0D0A12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundation.h; sourceTree = "<group>"; }; … … 10073 10075 8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformanceTiming.cpp; sourceTree = "<group>"; }; 10074 10076 8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformanceTiming.h; sourceTree = "<group>"; }; 10077 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSRegionStyleRule.cpp; sourceTree = "<group>"; }; 10078 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSRegionStyleRule.h; sourceTree = "<group>"; }; 10075 10079 8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IgnoreDestructiveWriteCountIncrementer.h; sourceTree = "<group>"; }; 10076 10080 8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceNavigation.cpp; sourceTree = "<group>"; }; … … 20578 20582 BC5A12DD0DC0414800C9AFAD /* CSSReflectValue.cpp */, 20579 20583 BC5A12DE0DC0414800C9AFAD /* CSSReflectValue.h */, 20584 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */, 20585 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */, 20580 20586 A80E6CDC0A1989CA007FB8C5 /* CSSRule.cpp */, 20581 20587 A80E6CE30A1989CA007FB8C5 /* CSSRule.h */, … … 24614 24620 71CCB49D144824AC00C676D6 /* ImageBySizeCache.h in Headers */, 24615 24621 0753860314489E9800B78452 /* CachedCues.h in Headers */, 24622 8AA61D00144D595B00F37350 /* CSSRegionStyleRule.h in Headers */, 24616 24623 ); 24617 24624 runOnlyForDeploymentPostprocessing = 0; … … 27466 27473 71CCB49C144824AC00C676D6 /* ImageBySizeCache.cpp in Sources */, 27467 27474 0753860214489E9800B78452 /* CachedCues.cpp in Sources */, 27475 8AA61CFF144D595B00F37350 /* CSSRegionStyleRule.cpp in Sources */, 27468 27476 ); 27469 27477 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/objc/DOMCSS.mm
r96764 r97738 90 90 case DOM_WEBKIT_KEYFRAME_RULE: 91 91 return [DOMWebKitCSSKeyframeRule class]; 92 case DOM_WEBKIT_REGION_STYLE_RULE: 93 return [DOMCSSUnknownRule class]; 92 94 } 93 95 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
r95901 r97738 69 69 case CSSRule::WEBKIT_KEYFRAMES_RULE: 70 70 return toV8(static_cast<WebKitCSSKeyframesRule*>(impl)); 71 case CSSRule::WEBKIT_REGION_STYLE_RULE: 72 return V8CSSRule::wrap(impl); 71 73 } 72 74 return V8CSSRule::wrap(impl); -
trunk/Source/WebCore/css/CSSGrammar.y
r90456 r97738 142 142 %token WEBKIT_MEDIAQUERY_SYM 143 143 %token WEBKIT_SELECTOR_SYM 144 %token WEBKIT_REGION_STYLE_RULE_SYM 144 145 %token <marginBox> TOPLEFTCORNER_SYM 145 146 %token <marginBox> TOPLEFT_SYM … … 220 221 %type <rule> block_rule 221 222 %type <rule> block_valid_rule 223 %type <rule> region 222 224 223 225 %type <string> maybe_ns_prefix … … 254 256 %type <selectorList> selector_list 255 257 %type <selectorList> simple_selector_list 258 %type <selectorList> region_selector 256 259 %type <selector> selector_with_trailing_whitespace 257 260 %type <selector> class … … 411 414 | namespace 412 415 | import 416 | region 413 417 ; 414 418 … … 775 779 | FONT_FACE_SYM error ';' { 776 780 $$ = 0; 781 } 782 ; 783 784 region_selector: 785 selector_list { 786 if ($1) { 787 static_cast<CSSParser*>(parser)->setReusableRegionSelectorVector($1); 788 $$ = static_cast<CSSParser*>(parser)->reusableRegionSelectorVector(); 789 } 790 else 791 $$ = 0; 792 } 793 ; 794 795 region: 796 WEBKIT_REGION_STYLE_RULE_SYM WHITESPACE region_selector '{' maybe_space block_rule_list save_block { 797 if ($3) 798 $$ = static_cast<CSSParser*>(parser)->createRegionStylingRule($3, $6); 777 799 } 778 800 ; -
trunk/Source/WebCore/css/CSSMediaRule.cpp
r84527 r97738 120 120 result += "{ \n"; 121 121 122 if (m_lstCSSRules) { 123 unsigned len = m_lstCSSRules->length(); 124 for (unsigned i = 0; i < len; i++) { 125 result += " "; 126 result += m_lstCSSRules->item(i)->cssText(); 127 result += "\n"; 128 } 129 } 122 if (m_lstCSSRules) 123 result += m_lstCSSRules->rulesText(); 130 124 131 125 result += "}"; -
trunk/Source/WebCore/css/CSSParser.cpp
r97701 r97738 49 49 #include "CSSPropertySourceData.h" 50 50 #include "CSSReflectValue.h" 51 #include "CSSRegionStyleRule.h" 51 52 #include "CSSRuleList.h" 52 53 #include "CSSSelector.h" … … 7342 7343 } 7343 7344 7345 void CSSParser::setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors) 7346 { 7347 if (selectors) 7348 m_reusableRegionSelectorVector.swap(*selectors); 7349 } 7350 7351 CSSRule* CSSParser::createRegionStylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules) 7352 { 7353 if (!regionSelector || !rules) 7354 return 0; 7355 7356 m_allowImportRules = m_allowNamespaceDeclarations = false; 7357 7358 RefPtr<CSSRegionStyleRule> regionRule = CSSRegionStyleRule::create(m_styleSheet, regionSelector, rules); 7359 7360 CSSRegionStyleRule* result = regionRule.get(); 7361 m_parsedRules.append(regionRule.release()); 7362 7363 return result; 7364 } 7365 7344 7366 CSSRule* CSSParser::createMarginAtRule(CSSSelector::MarginBoxType /* marginBox */) 7345 7367 { -
trunk/Source/WebCore/css/CSSParser.h
r97701 r97738 229 229 CSSRule* createFontFaceRule(); 230 230 CSSRule* createPageRule(PassOwnPtr<CSSParserSelector> pageSelector); 231 CSSRule* createRegionStylingRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, CSSRuleList* rules); 231 232 CSSRule* createMarginAtRule(CSSSelector::MarginBoxType marginBox); 232 233 void startDeclarationsForMarginBox(); … … 248 249 249 250 Vector<OwnPtr<CSSParserSelector> >* reusableSelectorVector() { return &m_reusableSelectorVector; } 251 252 void setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors); 253 Vector<OwnPtr<CSSParserSelector> >* reusableRegionSelectorVector() { return &m_reusableRegionSelectorVector; } 250 254 251 255 void updateLastSelectorLineAndPosition(); … … 263 267 CSSProperty** m_parsedProperties; 264 268 CSSSelectorList* m_selectorListForParseSelector; 269 265 270 RefPtr<CSSPrimitiveValueCache> m_primitiveValueCache; 266 271 unsigned m_numParsedProperties; … … 357 362 358 363 Vector<OwnPtr<CSSParserSelector> > m_reusableSelectorVector; 364 Vector<OwnPtr<CSSParserSelector> > m_reusableRegionSelectorVector; 359 365 360 366 // defines units allowed for a certain property, used in parseUnit -
trunk/Source/WebCore/css/CSSRule.h
r97489 r97738 44 44 // 7 used to be VARIABLES_RULE 45 45 WEBKIT_KEYFRAMES_RULE = 8, 46 WEBKIT_KEYFRAME_RULE 46 WEBKIT_KEYFRAME_RULE, 47 WEBKIT_REGION_STYLE_RULE 47 48 }; 48 49 -
trunk/Source/WebCore/css/CSSRule.idl
r89269 r97738 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 43 43 44 readonly attribute unsigned short type; -
trunk/Source/WebCore/css/CSSRuleList.cpp
r97485 r97738 54 54 } 55 55 56 CSSRule* CSSRuleList::item(unsigned index) 56 CSSRule* CSSRuleList::item(unsigned index) const 57 57 { 58 58 if (m_styleSheet) … … 96 96 } 97 97 98 String CSSRuleList::rulesText() const 99 { 100 String result; 101 102 for (unsigned index = 0; index < length(); ++index) { 103 result += " "; 104 result += item(index)->cssText(); 105 result += "\n"; 106 } 107 108 return result; 109 } 110 98 111 } // namespace WebCore -
trunk/Source/WebCore/css/CSSRuleList.h
r97485 r97738 27 27 #include <wtf/RefPtr.h> 28 28 #include <wtf/Vector.h> 29 #include <wtf/text/WTFString.h> 29 30 30 31 namespace WebCore { … … 46 47 47 48 unsigned length() const; 48 CSSRule* item(unsigned index) ;49 CSSRule* item(unsigned index) const; 49 50 50 51 // FIXME: Not part of the CSSOM. Only used by @media and @-webkit-keyframes rules. … … 55 56 56 57 CSSStyleSheet* styleSheet() { return m_styleSheet.get(); } 58 59 String rulesText() const; 57 60 58 61 private: -
trunk/Source/WebCore/css/CSSSelectorList.cpp
r96517 r97738 106 106 } 107 107 108 String CSSSelectorList::selectorsText() const 109 { 110 String result; 111 112 for (CSSSelector* s = first(); s; s = next(s)) { 113 if (s != first()) 114 result += ", "; 115 result += s->selectorText(); 116 } 117 118 return result; 119 } 108 120 109 121 template <typename Functor> -
trunk/Source/WebCore/css/CSSSelectorList.h
r95901 r97738 49 49 bool hasUnknownPseudoElements() const; 50 50 51 String selectorsText() const; 52 51 53 private: 52 54 void deleteSelectors(); -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r97724 r97738 45 45 #include "CSSPropertyNames.h" 46 46 #include "CSSReflectValue.h" 47 #include "CSSRegionStyleRule.h" 47 48 #include "CSSRuleList.h" 48 49 #include "CSSSelector.h" … … 441 442 } 442 443 444 void CSSStyleSelector::addRegionStyleRule(PassRefPtr<CSSRegionStyleRule> regionStyleRule) 445 { 446 m_regionStyleRules.append(regionStyleRule); 447 } 448 443 449 // This is a simplified style setting function for keyframe styles 444 450 void CSSStyleSelector::addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule) … … 1984 1990 } else if (rule->isKeyframesRule()) 1985 1991 styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(rule)); 1992 else if (rule->isRegionStyleRule() && styleSelector) 1993 styleSelector->addRegionStyleRule(static_cast<CSSRegionStyleRule*>(rule)); 1986 1994 } 1987 1995 if (m_autoShrinkToFitEnabled) -
trunk/Source/WebCore/css/CSSStyleSelector.h
r97638 r97738 46 46 class CSSFontFaceRule; 47 47 class CSSImageValue; 48 class CSSRegionStyleRule; 48 49 class CSSRuleList; 49 50 class CSSSelector; … … 189 190 void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule>); 190 191 void addPageStyle(PassRefPtr<CSSPageRule>); 192 void addRegionStyleRule(PassRefPtr<CSSRegionStyleRule>); 191 193 192 194 bool usesSiblingRules() const { return m_features.siblingRules; } … … 256 258 KeyframesRuleMap m_keyframesRuleMap; 257 259 260 typedef Vector<RefPtr<CSSRegionStyleRule> > RegionStyleRules; 261 RegionStyleRules m_regionStyleRules; 258 262 public: 259 263 static RenderStyle* styleNotYetAvailable() { return s_styleNotYetAvailable; } -
trunk/Source/WebCore/css/StyleBase.h
r92448 r97738 59 59 virtual bool isRule() const { return false; } 60 60 virtual bool isStyleRule() const { return false; } 61 virtual bool isRegionStyleRule() const { return false; } 61 62 62 63 virtual bool isStyleSheet() const { return false; } -
trunk/Source/WebCore/css/tokenizer.flex
r89826 r97738 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 84 84 85 "@"{ident} {yyTok = ATKEYWORD; return yyTok; }
Note: See TracChangeset
for help on using the changeset viewer.