Changeset 163359 in webkit


Ignore:
Timestamp:
Feb 3, 2014 7:47:09 PM (10 years ago)
Author:
akling@apple.com
Message:

Remove the CSS @host rule.
<​https://webkit.org/b/128146>

The @host rule is no longer part of the spec, and besides this code
was behind ENABLE(SHADOW_DOM) so nobody was building it.

Reviewed by Anders Carlsson.

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.list.am:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSCSSRuleCustom.cpp:

(WebCore::toJS):

  • bindings/objc/DOMCSS.mm:

(kitClass):

  • css/CSSAllInOne.cpp:
  • css/CSSGrammar.y.in:
  • css/CSSHostRule.cpp: Removed.
  • css/CSSHostRule.h: Removed.
  • css/CSSHostRule.idl: Removed.
  • css/CSSParser.cpp:

(WebCore::CSSParser::detectDashToken):
(WebCore::CSSParser::detectAtToken):

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

(WebCore::InspectorCSSOMWrappers::collect):

  • css/StyleResolver.h:
  • css/StyleRule.cpp:

(WebCore::StyleRuleBase::destroy):
(WebCore::StyleRuleBase::copy):
(WebCore::StyleRuleBase::createCSSOMWrapper):

  • css/StyleRule.h:
  • css/StyleSheetContents.cpp:

(WebCore::childRulesHaveFailedOrCanceledSubresources):

  • inspector/InspectorStyleSheet.cpp:

(flattenSourceData):
(WebCore::asCSSRuleList):

