Changeset 163359 in webkit
- Timestamp:
- Feb 3, 2014 7:47:09 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r163289 r163359 296 296 css/CSSFontFaceLoadEvent.idl 297 297 css/CSSFontFaceRule.idl 298 css/CSSHostRule.idl299 298 css/CSSImportRule.idl 300 299 css/CSSMediaRule.idl … … 1041 1040 css/CSSGridTemplateValue.cpp 1042 1041 css/CSSGroupingRule.cpp 1043 css/CSSHostRule.cpp1044 1042 css/CSSImageGeneratorValue.cpp 1045 1043 css/CSSImageSetValue.cpp -
trunk/Source/WebCore/ChangeLog
r163357 r163359 1 2014-02-03 Andreas Kling <akling@apple.com> 2 3 Remove the CSS @host rule. 4 <https://webkit.org/b/128146> 5 6 The @host rule is no longer part of the spec, and besides this code 7 was behind ENABLE(SHADOW_DOM) so nobody was building it. 8 9 Reviewed by Anders Carlsson. 10 11 * CMakeLists.txt: 12 * DerivedSources.cpp: 13 * DerivedSources.make: 14 * GNUmakefile.list.am: 15 * WebCore.vcxproj/WebCore.vcxproj: 16 * WebCore.vcxproj/WebCore.vcxproj.filters: 17 * WebCore.xcodeproj/project.pbxproj: 18 * bindings/js/JSCSSRuleCustom.cpp: 19 (WebCore::toJS): 20 * bindings/objc/DOMCSS.mm: 21 (kitClass): 22 * css/CSSAllInOne.cpp: 23 * css/CSSGrammar.y.in: 24 * css/CSSHostRule.cpp: Removed. 25 * css/CSSHostRule.h: Removed. 26 * css/CSSHostRule.idl: Removed. 27 * css/CSSParser.cpp: 28 (WebCore::CSSParser::detectDashToken): 29 (WebCore::CSSParser::detectAtToken): 30 * css/CSSParser.h: 31 * css/CSSRule.h: 32 * css/CSSRule.idl: 33 * css/InspectorCSSOMWrappers.cpp: 34 (WebCore::InspectorCSSOMWrappers::collect): 35 * css/StyleResolver.h: 36 * css/StyleRule.cpp: 37 (WebCore::StyleRuleBase::destroy): 38 (WebCore::StyleRuleBase::copy): 39 (WebCore::StyleRuleBase::createCSSOMWrapper): 40 * css/StyleRule.h: 41 * css/StyleSheetContents.cpp: 42 (WebCore::childRulesHaveFailedOrCanceledSubresources): 43 * inspector/InspectorStyleSheet.cpp: 44 (flattenSourceData): 45 (WebCore::asCSSRuleList): 46 1 47 2014-02-03 Zalan Bujtas <zalan@apple.com> 2 48 -
trunk/Source/WebCore/DerivedSources.cpp
r162757 r163359 90 90 #endif 91 91 #include "JSCSSFontFaceRule.cpp" 92 #include "JSCSSHostRule.cpp"93 92 #include "JSCSSImportRule.cpp" 94 93 #include "JSCSSMediaRule.cpp" -
trunk/Source/WebCore/DerivedSources.make
r163208 r163359 211 211 $(WebCore)/css/CSSFontFaceLoadEvent.idl \ 212 212 $(WebCore)/css/CSSFontFaceRule.idl \ 213 $(WebCore)/css/CSSHostRule.idl \214 213 $(WebCore)/css/CSSImportRule.idl \ 215 214 $(WebCore)/css/CSSMediaRule.idl \ -
trunk/Source/WebCore/GNUmakefile.list.am
r163289 r163359 129 129 DerivedSources/WebCore/JSCSSFontFaceRule.cpp \ 130 130 DerivedSources/WebCore/JSCSSFontFaceRule.h \ 131 DerivedSources/WebCore/JSCSSHostRule.cpp \132 DerivedSources/WebCore/JSCSSHostRule.h \133 131 DerivedSources/WebCore/JSCSSImportRule.cpp \ 134 132 DerivedSources/WebCore/JSCSSImportRule.h \ … … 1304 1302 $(WebCore)/css/CSSFontFaceLoadEvent.idl \ 1305 1303 $(WebCore)/css/CSSFontFaceRule.idl \ 1306 $(WebCore)/css/CSSHostRule.idl \1307 1304 $(WebCore)/css/CSSImportRule.idl \ 1308 1305 $(WebCore)/css/CSSMediaRule.idl \ … … 2564 2561 Source/WebCore/css/CSSGroupingRule.h \ 2565 2562 Source/WebCore/css/CSSHelper.h \ 2566 Source/WebCore/css/CSSHostRule.cpp \2567 Source/WebCore/css/CSSHostRule.h \2568 2563 Source/WebCore/css/CSSImageGeneratorValue.cpp \ 2569 2564 Source/WebCore/css/CSSImageGeneratorValue.h \ -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r163289 r163359 1148 1148 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 1149 1149 </ClCompile> 1150 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSHostRule.cpp">1151 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>1152 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>1153 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>1154 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>1155 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>1156 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>1157 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>1158 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>1159 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>1160 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>1161 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>1162 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>1163 </ClCompile>1164 1150 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSImportRule.cpp"> 1165 1151 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 9033 9019 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 9034 9020 </ClCompile> 9035 <ClCompile Include="..\css\CSSHostRule.cpp">9036 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>9037 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>9038 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>9039 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>9040 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>9041 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>9042 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>9043 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>9044 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>9045 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>9046 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>9047 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>9048 </ClCompile>9049 9021 <ClCompile Include="..\css\CSSImageGeneratorValue.cpp"> 9050 9022 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 18045 18017 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceLoadEvent.h" /> 18046 18018 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceRule.h" /> 18047 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSHostRule.h" />18048 18019 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSImportRule.h" /> 18049 18020 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSMediaRule.h" /> … … 19684 19655 <ClInclude Include="..\css\CSSGroupingRule.h" /> 19685 19656 <ClInclude Include="..\css\CSSHelper.h" /> 19686 <ClInclude Include="..\css\CSSHostRule.h" />19687 19657 <ClInclude Include="..\css\CSSImageGeneratorValue.h" /> 19688 19658 <ClInclude Include="..\css\CSSImageValue.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r163289 r163359 2134 2134 <Filter>css</Filter> 2135 2135 </ClCompile> 2136 <ClCompile Include="..\css\CSSHostRule.cpp">2137 <Filter>css</Filter>2138 </ClCompile>2139 2136 <ClCompile Include="..\css\CSSImageGeneratorValue.cpp"> 2140 2137 <Filter>css</Filter> … … 5271 5268 </ClCompile> 5272 5269 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceRule.cpp"> 5273 <Filter>DerivedSources</Filter>5274 </ClCompile>5275 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSHostRule.cpp">5276 5270 <Filter>DerivedSources</Filter> 5277 5271 </ClCompile> … … 8952 8946 <Filter>css</Filter> 8953 8947 </ClInclude> 8954 <ClInclude Include="..\css\CSSHostRule.h">8955 <Filter>css</Filter>8956 </ClInclude>8957 8948 <ClInclude Include="..\css\CSSImageGeneratorValue.h"> 8958 8949 <Filter>css</Filter> … … 13029 13020 </ClInclude> 13030 13021 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceRule.h"> 13031 <Filter>DerivedSources</Filter>13032 </ClInclude>13033 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSHostRule.h">13034 13022 <Filter>DerivedSources</Filter> 13035 13023 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r163346 r163359 6155 6155 FB484F4C171F821E00040755 /* TransformFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB484F4A171F821E00040755 /* TransformFunctions.cpp */; }; 6156 6156 FB484F4D171F821E00040755 /* TransformFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = FB484F4B171F821E00040755 /* TransformFunctions.h */; }; 6157 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FB49C39C16784947007FFB5D /* CSSHostRule.h */; };6158 6157 FB78AD2E151BF5E600FE54D3 /* CSSParserMode.h in Headers */ = {isa = PBXBuildFile; fileRef = FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */; settings = {ATTRIBUTES = (Private, ); }; }; 6159 6158 FB91392416AE4C17001FE682 /* DOMPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FB91392016AE4B0B001FE682 /* DOMPath.h */; }; … … 13494 13493 FB484F4A171F821E00040755 /* TransformFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformFunctions.cpp; sourceTree = "<group>"; }; 13495 13494 FB484F4B171F821E00040755 /* TransformFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformFunctions.h; sourceTree = "<group>"; }; 13496 FB49C39C16784947007FFB5D /* CSSHostRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSHostRule.h; sourceTree = "<group>"; };13497 FB49C39E16784954007FFB5D /* CSSHostRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSHostRule.idl; sourceTree = "<group>"; };13498 13495 FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSParserMode.h; sourceTree = "<group>"; }; 13499 13496 FB91391E16AE4B0B001FE682 /* CanvasPathMethods.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CanvasPathMethods.cpp; path = canvas/CanvasPathMethods.cpp; sourceTree = "<group>"; }; … … 21364 21361 FB3056C1169E5DAC0096A232 /* CSSGroupingRule.h */, 21365 21362 BC772B360C4EA91E0083285F /* CSSHelper.h */, 21366 FB49C39C16784947007FFB5D /* CSSHostRule.h */,21367 FB49C39E16784954007FFB5D /* CSSHostRule.idl */,21368 21363 BC23E76B0DAE88A9009FDC91 /* CSSImageGeneratorValue.cpp */, 21369 21364 BC23EE910DAED2BC009FDC91 /* CSSImageGeneratorValue.h */, … … 22950 22945 FB3056C2169E5DAC0096A232 /* CSSGroupingRule.h in Headers */, 22951 22946 BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */, 22952 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */,22953 22947 E1F80B8E183172B5007885C3 /* JSCryptoKeyPair.h in Headers */, 22954 22948 BC23EE920DAED2BC009FDC91 /* CSSImageGeneratorValue.h in Headers */, -
trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
r162644 r163359 36 36 #include "JSCSSCharsetRule.h" 37 37 #include "JSCSSFontFaceRule.h" 38 #include "JSCSSHostRule.h"39 38 #include "JSCSSImportRule.h" 40 39 #include "JSCSSMediaRule.h" … … 116 115 break; 117 116 #endif 118 #if ENABLE(SHADOW_DOM)119 case CSSRule::HOST_RULE:120 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSHostRule, rule);121 break;122 #endif123 117 default: 124 118 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSRule, rule); -
trunk/Source/WebCore/bindings/objc/DOMCSS.mm
r162644 r163359 63 63 #if ENABLE(CSS_DEVICE_ADAPTATION) 64 64 #import "DOMWebKitCSSViewportRule.h" 65 #endif66 67 #if ENABLE(SHADOW_DOM)68 #import "DOMCSSHostRule.h"69 65 #endif 70 66 … … 115 111 return [DOMWebKitCSSRegionRule class]; 116 112 #endif 117 #if ENABLE(SHADOW_DOM)118 case DOM_HOST_RULE:119 return [DOMCSSHostRule class];120 #endif121 113 } 122 114 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/css/CSSAllInOne.cpp
r163263 r163359 45 45 #include "CSSGradientValue.cpp" 46 46 #include "CSSGroupingRule.cpp" 47 #include "CSSHostRule.cpp"48 47 #include "CSSImageGeneratorValue.cpp" 49 48 #include "CSSImageSetValue.cpp" -
trunk/Source/WebCore/css/CSSGrammar.y.in
r162644 r163359 71 71 %} 72 72 73 #if ENABLE_SHADOW_DOM74 %expect 3075 #else76 73 %expect 29 77 #endif78 74 79 75 %nonassoc LOWEST_PREC … … 292 288 #endif 293 289 294 #if ENABLE_SHADOW_DOM295 296 %token HOST_SYM297 298 %type <rule> host299 %destructor { if ($$) $$->deref(); } host300 301 #endif302 303 290 #if ENABLE_VIDEO_TRACK 304 291 … … 406 393 #if ENABLE_CSS3_CONDITIONAL_RULES 407 394 | supports 408 #endif409 #if ENABLE_SHADOW_DOM410 | host411 395 #endif 412 396 #if ENABLE_CSS_DEVICE_ADAPTATION … … 883 867 } 884 868 ; 885 886 #if ENABLE_SHADOW_DOM887 888 before_host_rule:889 /* empty */ {890 parser->markRuleHeaderStart(CSSRuleSourceData::HOST_RULE);891 }892 ;893 894 host:895 before_host_rule HOST_SYM at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space block_rule_list save_block {896 $$ = parser->createHostRule(adoptPtr($7).get()).leakRef();897 }898 | before_host_rule HOST_SYM at_rule_header_end_maybe_space ';' {899 $$ = nullptr;900 parser->popRuleData();901 }902 ;903 904 #endif905 869 906 870 #if ENABLE_CSS_DEVICE_ADAPTATION -
trunk/Source/WebCore/css/CSSParser.cpp
r163344 r163359 10690 10690 } else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc")) 10691 10691 m_token = CALCFUNCTION; 10692 #if ENABLE(SHADOW_DOM)10693 else if (length == 19 && isEqualToCSSIdentifier(name + 1, "webkit-distributed"))10694 m_token = DISTRIBUTEDFUNCTION;10695 #endif10696 10692 } 10697 10693 … … 10746 10742 m_token = FONT_FACE_SYM; 10747 10743 return; 10748 10749 #if ENABLE(SHADOW_DOM)10750 case 'h':10751 if (length == 5 && isEqualToCSSIdentifier(name + 2, "ost"))10752 m_token = HOST_SYM;10753 return;10754 #endif10755 10744 10756 10745 case 'i': … … 11553 11542 } 11554 11543 11555 #if ENABLE(SHADOW_DOM)11556 PassRefPtr<StyleRuleBase> CSSParser::createHostRule(RuleList* rules)11557 {11558 m_allowImportRules = m_allowNamespaceDeclarations = false;11559 RefPtr<StyleRuleHost> rule;11560 if (rules)11561 rule = StyleRuleHost::create(*rules);11562 else {11563 RuleList emptyRules;11564 rule = StyleRuleHost::create(emptyRules);11565 }11566 processAndAddNewRuleToSourceTreeIfNeeded();11567 return rule.release();11568 }11569 #endif11570 11571 11544 void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri) 11572 11545 { -
trunk/Source/WebCore/css/CSSParser.h
r163013 r163359 311 311 PassRefPtr<CSSRuleSourceData> popSupportsRuleData(); 312 312 #endif 313 #if ENABLE(SHADOW_DOM)314 PassRefPtr<StyleRuleBase> createHostRule(RuleList*);315 #endif316 313 317 314 void startDeclarationsForMarginBox(); -
trunk/Source/WebCore/css/CSSRule.h
r162644 r163359 60 60 WEBKIT_REGION_RULE = 16, 61 61 #endif 62 #if ENABLE(SHADOW_DOM)63 HOST_RULE = 1001,64 #endif65 62 }; 66 63 -
trunk/Source/WebCore/css/CSSRule.idl
r162644 r163359 47 47 const unsigned short WEBKIT_REGION_RULE = 16; 48 48 #endif 49 #if defined(ENABLE_SHADOW_DOM) && ENABLE_SHADOW_DOM50 const unsigned short HOST_RULE = 1001;51 #endif52 49 53 50 readonly attribute unsigned short type; -
trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp
r163073 r163359 31 31 32 32 #include "CSSDefaultStyleSheets.h" 33 #include "CSSHostRule.h"34 33 #include "CSSImportRule.h" 35 34 #include "CSSMediaRule.h" … … 73 72 case CSSRule::WEBKIT_REGION_RULE: 74 73 collect(static_cast<WebKitCSSRegionRule*>(cssRule)); 75 break;76 #endif77 #if ENABLE(SHADOW_DOM)78 case CSSRule::HOST_RULE:79 collect(static_cast<CSSHostRule*>(cssRule));80 74 break; 81 75 #endif -
trunk/Source/WebCore/css/StyleResolver.h
r163263 r163359 82 82 class StyleProperties; 83 83 class StyleRule; 84 #if ENABLE(SHADOW_DOM)85 class StyleRuleHost;86 #endif87 84 class StyleRuleKeyframes; 88 85 class StyleRulePage; -
trunk/Source/WebCore/css/StyleRule.cpp
r162644 r163359 25 25 #include "CSSCharsetRule.h" 26 26 #include "CSSFontFaceRule.h" 27 #include "CSSHostRule.h"28 27 #include "CSSImportRule.h" 29 28 #include "CSSMediaRule.h" … … 88 87 delete static_cast<StyleRuleKeyframes*>(this); 89 88 return; 90 #if ENABLE(SHADOW_DOM)91 case HostInternal:92 delete static_cast<StyleRuleHost*>(this);93 return;94 #endif95 89 #if ENABLE(CSS_DEVICE_ADAPTATION) 96 90 case Viewport: … … 131 125 case Keyframes: 132 126 return static_cast<const StyleRuleKeyframes*>(this)->copy(); 133 #if ENABLE(SHADOW_DOM)134 case HostInternal:135 return static_cast<const StyleRuleHost*>(this)->copy();136 #endif137 127 #if ENABLE(CSS_DEVICE_ADAPTATION) 138 128 case Viewport: … … 191 181 case Viewport: 192 182 rule = WebKitCSSViewportRule::create(static_cast<StyleRuleViewport*>(self), parentSheet); 193 break;194 #endif195 #if ENABLE(SHADOW_DOM)196 case HostInternal:197 rule = CSSHostRule::create(static_cast<StyleRuleHost*>(self), parentSheet);198 183 break; 199 184 #endif -
trunk/Source/WebCore/css/StyleRule.h
r162644 r163359 56 56 #endif 57 57 Region = 16, 58 #if ENABLE(SHADOW_DOM)59 HostInternal = 18, // Spec says Host = 1001, but we can use only 5 bit for type().60 #endif61 58 }; 62 59 … … 77 74 #endif 78 75 bool isImportRule() const { return type() == Import; } 79 #if ENABLE(SHADOW_DOM)80 bool isHostRule() const { return type() == HostInternal; }81 #endif82 76 83 77 PassRef<StyleRuleBase> copy() const; … … 263 257 CSSSelectorList m_selectorList; 264 258 }; 265 266 #if ENABLE(SHADOW_DOM)267 class StyleRuleHost : public StyleRuleGroup {268 public:269 static PassRef<StyleRuleHost> create(Vector<RefPtr<StyleRuleBase>>& adoptRules)270 {271 return adoptRef(*new StyleRuleHost(adoptRules));272 }273 274 PassRef<StyleRuleHost> copy() const { return adoptRef(*new StyleRuleHost(*this)); }275 276 private:277 StyleRuleHost(Vector<RefPtr<StyleRuleBase>>& adoptRules) : StyleRuleGroup(HostInternal, adoptRules) { }278 StyleRuleHost(const StyleRuleHost& o) : StyleRuleGroup(o) { }279 };280 #endif281 259 282 260 #if ENABLE(CSS_DEVICE_ADAPTATION) -
trunk/Source/WebCore/css/StyleSheetContents.cpp
r162907 r163359 449 449 return true; 450 450 break; 451 #if ENABLE(SHADOW_DOM)452 case StyleRuleBase::HostInternal:453 if (childRulesHaveFailedOrCanceledSubresources(static_cast<const StyleRuleHost*>(rule)->childRules()))454 return true;455 break;456 #endif457 451 case StyleRuleBase::Import: 458 452 ASSERT_NOT_REACHED(); -
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
r162784 r163359 29 29 #include "InspectorStyleSheet.h" 30 30 31 #include "CSSHostRule.h"32 31 #include "CSSImportRule.h" 33 32 #include "CSSMediaRule.h" … … 110 109 else if (data->type == CSSRuleSourceData::MEDIA_RULE) 111 110 flattenSourceData(&data->childRules, target); 112 #if ENABLE(SHADOW_DOM)113 else if (data->type == CSSRuleSourceData::HOST_RULE)114 flattenSourceData(&data->childRules, target);115 #endif116 111 #if ENABLE(CSS3_CONDITIONAL_RULES) 117 112 else if (data->type == CSSRuleSourceData::SUPPORTS_RULE) … … 226 221 if (rule->type() == CSSRule::WEBKIT_KEYFRAMES_RULE) 227 222 return static_cast<WebKitCSSKeyframesRule*>(rule)->cssRules(); 228 229 #if ENABLE(SHADOW_DOM)230 if (rule->type() == CSSRule::HOST_RULE)231 return static_cast<CSSHostRule*>(rule)->cssRules();232 #endif233 223 234 224 #if ENABLE(CSS3_CONDITIONAL_RULES)
Note: See TracChangeset
for help on using the changeset viewer.