Changeset 140115 in webkit
- Timestamp:
- Jan 18, 2013 2:28:10 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 added
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r140114 r140115 1 2013-01-18 Takashi Sakamoto <tasak@google.com> 2 3 Implement CSSHostRule for @host @-rules. 4 https://bugs.webkit.org/show_bug.cgi?id=102344 5 6 Reviewed by Dimitri Glazkov. 7 8 * fast/dom/shadow/css-hostrule-api-expected.txt: Added. 9 * fast/dom/shadow/css-hostrule-api.html: Added. 10 1 11 2013-01-18 John J. Barton <johnjbarton@chromium.org> 2 12 -
trunk/Source/WebCore/CMakeLists.txt
r140097 r140115 313 313 css/CSSCharsetRule.idl 314 314 css/CSSFontFaceRule.idl 315 css/CSSHostRule.idl 315 316 css/CSSImportRule.idl 316 317 css/CSSMediaRule.idl … … 1034 1035 css/CSSGradientValue.cpp 1035 1036 css/CSSGroupingRule.cpp 1037 css/CSSHostRule.cpp 1036 1038 css/CSSImageGeneratorValue.cpp 1037 1039 css/CSSImageSetValue.cpp -
trunk/Source/WebCore/ChangeLog
r140114 r140115 1 2013-01-18 Takashi Sakamoto <tasak@google.com> 2 3 Implement CSSHostRule for @host @-rules. 4 https://bugs.webkit.org/show_bug.cgi?id=102344 5 6 Reviewed by Dimitri Glazkov. 7 8 CSSHostRule is defined in Shadow DOM spec: 9 http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#css-host-rule-interface 10 To see or to modify @host @-rules by using inspector, we need to 11 implement CSSHostRule interface. 12 13 Test: fast/dom/shadow/css-hostrule-api.html 14 15 * DerivedSources.cpp: 16 Modified to include JSCSSHostRule.cpp. 17 * CMakeLists.txt: 18 * DerivedSources.make: 19 * DerivedSources.pri: 20 * GNUmakefile.list.am: 21 * Target.pri: 22 * WebCore.gypi: 23 * WebCore.vcproj/WebCore.vcproj: 24 * WebCore.xcodeproj/project.pbxproj: 25 Added CSSHostRule.cpp, CSSHostRule.h, and CSSHostRule.idl. 26 * bindings/js/JSCSSRuleCustom.cpp: 27 (WebCore::toJS): 28 Add a new case that the given rule is @host @-rules to support @host 29 @-rules. 30 * bindings/objc/DOMCSS.mm: 31 (kitClass): 32 Add a new case that the given rule is @host @-rules to support @host 33 @-rules. 34 * bindings/v8/custom/V8CSSRuleCustom.cpp: 35 (WebCore::wrap): 36 * css/CSSAllInOne.cpp: 37 * css/CSSHostRule.cpp: Added. 38 (WebCore): 39 (WebCore::CSSHostRule::CSSHostRule): 40 (WebCore::CSSHostRule::cssText): 41 * css/CSSHostRule.h: Added. 42 (WebCore): 43 (CSSHostRule): 44 (WebCore::CSSHostRule::create): 45 Implemented class CSSHostRule which inherits CSSGroupingRule. 46 Since CSSHostRule has the same interface as CSSGroupingRule, it is 47 required to implement its constructor and to override only type 48 method and cssText method. 49 * css/CSSHostRule.idl: Added. 50 * css/CSSRule.h: 51 * css/CSSRule.idl: 52 Added internal HOST_RULE type number. 53 * css/StyleResolver.cpp: 54 (WebCore::collectCSSOMWrappers): 55 * css/StyleRule.cpp: 56 (WebCore::StyleRuleBase::reportMemoryUsage): 57 (WebCore::StyleRuleBase::destroy): 58 (WebCore::StyleRuleBase::copy): 59 (WebCore::StyleRuleBase::createCSSOMWrapper): 60 Modified to handle StyleRuleHost. 61 * css/StyleRule.h: 62 (WebCore::StyleRuleBase::isHostRule): 63 (WebCore::StyleRuleHost::StyleRuleHost): 64 * css/StyleSheetContents.cpp: 65 (WebCore::childRulesHaveFailedOrCanceledSubresources): 66 * page/DOMWindow.idl: 67 Added CSSHostRule constructor. 68 1 69 2013-01-18 John J. Barton <johnjbarton@chromium.org> 2 70 -
trunk/Source/WebCore/DerivedSources.cpp
r139866 r140115 56 56 #include "JSCSSCharsetRule.cpp" 57 57 #include "JSCSSFontFaceRule.cpp" 58 #include "JSCSSHostRule.cpp" 58 59 #include "JSCSSImportRule.cpp" 59 60 #include "JSCSSMediaRule.cpp" -
trunk/Source/WebCore/DerivedSources.make
r139918 r140115 176 176 $(WebCore)/css/CSSCharsetRule.idl \ 177 177 $(WebCore)/css/CSSFontFaceRule.idl \ 178 $(WebCore)/css/CSSHostRule.idl \ 178 179 $(WebCore)/css/CSSImportRule.idl \ 179 180 $(WebCore)/css/CSSMediaRule.idl \ -
trunk/Source/WebCore/DerivedSources.pri
r139866 r140115 190 190 $$PWD/css/CSSCharsetRule.idl \ 191 191 $$PWD/css/CSSFontFaceRule.idl \ 192 $$PWD/css/CSSHostRule.idl \ 192 193 $$PWD/css/CSSImportRule.idl \ 193 194 $$PWD/css/CSSMediaRule.idl \ -
trunk/Source/WebCore/GNUmakefile.list.am
r140097 r140115 116 116 DerivedSources/WebCore/JSCSSFontFaceRule.cpp \ 117 117 DerivedSources/WebCore/JSCSSFontFaceRule.h \ 118 DerivedSources/WebCore/JSCSSHostRule.cpp \ 119 DerivedSources/WebCore/JSCSSHostRule.h \ 118 120 DerivedSources/WebCore/JSCSSImportRule.cpp \ 119 121 DerivedSources/WebCore/JSCSSImportRule.h \ … … 1323 1325 $(WebCore)/css/CSSCharsetRule.idl \ 1324 1326 $(WebCore)/css/CSSFontFaceRule.idl \ 1327 $(WebCore)/css/CSSHostRule.idl \ 1325 1328 $(WebCore)/css/CSSImportRule.idl \ 1326 1329 $(WebCore)/css/CSSMediaRule.idl \ … … 2546 2549 Source/WebCore/css/CSSGroupingRule.h \ 2547 2550 Source/WebCore/css/CSSHelper.h \ 2551 Source/WebCore/css/CSSHostRule.cpp \ 2552 Source/WebCore/css/CSSHostRule.h \ 2548 2553 Source/WebCore/css/CSSImageGeneratorValue.cpp \ 2549 2554 Source/WebCore/css/CSSImageGeneratorValue.h \ -
trunk/Source/WebCore/Target.pri
r140097 r140115 265 265 css/CSSGradientValue.cpp \ 266 266 css/CSSGroupingRule.cpp \ 267 css/CSSHostRule.cpp \ 267 268 css/CSSImageValue.cpp \ 268 269 css/CSSImageGeneratorValue.cpp \ -
trunk/Source/WebCore/WebCore.gypi
r140097 r140115 161 161 'css/CSSCharsetRule.idl', 162 162 'css/CSSFontFaceRule.idl', 163 'css/CSSHostRule.idl', 163 164 'css/CSSImportRule.idl', 164 165 'css/CSSMediaRule.idl', … … 1469 1470 'css/CSSGroupingRule.cpp', 1470 1471 'css/CSSGroupingRule.h', 1472 'css/CSSHostRule.cpp', 1473 'css/CSSHostRule.h', 1471 1474 'css/CSSImageGeneratorValue.cpp', 1472 1475 'css/CSSImageSetValue.cpp', … … 5575 5578 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSFontFaceRule.mm', 5576 5579 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSFontFaceRuleInternal.h', 5580 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSHostRule.mm', 5581 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSHostRuleInternal.h', 5577 5582 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSImportRule.mm', 5578 5583 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMCSSImportRuleInternal.h', … … 6137 6142 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSFontFaceRule.cpp', 6138 6143 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSFontFaceRule.h', 6144 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSHostRule.cpp', 6145 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSHostRule.h', 6139 6146 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSImportRule.cpp', 6140 6147 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSCSSImportRule.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r140097 r140115 1859 1859 </File> 1860 1860 <File 1861 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSCSSHostRule.cpp" 1862 > 1863 <FileConfiguration 1864 Name="Debug|Win32" 1865 ExcludedFromBuild="true" 1866 > 1867 <Tool 1868 Name="VCCLCompilerTool" 1869 /> 1870 </FileConfiguration> 1871 <FileConfiguration 1872 Name="Release|Win32" 1873 ExcludedFromBuild="true" 1874 > 1875 <Tool 1876 Name="VCCLCompilerTool" 1877 /> 1878 </FileConfiguration> 1879 <FileConfiguration 1880 Name="Debug_Cairo_CFLite|Win32" 1881 ExcludedFromBuild="true" 1882 > 1883 <Tool 1884 Name="VCCLCompilerTool" 1885 /> 1886 </FileConfiguration> 1887 <FileConfiguration 1888 Name="Release_Cairo_CFLite|Win32" 1889 ExcludedFromBuild="true" 1890 > 1891 <Tool 1892 Name="VCCLCompilerTool" 1893 /> 1894 </FileConfiguration> 1895 <FileConfiguration 1896 Name="Debug_All|Win32" 1897 ExcludedFromBuild="true" 1898 > 1899 <Tool 1900 Name="VCCLCompilerTool" 1901 /> 1902 </FileConfiguration> 1903 <FileConfiguration 1904 Name="Production|Win32" 1905 ExcludedFromBuild="true" 1906 > 1907 <Tool 1908 Name="VCCLCompilerTool" 1909 /> 1910 </FileConfiguration> 1911 </File> 1912 <File 1913 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSCSSHostRule.h" 1914 > 1915 </File> 1916 <File 1861 1917 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSCSSImportRule.cpp" 1862 1918 > … … 36315 36371 </File> 36316 36372 <File 36373 RelativePath="..\css\CSSHostRule.cpp" 36374 > 36375 <FileConfiguration 36376 Name="Debug|Win32" 36377 ExcludedFromBuild="true" 36378 > 36379 <Tool 36380 Name="VCCLCompilerTool" 36381 /> 36382 </FileConfiguration> 36383 <FileConfiguration 36384 Name="Release|Win32" 36385 ExcludedFromBuild="true" 36386 > 36387 <Tool 36388 Name="VCCLCompilerTool" 36389 /> 36390 </FileConfiguration> 36391 <FileConfiguration 36392 Name="Debug_Cairo_CFLite|Win32" 36393 ExcludedFromBuild="true" 36394 > 36395 <Tool 36396 Name="VCCLCompilerTool" 36397 /> 36398 </FileConfiguration> 36399 <FileConfiguration 36400 Name="Release_Cairo_CFLite|Win32" 36401 ExcludedFromBuild="true" 36402 > 36403 <Tool 36404 Name="VCCLCompilerTool" 36405 /> 36406 </FileConfiguration> 36407 <FileConfiguration 36408 Name="Debug_All|Win32" 36409 ExcludedFromBuild="true" 36410 > 36411 <Tool 36412 Name="VCCLCompilerTool" 36413 /> 36414 </FileConfiguration> 36415 <FileConfiguration 36416 Name="Production|Win32" 36417 ExcludedFromBuild="true" 36418 > 36419 <Tool 36420 Name="VCCLCompilerTool" 36421 /> 36422 </FileConfiguration> 36423 </File> 36424 <File 36425 RelativePath="..\css\CSSHostRule.h" 36426 > 36427 </File> 36428 <File 36317 36429 RelativePath="..\css\CSSImageGeneratorValue.cpp" 36318 36430 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r140097 r140115 6459 6459 FB2C15C3165D649D0039C9F8 /* CachedSVGDocumentReference.h in Headers */ = {isa = PBXBuildFile; fileRef = FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6460 6460 FB3056C2169E5DAC0096A232 /* CSSGroupingRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FB3056C1169E5DAC0096A232 /* CSSGroupingRule.h */; }; 6461 FB49C39A16784932007FFB5D /* CSSHostRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB49C39916784932007FFB5D /* CSSHostRule.cpp */; }; 6462 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FB49C39C16784947007FFB5D /* CSSHostRule.h */; }; 6461 6463 FB78AD2E151BF5E600FE54D3 /* CSSParserMode.h in Headers */ = {isa = PBXBuildFile; fileRef = FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6462 6464 FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = FB92DF4915FED08700994433 /* ClipPathOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 14075 14077 FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentReference.h; sourceTree = "<group>"; }; 14076 14078 FB3056C1169E5DAC0096A232 /* CSSGroupingRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGroupingRule.h; sourceTree = "<group>"; }; 14079 FB49C39916784932007FFB5D /* CSSHostRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSHostRule.cpp; sourceTree = "<group>"; }; 14080 FB49C39C16784947007FFB5D /* CSSHostRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSHostRule.h; sourceTree = "<group>"; }; 14081 FB49C39E16784954007FFB5D /* CSSHostRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSHostRule.idl; sourceTree = "<group>"; }; 14077 14082 FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSParserMode.h; sourceTree = "<group>"; }; 14078 14083 FB92DF4915FED08700994433 /* ClipPathOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClipPathOperation.h; sourceTree = "<group>"; }; … … 21663 21668 FB3056C1169E5DAC0096A232 /* CSSGroupingRule.h */, 21664 21669 BC772B360C4EA91E0083285F /* CSSHelper.h */, 21670 FB49C39916784932007FFB5D /* CSSHostRule.cpp */, 21671 FB49C39C16784947007FFB5D /* CSSHostRule.h */, 21672 FB49C39E16784954007FFB5D /* CSSHostRule.idl */, 21665 21673 BC23E76B0DAE88A9009FDC91 /* CSSImageGeneratorValue.cpp */, 21666 21674 BC23EE910DAED2BC009FDC91 /* CSSImageGeneratorValue.h */, … … 26243 26251 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */, 26244 26252 FD537353137B651800008DCE /* ZeroPole.h in Headers */, 26253 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */, 26245 26254 ); 26246 26255 runOnlyForDeploymentPostprocessing = 0; … … 29390 29399 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */, 29391 29400 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */, 29401 FB49C39A16784932007FFB5D /* CSSHostRule.cpp in Sources */, 29392 29402 ); 29393 29403 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
r139866 r140115 36 36 #include "JSCSSCharsetRule.h" 37 37 #include "JSCSSFontFaceRule.h" 38 #include "JSCSSHostRule.h" 38 39 #include "JSCSSImportRule.h" 39 40 #include "JSCSSMediaRule.h" … … 114 115 break; 115 116 #endif 117 #if ENABLE(SHADOW_DOM) 118 case CSSRule::HOST_RULE: 119 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSHostRule, rule); 120 break; 121 #endif 116 122 default: 117 123 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSRule, rule); -
trunk/Source/WebCore/bindings/objc/DOMCSS.mm
r139866 r140115 67 67 #if ENABLE(SVG_DOM_OBJC_BINDINGS) 68 68 #import "DOMSVGPaint.h" 69 #endif 70 71 #if ENABLE(SHADOW_DOM) 72 #import "DOMCSSHostRule.h" 69 73 #endif 70 74 … … 115 119 return [DOMWebKitCSSRegionRule class]; 116 120 #endif 121 #if ENABLE(SHADOW_DOM) 122 case DOM_HOST_RULE: 123 return [DOMCSSHostRule class]; 124 #endif 117 125 } 118 126 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/bindings/v8/custom/V8CSSRuleCustom.cpp
r139866 r140115 34 34 #include "V8CSSCharsetRule.h" 35 35 #include "V8CSSFontFaceRule.h" 36 #include "V8CSSHostRule.h" 36 37 #include "V8CSSImportRule.h" 37 38 #include "V8CSSMediaRule.h" … … 86 87 case CSSRule::WEBKIT_REGION_RULE: 87 88 return wrap(static_cast<WebKitCSSRegionRule*>(impl), creationContext, isolate); 89 #if ENABLE(SHADOW_DOM) 90 case CSSRule::HOST_RULE: 91 return wrap(static_cast<CSSHostRule*>(impl), creationContext, isolate); 92 #endif 88 93 } 89 94 return V8CSSRule::createWrapper(impl, creationContext, isolate); -
trunk/Source/WebCore/css/CSSAllInOne.cpp
r139409 r140115 43 43 #include "CSSGradientValue.cpp" 44 44 #include "CSSGroupingRule.cpp" 45 #include "CSSHostRule.cpp" 45 46 #include "CSSImageGeneratorValue.cpp" 46 47 #include "CSSImageValue.cpp" -
trunk/Source/WebCore/css/CSSRule.h
r139866 r140115 58 58 #endif 59 59 #if ENABLE(CSS_REGIONS) 60 WEBKIT_REGION_RULE = 16 60 WEBKIT_REGION_RULE = 16, 61 #endif 62 #if ENABLE(SHADOW_DOM) 63 HOST_RULE = 1001, 61 64 #endif 62 65 }; -
trunk/Source/WebCore/css/CSSRule.idl
r139866 r140115 47 47 const unsigned short WEBKIT_REGION_RULE = 16; 48 48 #endif 49 #if defined(ENABLE_SHADOW_DOM) && ENABLE_SHADOW_DOM 50 const unsigned short HOST_RULE = 1001; 51 #endif 49 52 50 53 readonly attribute unsigned short type; -
trunk/Source/WebCore/css/StyleResolver.cpp
r140075 r140115 36 36 #include "CSSFontFaceRule.h" 37 37 #include "CSSFontSelector.h" 38 #include "CSSHostRule.h" 38 39 #include "CSSImportRule.h" 39 40 #include "CSSLineBoxContainValue.h" … … 2658 2659 break; 2659 2660 #endif 2661 #if ENABLE(SHADOW_DOM) 2662 case CSSRule::HOST_RULE: 2663 collectCSSOMWrappers(wrapperMap, static_cast<CSSHostRule*>(cssRule)); 2664 break; 2665 #endif 2660 2666 case CSSRule::STYLE_RULE: 2661 2667 wrapperMap.add(static_cast<CSSStyleRule*>(cssRule)->styleRule(), static_cast<CSSStyleRule*>(cssRule)); -
trunk/Source/WebCore/css/StyleRule.cpp
r139866 r140115 25 25 #include "CSSCharsetRule.h" 26 26 #include "CSSFontFaceRule.h" 27 #include "CSSHostRule.h" 27 28 #include "CSSImportRule.h" 28 29 #include "CSSMediaRule.h" … … 87 88 #endif 88 89 #if ENABLE(SHADOW_DOM) 89 case Host :90 static_cast<const StyleRule Block*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);90 case HostInternal: 91 static_cast<const StyleRuleHost*>(this)->reportDescendantMemoryUsage(memoryObjectInfo); 91 92 return; 92 93 #endif … … 140 141 return; 141 142 #if ENABLE(SHADOW_DOM) 142 case Host :143 case HostInternal: 143 144 delete static_cast<StyleRuleHost*>(this); 144 145 return; … … 187 188 return static_cast<const StyleRuleKeyframes*>(this)->copy(); 188 189 #if ENABLE(SHADOW_DOM) 189 case Host :190 case HostInternal: 190 191 return static_cast<const StyleRuleHost*>(this)->copy(); 191 192 #endif … … 246 247 #endif 247 248 #if ENABLE(SHADOW_DOM) 248 case Host: 249 // FIXME: The current CSSOM editor's draft (http://dev.w3.org/csswg/cssom/) does not handle @host rules (see bug 102344). 250 rule = adoptRef(new CSSUnknownRule()); 249 case HostInternal: 250 rule = CSSHostRule::create(static_cast<StyleRuleHost*>(self), parentSheet); 251 251 break; 252 252 #endif -
trunk/Source/WebCore/css/StyleRule.h
r139866 r140115 47 47 Keyframes, 48 48 Keyframe, // Not used. These are internally non-rule StyleKeyframe objects. 49 #if ENABLE(SHADOW_DOM)50 Host,51 #endif52 49 #if ENABLE(CSS3_CONDITIONAL_RULES) 53 50 Supports = 12, … … 56 53 Viewport = 15, 57 54 #endif 58 Region = 16 55 Region = 16, 56 #if ENABLE(SHADOW_DOM) 57 HostInternal = 17, // Spec says Host = 1001, but we can use only 5 bit for type(). 58 #endif 59 59 }; 60 60 61 Type type() const { return static_cast<Type>(m_type); } 61 62 … … 75 76 bool isImportRule() const { return type() == Import; } 76 77 #if ENABLE(SHADOW_DOM) 77 bool isHostRule() const { return type() == Host ; }78 bool isHostRule() const { return type() == HostInternal; } 78 79 #endif 79 80 … … 274 275 275 276 private: 276 StyleRuleHost(Vector<RefPtr<StyleRuleBase> >& adoptRules) : StyleRuleBlock(Host , adoptRules) { }277 StyleRuleHost(Vector<RefPtr<StyleRuleBase> >& adoptRules) : StyleRuleBlock(HostInternal, adoptRules) { } 277 278 StyleRuleHost(const StyleRuleHost& o) : StyleRuleBlock(o) { } 278 279 }; -
trunk/Source/WebCore/css/StyleSheetContents.cpp
r139866 r140115 445 445 break; 446 446 #if ENABLE(SHADOW_DOM) 447 case StyleRuleBase::Host :447 case StyleRuleBase::HostInternal: 448 448 if (childRulesHaveFailedOrCanceledSubresources(static_cast<const StyleRuleHost*>(rule)->childRules())) 449 449 return true; -
trunk/Source/WebCore/page/DOMWindow.idl
r140010 r140115 352 352 attribute CSSCharsetRuleConstructor CSSCharsetRule; 353 353 attribute CSSFontFaceRuleConstructor CSSFontFaceRule; 354 #if defined(ENABLE_SHADOW_DOM) && ENABLE_SHADOW_DOM 355 attribute CSSHostRuleConstructor CSSHostRule; 356 #endif 354 357 attribute CSSImportRuleConstructor CSSImportRule; 355 358 attribute CSSMediaRuleConstructor CSSMediaRule;
Note: See TracChangeset
for help on using the changeset viewer.