Location:
trunk/Source/WebCore
Files:
3 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r163289 r163359  
    296296    css/CSSFontFaceLoadEvent.idl
    297297    css/CSSFontFaceRule.idl
    298     css/CSSHostRule.idl
    299298    css/CSSImportRule.idl
    300299    css/CSSMediaRule.idl
    … …  
    10411040    css/CSSGridTemplateValue.cpp
    10421041    css/CSSGroupingRule.cpp
    1043     css/CSSHostRule.cpp
    10441042    css/CSSImageGeneratorValue.cpp
    10451043    css/CSSImageSetValue.cpp

  • trunk/Source/WebCore/ChangeLog

    r163357 r163359  
     12014-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
    1472014-02-03  Zalan Bujtas  <zalan@apple.com>
    248

  • trunk/Source/WebCore/DerivedSources.cpp

    r162757 r163359  
    9090#endif
    9191#include "JSCSSFontFaceRule.cpp"
    92 #include "JSCSSHostRule.cpp"
    9392#include "JSCSSImportRule.cpp"
    9493#include "JSCSSMediaRule.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r163208 r163359  
    211211    $(WebCore)/css/CSSFontFaceLoadEvent.idl \
    212212    $(WebCore)/css/CSSFontFaceRule.idl \
    213     $(WebCore)/css/CSSHostRule.idl \
    214213    $(WebCore)/css/CSSImportRule.idl \
    215214    $(WebCore)/css/CSSMediaRule.idl \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r163289 r163359  
    129129        DerivedSources/WebCore/JSCSSFontFaceRule.cpp \
    130130        DerivedSources/WebCore/JSCSSFontFaceRule.h \
    131         DerivedSources/WebCore/JSCSSHostRule.cpp \
    132         DerivedSources/WebCore/JSCSSHostRule.h \
    133131        DerivedSources/WebCore/JSCSSImportRule.cpp \
    134132        DerivedSources/WebCore/JSCSSImportRule.h \
    … …  
    13041302        $(WebCore)/css/CSSFontFaceLoadEvent.idl \
    13051303        $(WebCore)/css/CSSFontFaceRule.idl \
    1306         $(WebCore)/css/CSSHostRule.idl \
    13071304        $(WebCore)/css/CSSImportRule.idl \
    13081305        $(WebCore)/css/CSSMediaRule.idl \
    … …  
    25642561        Source/WebCore/css/CSSGroupingRule.h \
    25652562        Source/WebCore/css/CSSHelper.h \
    2566         Source/WebCore/css/CSSHostRule.cpp \
    2567         Source/WebCore/css/CSSHostRule.h \
    25682563        Source/WebCore/css/CSSImageGeneratorValue.cpp \
    25692564        Source/WebCore/css/CSSImageGeneratorValue.h \

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r163289 r163359  
    11481148      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    11491149    </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>
    11641150    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSImportRule.cpp">
    11651151      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    90339019      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    90349020    </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>
    90499021    <ClCompile Include="..\css\CSSImageGeneratorValue.cpp">
    90509022      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    1804518017    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceLoadEvent.h" />
    1804618018    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSFontFaceRule.h" />
    18047     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSHostRule.h" />
    1804818019    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSImportRule.h" />
    1804918020    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSMediaRule.h" />
    … …  
    1968419655    <ClInclude Include="..\css\CSSGroupingRule.h" />
    1968519656    <ClInclude Include="..\css\CSSHelper.h" />
    19686     <ClInclude Include="..\css\CSSHostRule.h" />
    1968719657    <ClInclude Include="..\css\CSSImageGeneratorValue.h" />
    1968819658    <ClInclude Include="..\css\CSSImageValue.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r163289 r163359  
    21342134      <Filter>css</Filter>
    21352135    </ClCompile>
    2136     <ClCompile Include="..\css\CSSHostRule.cpp">
    2137       <Filter>css</Filter>
    2138     </ClCompile>
    21392136    <ClCompile Include="..\css\CSSImageGeneratorValue.cpp">
    21402137      <Filter>css</Filter>
    … …  
    52715268    </ClCompile>
    52725269    <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">
    52765270      <Filter>DerivedSources</Filter>
    52775271    </ClCompile>
    … …  
    89528946      <Filter>css</Filter>
    89538947    </ClInclude>
    8954     <ClInclude Include="..\css\CSSHostRule.h">
    8955       <Filter>css</Filter>
    8956     </ClInclude>
    89578948    <ClInclude Include="..\css\CSSImageGeneratorValue.h">
    89588949      <Filter>css</Filter>
    … …  
    1302913020    </ClInclude>
    1303013021    <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">
    1303413022      <Filter>DerivedSources</Filter>
    1303513023    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r163346 r163359  
    61556155                FB484F4C171F821E00040755 /* TransformFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FB484F4A171F821E00040755 /* TransformFunctions.cpp */; };
    61566156                FB484F4D171F821E00040755 /* TransformFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = FB484F4B171F821E00040755 /* TransformFunctions.h */; };
    6157                 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */ = {isa = PBXBuildFile; fileRef = FB49C39C16784947007FFB5D /* CSSHostRule.h */; };
    61586157                FB78AD2E151BF5E600FE54D3 /* CSSParserMode.h in Headers */ = {isa = PBXBuildFile; fileRef = FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    61596158                FB91392416AE4C17001FE682 /* DOMPath.h in Headers */ = {isa = PBXBuildFile; fileRef = FB91392016AE4B0B001FE682 /* DOMPath.h */; };
    … …  
    1349413493                FB484F4A171F821E00040755 /* TransformFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformFunctions.cpp; sourceTree = "<group>"; };
    1349513494                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>"; };
    1349813495                FB78AD2C151BF5D200FE54D3 /* CSSParserMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSParserMode.h; sourceTree = "<group>"; };
    1349913496                FB91391E16AE4B0B001FE682 /* CanvasPathMethods.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CanvasPathMethods.cpp; path = canvas/CanvasPathMethods.cpp; sourceTree = "<group>"; };
    … …  
    2136421361                                FB3056C1169E5DAC0096A232 /* CSSGroupingRule.h */,
    2136521362                                BC772B360C4EA91E0083285F /* CSSHelper.h */,
    21366                                 FB49C39C16784947007FFB5D /* CSSHostRule.h */,
    21367                                 FB49C39E16784954007FFB5D /* CSSHostRule.idl */,
    2136821363                                BC23E76B0DAE88A9009FDC91 /* CSSImageGeneratorValue.cpp */,
    2136921364                                BC23EE910DAED2BC009FDC91 /* CSSImageGeneratorValue.h */,
    … …  
    2295022945                                FB3056C2169E5DAC0096A232 /* CSSGroupingRule.h in Headers */,
    2295122946                                BC772B3C0C4EA91E0083285F /* CSSHelper.h in Headers */,
    22952                                 FB49C39D16784947007FFB5D /* CSSHostRule.h in Headers */,
    2295322947                                E1F80B8E183172B5007885C3 /* JSCryptoKeyPair.h in Headers */,
    2295422948                                BC23EE920DAED2BC009FDC91 /* CSSImageGeneratorValue.h in Headers */,

  • trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp

    r162644 r163359  
    3636#include "JSCSSCharsetRule.h"
    3737#include "JSCSSFontFaceRule.h"
    38 #include "JSCSSHostRule.h"
    3938#include "JSCSSImportRule.h"
    4039#include "JSCSSMediaRule.h"
    … …  
    116115            break;
    117116#endif
    118 #if ENABLE(SHADOW_DOM)
    119         case CSSRule::HOST_RULE:
    120             wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSHostRule, rule);
    121             break;
    122 #endif
    123117        default:
    124118            wrapper = CREATE_DOM_WRAPPER(exec, globalObject, CSSRule, rule);

  • trunk/Source/WebCore/bindings/objc/DOMCSS.mm

    r162644 r163359  
    6363#if ENABLE(CSS_DEVICE_ADAPTATION)
    6464#import "DOMWebKitCSSViewportRule.h"
    65 #endif
    66 
    67 #if ENABLE(SHADOW_DOM)
    68 #import "DOMCSSHostRule.h"
    6965#endif
    7066
    … …  
    115111            return [DOMWebKitCSSRegionRule class];
    116112#endif
    117 #if ENABLE(SHADOW_DOM)
    118         case DOM_HOST_RULE:
    119             return [DOMCSSHostRule class];
    120 #endif
    121113    }
    122114    ASSERT_NOT_REACHED();

  • trunk/Source/WebCore/css/CSSAllInOne.cpp

    r163263 r163359  
    4545#include "CSSGradientValue.cpp"
    4646#include "CSSGroupingRule.cpp"
    47 #include "CSSHostRule.cpp"
    4847#include "CSSImageGeneratorValue.cpp"
    4948#include "CSSImageSetValue.cpp"

  • trunk/Source/WebCore/css/CSSGrammar.y.in

    r162644 r163359  
    7171%}
    7272
    73 #if ENABLE_SHADOW_DOM
    74 %expect 30
    75 #else
    7673%expect 29
    77 #endif
    7874
    7975%nonassoc LOWEST_PREC
    … …  
    292288#endif
    293289
    294 #if ENABLE_SHADOW_DOM
    295 
    296 %token HOST_SYM
    297 
    298 %type <rule> host
    299 %destructor { if ($$) $$->deref(); } host
    300 
    301 #endif
    302 
    303290#if ENABLE_VIDEO_TRACK
    304291
    … …  
    406393#if ENABLE_CSS3_CONDITIONAL_RULES
    407394  | supports
    408 #endif
    409 #if ENABLE_SHADOW_DOM
    410   | host
    411395#endif
    412396#if ENABLE_CSS_DEVICE_ADAPTATION
    … …  
    883867    }
    884868;
    885 
    886 #if ENABLE_SHADOW_DOM
    887 
    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 #endif
    905869
    906870#if ENABLE_CSS_DEVICE_ADAPTATION

  • trunk/Source/WebCore/css/CSSParser.cpp

    r163344 r163359  
    1069010690    } else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc"))
    1069110691        m_token = CALCFUNCTION;
    10692 #if ENABLE(SHADOW_DOM)
    10693     else if (length == 19 && isEqualToCSSIdentifier(name + 1, "webkit-distributed"))
    10694         m_token = DISTRIBUTEDFUNCTION;
    10695 #endif
    1069610692}
    1069710693
    … …  
    1074610742            m_token = FONT_FACE_SYM;
    1074710743        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 #endif
    1075510744
    1075610745    case 'i':
    … …  
    1155311542}
    1155411543
    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 #endif
    11570 
    1157111544void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri)
    1157211545{

  • trunk/Source/WebCore/css/CSSParser.h

    r163013 r163359  
    311311    PassRefPtr<CSSRuleSourceData> popSupportsRuleData();
    312312#endif
    313 #if ENABLE(SHADOW_DOM)
    314     PassRefPtr<StyleRuleBase> createHostRule(RuleList*);
    315 #endif
    316313
    317314    void startDeclarationsForMarginBox();

  • trunk/Source/WebCore/css/CSSRule.h

    r162644 r163359  
    6060        WEBKIT_REGION_RULE = 16,
    6161#endif
    62 #if ENABLE(SHADOW_DOM)
    63         HOST_RULE = 1001,
    64 #endif
    6562    };
    6663

  • trunk/Source/WebCore/css/CSSRule.idl

    r162644 r163359  
    4747    const unsigned short WEBKIT_REGION_RULE = 16;
    4848#endif
    49 #if defined(ENABLE_SHADOW_DOM) && ENABLE_SHADOW_DOM
    50     const unsigned short HOST_RULE = 1001;
    51 #endif
    5249
    5350    readonly attribute unsigned short   type;

  • trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp

    r163073 r163359  
    3131
    3232#include "CSSDefaultStyleSheets.h"
    33 #include "CSSHostRule.h"
    3433#include "CSSImportRule.h"
    3534#include "CSSMediaRule.h"
    … …  
    7372        case CSSRule::WEBKIT_REGION_RULE:
    7473            collect(static_cast<WebKitCSSRegionRule*>(cssRule));
    75             break;
    76 #endif
    77 #if ENABLE(SHADOW_DOM)
    78         case CSSRule::HOST_RULE:
    79             collect(static_cast<CSSHostRule*>(cssRule));
    8074            break;
    8175#endif

  • trunk/Source/WebCore/css/StyleResolver.h

    r163263 r163359  
    8282class StyleProperties;
    8383class StyleRule;
    84 #if ENABLE(SHADOW_DOM)
    85 class StyleRuleHost;
    86 #endif
    8784class StyleRuleKeyframes;
    8885class StyleRulePage;

  • trunk/Source/WebCore/css/StyleRule.cpp

    r162644 r163359  
    2525#include "CSSCharsetRule.h"
    2626#include "CSSFontFaceRule.h"
    27 #include "CSSHostRule.h"
    2827#include "CSSImportRule.h"
    2928#include "CSSMediaRule.h"
    … …  
    8887        delete static_cast<StyleRuleKeyframes*>(this);
    8988        return;
    90 #if ENABLE(SHADOW_DOM)
    91     case HostInternal:
    92         delete static_cast<StyleRuleHost*>(this);
    93         return;
    94 #endif
    9589#if ENABLE(CSS_DEVICE_ADAPTATION)
    9690    case Viewport:
    … …  
    131125    case Keyframes:
    132126        return static_cast<const StyleRuleKeyframes*>(this)->copy();
    133 #if ENABLE(SHADOW_DOM)
    134     case HostInternal:
    135         return static_cast<const StyleRuleHost*>(this)->copy();
    136 #endif
    137127#if ENABLE(CSS_DEVICE_ADAPTATION)
    138128    case Viewport:
    … …  
    191181    case Viewport:
    192182        rule = WebKitCSSViewportRule::create(static_cast<StyleRuleViewport*>(self), parentSheet);
    193         break;
    194 #endif
    195 #if ENABLE(SHADOW_DOM)
    196     case HostInternal:
    197         rule = CSSHostRule::create(static_cast<StyleRuleHost*>(self), parentSheet);
    198183        break;
    199184#endif

  • trunk/Source/WebCore/css/StyleRule.h

    r162644 r163359  
    5656#endif
    5757        Region = 16,
    58 #if ENABLE(SHADOW_DOM)
    59         HostInternal = 18, // Spec says Host = 1001, but we can use only 5 bit for type().
    60 #endif
    6158    };
    6259
    … …  
    7774#endif
    7875    bool isImportRule() const { return type() == Import; }
    79 #if ENABLE(SHADOW_DOM)
    80     bool isHostRule() const { return type() == HostInternal; }
    81 #endif
    8276
    8377    PassRef<StyleRuleBase> copy() const;
    … …  
    263257    CSSSelectorList m_selectorList;
    264258};
    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 #endif
    281259
    282260#if ENABLE(CSS_DEVICE_ADAPTATION)

  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r162907 r163359  
    449449                return true;
    450450            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 #endif
    457451        case StyleRuleBase::Import:
    458452            ASSERT_NOT_REACHED();

  • trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

    r162784 r163359  
    2929#include "InspectorStyleSheet.h"
    3030
    31 #include "CSSHostRule.h"
    3231#include "CSSImportRule.h"
    3332#include "CSSMediaRule.h"
    … …  
    110109        else if (data->type == CSSRuleSourceData::MEDIA_RULE)
    111110            flattenSourceData(&data->childRules, target);
    112 #if ENABLE(SHADOW_DOM)
    113         else if (data->type == CSSRuleSourceData::HOST_RULE)
    114             flattenSourceData(&data->childRules, target);
    115 #endif
    116111#if ENABLE(CSS3_CONDITIONAL_RULES)
    117112        else if (data->type == CSSRuleSourceData::SUPPORTS_RULE)
    … …  
    226221    if (rule->type() == CSSRule::WEBKIT_KEYFRAMES_RULE)
    227222        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 #endif
    233223
    234224#if ENABLE(CSS3_CONDITIONAL_RULES)
Note: See TracChangeset for help on using the changeset viewer.