Changeset 206917 in webkit


Ignore:
Timestamp:
Oct 7, 2016 9:55:11 AM (8 years ago)
Author:
Antti Koivisto
Message:

Rename AuthorStyleSheets to Style::Scope
​https://bugs.webkit.org/show_bug.cgi?id=163108

Reviewed by Andreas Kling.

It represents the style scope in DOM.
Also move the file under style/.

  • CMakeLists.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::styleSheetScope):

  • css/CSSStyleSheet.h:
  • css/InspectorCSSOMWrappers.cpp:

(WebCore::InspectorCSSOMWrappers::getWrapperForRuleInSheets):

  • css/InspectorCSSOMWrappers.h:
  • css/StyleSheetList.cpp:

(WebCore::StyleSheetList::styleSheets):
(WebCore::StyleSheetList::detachFromDocument):

  • dom/AuthorStyleSheets.cpp: Removed.
  • dom/AuthorStyleSheets.h: Removed.
  • dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::setContentLanguage):
(WebCore::Document::recalcStyle):
(WebCore::Document::needsStyleRecalc):
(WebCore::Document::updateStyleIfNeeded):
(WebCore::Document::updateLayoutIgnorePendingStylesheets):
(WebCore::Document::createStyleResolver):
(WebCore::Document::didRemoveAllPendingStylesheet):
(WebCore::Document::usesStyleBasedEditability):
(WebCore::Document::processHttpEquiv):
(WebCore::Document::preferredStylesheetSet):
(WebCore::Document::selectedStylesheetSet):
(WebCore::Document::setSelectedStylesheetSet):
(WebCore::Document::haveStylesheetsLoaded):

  • dom/Document.h:

(WebCore::Document::styleScope):
(WebCore::Document::authorStyleSheets): Deleted.

  • dom/ExtensionStyleSheets.cpp:

(WebCore::ExtensionStyleSheets::clearPageUserSheet):
(WebCore::ExtensionStyleSheets::updatePageUserSheet):
(WebCore::ExtensionStyleSheets::invalidateInjectedStyleSheetCache):
(WebCore::ExtensionStyleSheets::addUserStyleSheet):
(WebCore::ExtensionStyleSheets::addAuthorStyleSheetForTesting):
(WebCore::ExtensionStyleSheets::styleResolverChangedTimerFired):

  • dom/InlineStyleSheetOwner.cpp:

(WebCore::InlineStyleSheetOwner::insertedIntoDocument):
(WebCore::InlineStyleSheetOwner::removedFromDocument):
(WebCore::InlineStyleSheetOwner::clearDocumentData):
(WebCore::InlineStyleSheetOwner::createSheet):
(WebCore::InlineStyleSheetOwner::sheetLoaded):
(WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):

  • dom/InlineStyleSheetOwner.h:

(WebCore::InlineStyleSheetOwner::styleScope):
(WebCore::InlineStyleSheetOwner::styleSheetScope): Deleted.

  • dom/ProcessingInstruction.cpp:

(WebCore::ProcessingInstruction::~ProcessingInstruction):
(WebCore::ProcessingInstruction::checkStyleSheet):
(WebCore::ProcessingInstruction::sheetLoaded):
(WebCore::ProcessingInstruction::insertedInto):
(WebCore::ProcessingInstruction::removedFrom):

  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::styleResolver):
(WebCore::ShadowRoot::styleScope):
(WebCore::ShadowRoot::updateStyle):
(WebCore::ShadowRoot::authorStyleSheets): Deleted.

  • dom/ShadowRoot.h:
  • html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::setDisabledState):
(WebCore::HTMLLinkElement::parseAttribute):
(WebCore::HTMLLinkElement::process):
(WebCore::HTMLLinkElement::insertedInto):
(WebCore::HTMLLinkElement::removedFrom):
(WebCore::HTMLLinkElement::addPendingSheet):
(WebCore::HTMLLinkElement::removePendingSheet):

  • html/HTMLStyleElement.cpp:
  • inspector/InspectorCSSAgent.cpp:

(WebCore::InspectorCSSAgent::collectAllDocumentStyleSheets):
(WebCore::InspectorCSSAgent::forcePseudoState):
(WebCore::InspectorCSSAgent::buildObjectForRule):
(WebCore::InspectorCSSAgent::resetPseudoStates):

  • inspector/InspectorPageAgent.cpp:

(WebCore::InspectorPageAgent::setEmulatedMedia):

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::getMatchedCSSRules):

  • page/Frame.cpp:

(WebCore::Frame::setPrinting):

  • page/FrameView.cpp:

(WebCore::FrameView::layout):
(WebCore::FrameView::setPagination):
(WebCore::FrameView::setViewportSizeForCSSViewportUnits):

  • page/Page.cpp:

(WebCore::Page::setViewMode):
(WebCore::Page::setNeedsRecalcStyleInAllFrames):
(WebCore::Page::invalidateInjectedStyleSheetCacheInAllFrames):

  • style/StyleScope.cpp: Copied from dom/AuthorStyleSheets.cpp.

(WebCore::Style::Scope::Scope):
(WebCore::Style::Scope::styleResolver):
(WebCore::Style::Scope::styleResolverIfExists):
(WebCore::Style::Scope::forNode):
(WebCore::Style::Scope::removePendingSheet):
(WebCore::Style::Scope::addStyleSheetCandidateNode):
(WebCore::Style::Scope::removeStyleSheetCandidateNode):
(WebCore::Style::Scope::collectActiveStyleSheets):
(WebCore::Style::Scope::analyzeStyleSheetChange):
(WebCore::Style::Scope::updateActiveStyleSheets):
(WebCore::Style::Scope::updateStyleResolver):
(WebCore::Style::Scope::activeStyleSheetsForInspector):
(WebCore::Style::Scope::activeStyleSheetsContains):
(WebCore::Style::Scope::flushPendingUpdate):
(WebCore::Style::Scope::clearPendingUpdate):
(WebCore::Style::Scope::scheduleActiveSetUpdate):
(WebCore::Style::Scope::didChangeCandidatesForActiveSet):
(WebCore::Style::Scope::didChangeContentsOrInterpretation):
(WebCore::Style::Scope::pendingUpdateTimerFired):
(WebCore::AuthorStyleSheets::AuthorStyleSheets): Deleted.
(WebCore::AuthorStyleSheets::styleResolver): Deleted.
(WebCore::AuthorStyleSheets::styleResolverIfExists): Deleted.
(WebCore::AuthorStyleSheets::forNode): Deleted.
(WebCore::AuthorStyleSheets::removePendingSheet): Deleted.
(WebCore::AuthorStyleSheets::addStyleSheetCandidateNode): Deleted.
(WebCore::AuthorStyleSheets::removeStyleSheetCandidateNode): Deleted.
(WebCore::AuthorStyleSheets::collectActiveStyleSheets): Deleted.
(WebCore::AuthorStyleSheets::analyzeStyleSheetChange): Deleted.
(WebCore::AuthorStyleSheets::updateActiveStyleSheets): Deleted.
(WebCore::AuthorStyleSheets::updateStyleResolver): Deleted.
(WebCore::AuthorStyleSheets::activeStyleSheetsForInspector): Deleted.
(WebCore::AuthorStyleSheets::activeStyleSheetsContains): Deleted.
(WebCore::AuthorStyleSheets::flushPendingUpdate): Deleted.
(WebCore::AuthorStyleSheets::clearPendingUpdate): Deleted.
(WebCore::AuthorStyleSheets::scheduleActiveSetUpdate): Deleted.
(WebCore::AuthorStyleSheets::didChangeCandidatesForActiveSet): Deleted.
(WebCore::AuthorStyleSheets::didChangeContentsOrInterpretation): Deleted.
(WebCore::AuthorStyleSheets::pendingUpdateTimerFired): Deleted.

  • style/StyleScope.h: Copied from dom/AuthorStyleSheets.h.
  • style/StyleTreeResolver.cpp:
  • svg/SVGFontFaceElement.cpp:

(WebCore::SVGFontFaceElement::rebuildFontFace):
(WebCore::SVGFontFaceElement::removedFrom):

  • xml/XMLTreeViewer.cpp:

(WebCore::XMLTreeViewer::transformDocumentToTreeView):

  • xml/parser/XMLDocumentParser.cpp:

(WebCore::XMLDocumentParser::end):

  • xml/parser/XMLDocumentParserLibxml2.cpp:

(WebCore::XMLDocumentParser::doEnd):

Location:
trunk/Source
Files:
30 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r206904 r206917  
    13851385    dom/AnimationEvent.cpp
    13861386    dom/Attr.cpp
    1387     dom/AuthorStyleSheets.cpp
    13881387    dom/BeforeTextInsertedEvent.cpp
    13891388    dom/BeforeUnloadEvent.cpp
    … …  
    26512650    style/StyleRelations.cpp
    26522651    style/StyleResolveForDocument.cpp
     2652    style/StyleScope.cpp
    26532653    style/StyleSharingResolver.cpp
    26542654    style/StyleTreeResolver.cpp

  • trunk/Source/WebCore/ChangeLog

    r206916 r206917  
     12016-10-07  Antti Koivisto  <antti@apple.com>
     2
     3        Rename AuthorStyleSheets to Style::Scope
     4        https://bugs.webkit.org/show_bug.cgi?id=163108
     5
     6        Reviewed by Andreas Kling.
     7
     8        It represents the style scope in DOM.
     9        Also move the file under style/.
     10
     11        * CMakeLists.txt:
     12        * WebCore.xcodeproj/project.pbxproj:
     13        * css/CSSStyleSheet.cpp:
     14        (WebCore::CSSStyleSheet::styleSheetScope):
     15        * css/CSSStyleSheet.h:
     16        * css/InspectorCSSOMWrappers.cpp:
     17        (WebCore::InspectorCSSOMWrappers::getWrapperForRuleInSheets):
     18        * css/InspectorCSSOMWrappers.h:
     19        * css/StyleSheetList.cpp:
     20        (WebCore::StyleSheetList::styleSheets):
     21        (WebCore::StyleSheetList::detachFromDocument):
     22        * dom/AuthorStyleSheets.cpp: Removed.
     23        * dom/AuthorStyleSheets.h: Removed.
     24        * dom/Document.cpp:
     25        (WebCore::Document::Document):
     26        (WebCore::Document::setContentLanguage):
     27        (WebCore::Document::recalcStyle):
     28        (WebCore::Document::needsStyleRecalc):
     29        (WebCore::Document::updateStyleIfNeeded):
     30        (WebCore::Document::updateLayoutIgnorePendingStylesheets):
     31        (WebCore::Document::createStyleResolver):
     32        (WebCore::Document::didRemoveAllPendingStylesheet):
     33        (WebCore::Document::usesStyleBasedEditability):
     34        (WebCore::Document::processHttpEquiv):
     35        (WebCore::Document::preferredStylesheetSet):
     36        (WebCore::Document::selectedStylesheetSet):
     37        (WebCore::Document::setSelectedStylesheetSet):
     38        (WebCore::Document::haveStylesheetsLoaded):
     39        * dom/Document.h:
     40        (WebCore::Document::styleScope):
     41        (WebCore::Document::authorStyleSheets): Deleted.
     42        * dom/ExtensionStyleSheets.cpp:
     43        (WebCore::ExtensionStyleSheets::clearPageUserSheet):
     44        (WebCore::ExtensionStyleSheets::updatePageUserSheet):
     45        (WebCore::ExtensionStyleSheets::invalidateInjectedStyleSheetCache):
     46        (WebCore::ExtensionStyleSheets::addUserStyleSheet):
     47        (WebCore::ExtensionStyleSheets::addAuthorStyleSheetForTesting):
     48        (WebCore::ExtensionStyleSheets::styleResolverChangedTimerFired):
     49        * dom/InlineStyleSheetOwner.cpp:
     50        (WebCore::InlineStyleSheetOwner::insertedIntoDocument):
     51        (WebCore::InlineStyleSheetOwner::removedFromDocument):
     52        (WebCore::InlineStyleSheetOwner::clearDocumentData):
     53        (WebCore::InlineStyleSheetOwner::createSheet):
     54        (WebCore::InlineStyleSheetOwner::sheetLoaded):
     55        (WebCore::InlineStyleSheetOwner::startLoadingDynamicSheet):
     56        * dom/InlineStyleSheetOwner.h:
     57        (WebCore::InlineStyleSheetOwner::styleScope):
     58        (WebCore::InlineStyleSheetOwner::styleSheetScope): Deleted.
     59        * dom/ProcessingInstruction.cpp:
     60        (WebCore::ProcessingInstruction::~ProcessingInstruction):
     61        (WebCore::ProcessingInstruction::checkStyleSheet):
     62        (WebCore::ProcessingInstruction::sheetLoaded):
     63        (WebCore::ProcessingInstruction::insertedInto):
     64        (WebCore::ProcessingInstruction::removedFrom):
     65        * dom/ShadowRoot.cpp:
     66        (WebCore::ShadowRoot::styleResolver):
     67        (WebCore::ShadowRoot::styleScope):
     68        (WebCore::ShadowRoot::updateStyle):
     69        (WebCore::ShadowRoot::authorStyleSheets): Deleted.
     70        * dom/ShadowRoot.h:
     71        * html/HTMLLinkElement.cpp:
     72        (WebCore::HTMLLinkElement::~HTMLLinkElement):
     73        (WebCore::HTMLLinkElement::setDisabledState):
     74        (WebCore::HTMLLinkElement::parseAttribute):
     75        (WebCore::HTMLLinkElement::process):
     76        (WebCore::HTMLLinkElement::insertedInto):
     77        (WebCore::HTMLLinkElement::removedFrom):
     78        (WebCore::HTMLLinkElement::addPendingSheet):
     79        (WebCore::HTMLLinkElement::removePendingSheet):
     80        * html/HTMLStyleElement.cpp:
     81        * inspector/InspectorCSSAgent.cpp:
     82        (WebCore::InspectorCSSAgent::collectAllDocumentStyleSheets):
     83        (WebCore::InspectorCSSAgent::forcePseudoState):
     84        (WebCore::InspectorCSSAgent::buildObjectForRule):
     85        (WebCore::InspectorCSSAgent::resetPseudoStates):
     86        * inspector/InspectorPageAgent.cpp:
     87        (WebCore::InspectorPageAgent::setEmulatedMedia):
     88        * page/DOMWindow.cpp:
     89        (WebCore::DOMWindow::getMatchedCSSRules):
     90        * page/Frame.cpp:
     91        (WebCore::Frame::setPrinting):
     92        * page/FrameView.cpp:
     93        (WebCore::FrameView::layout):
     94        (WebCore::FrameView::setPagination):
     95        (WebCore::FrameView::setViewportSizeForCSSViewportUnits):
     96        * page/Page.cpp:
     97        (WebCore::Page::setViewMode):
     98        (WebCore::Page::setNeedsRecalcStyleInAllFrames):
     99        (WebCore::Page::invalidateInjectedStyleSheetCacheInAllFrames):
     100        * style/StyleScope.cpp: Copied from dom/AuthorStyleSheets.cpp.
     101        (WebCore::Style::Scope::Scope):
     102        (WebCore::Style::Scope::styleResolver):
     103        (WebCore::Style::Scope::styleResolverIfExists):
     104        (WebCore::Style::Scope::forNode):
     105        (WebCore::Style::Scope::removePendingSheet):
     106        (WebCore::Style::Scope::addStyleSheetCandidateNode):
     107        (WebCore::Style::Scope::removeStyleSheetCandidateNode):
     108        (WebCore::Style::Scope::collectActiveStyleSheets):
     109        (WebCore::Style::Scope::analyzeStyleSheetChange):
     110        (WebCore::Style::Scope::updateActiveStyleSheets):
     111        (WebCore::Style::Scope::updateStyleResolver):
     112        (WebCore::Style::Scope::activeStyleSheetsForInspector):
     113        (WebCore::Style::Scope::activeStyleSheetsContains):
     114        (WebCore::Style::Scope::flushPendingUpdate):
     115        (WebCore::Style::Scope::clearPendingUpdate):
     116        (WebCore::Style::Scope::scheduleActiveSetUpdate):
     117        (WebCore::Style::Scope::didChangeCandidatesForActiveSet):
     118        (WebCore::Style::Scope::didChangeContentsOrInterpretation):
     119        (WebCore::Style::Scope::pendingUpdateTimerFired):
     120        (WebCore::AuthorStyleSheets::AuthorStyleSheets): Deleted.
     121        (WebCore::AuthorStyleSheets::styleResolver): Deleted.
     122        (WebCore::AuthorStyleSheets::styleResolverIfExists): Deleted.
     123        (WebCore::AuthorStyleSheets::forNode): Deleted.
     124        (WebCore::AuthorStyleSheets::removePendingSheet): Deleted.
     125        (WebCore::AuthorStyleSheets::addStyleSheetCandidateNode): Deleted.
     126        (WebCore::AuthorStyleSheets::removeStyleSheetCandidateNode): Deleted.
     127        (WebCore::AuthorStyleSheets::collectActiveStyleSheets): Deleted.
     128        (WebCore::AuthorStyleSheets::analyzeStyleSheetChange): Deleted.
     129        (WebCore::AuthorStyleSheets::updateActiveStyleSheets): Deleted.
     130        (WebCore::AuthorStyleSheets::updateStyleResolver): Deleted.
     131        (WebCore::AuthorStyleSheets::activeStyleSheetsForInspector): Deleted.
     132        (WebCore::AuthorStyleSheets::activeStyleSheetsContains): Deleted.
     133        (WebCore::AuthorStyleSheets::flushPendingUpdate): Deleted.
     134        (WebCore::AuthorStyleSheets::clearPendingUpdate): Deleted.
     135        (WebCore::AuthorStyleSheets::scheduleActiveSetUpdate): Deleted.
     136        (WebCore::AuthorStyleSheets::didChangeCandidatesForActiveSet): Deleted.
     137        (WebCore::AuthorStyleSheets::didChangeContentsOrInterpretation): Deleted.
     138        (WebCore::AuthorStyleSheets::pendingUpdateTimerFired): Deleted.
     139        * style/StyleScope.h: Copied from dom/AuthorStyleSheets.h.
     140        * style/StyleTreeResolver.cpp:
     141        * svg/SVGFontFaceElement.cpp:
     142        (WebCore::SVGFontFaceElement::rebuildFontFace):
     143        (WebCore::SVGFontFaceElement::removedFrom):
     144        * xml/XMLTreeViewer.cpp:
     145        (WebCore::XMLTreeViewer::transformDocumentToTreeView):
     146        * xml/parser/XMLDocumentParser.cpp:
     147        (WebCore::XMLDocumentParser::end):
     148        * xml/parser/XMLDocumentParserLibxml2.cpp:
     149        (WebCore::XMLDocumentParser::doEnd):
     150
    11512016-10-07  Zalan Bujtas  <zalan@apple.com>
    2152

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

    r206901 r206917  
    62136213                E461802D1C8DD2900026C02C /* StyleRelations.h in Headers */ = {isa = PBXBuildFile; fileRef = E461802C1C8DD2900026C02C /* StyleRelations.h */; };
    62146214                E461802F1C8DD4D20026C02C /* StyleRelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E461802E1C8DD4D20026C02C /* StyleRelations.cpp */; };
    6215                 E461D65D1BB0C7F000CB5645 /* AuthorStyleSheets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */; };
    6216                 E461D65F1BB0C80D00CB5645 /* AuthorStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */; settings = {ATTRIBUTES = (Private, ); }; };
     6215                E461D65D1BB0C7F000CB5645 /* StyleScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E461D65C1BB0C7F000CB5645 /* StyleScope.cpp */; };
     6216                E461D65F1BB0C80D00CB5645 /* StyleScope.h in Headers */ = {isa = PBXBuildFile; fileRef = E461D65E1BB0C80D00CB5645 /* StyleScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
    62176217                E462A4A1113E71BE004A4220 /* IntPointHash.h in Headers */ = {isa = PBXBuildFile; fileRef = E462A4A0113E71BE004A4220 /* IntPointHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
    62186218                E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E46A2B1B17CA65B9000DBCD8 /* TypedElementDescendantIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1382913829                E461802C1C8DD2900026C02C /* StyleRelations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleRelations.h; sourceTree = "<group>"; };
    1383013830                E461802E1C8DD4D20026C02C /* StyleRelations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleRelations.cpp; sourceTree = "<group>"; };
    13831                 E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuthorStyleSheets.cpp; sourceTree = "<group>"; };
    13832                 E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthorStyleSheets.h; sourceTree = "<group>"; };
     13831                E461D65C1BB0C7F000CB5645 /* StyleScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleScope.cpp; sourceTree = "<group>"; };
     13832                E461D65E1BB0C80D00CB5645 /* StyleScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleScope.h; sourceTree = "<group>"; };
    1383313833                E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
    1383413834                E46A2B1B17CA65B9000DBCD8 /* TypedElementDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypedElementDescendantIterator.h; sourceTree = "<group>"; };
    … …  
    2232722327                                E4D58EB217B4DBDC00CBDCA8 /* StyleResolveForDocument.cpp */,
    2232822328                                E4D58EB317B4DBDC00CBDCA8 /* StyleResolveForDocument.h */,
     22329                                E461D65C1BB0C7F000CB5645 /* StyleScope.cpp */,
     22330                                E461D65E1BB0C80D00CB5645 /* StyleScope.h */,
    2232922331                                E47A3AC21C5EABBE00CCBFA7 /* StyleSharingResolver.cpp */,
    2233022332                                E47A3AC41C5EAC7900CCBFA7 /* StyleSharingResolver.h */,
    … …  
    2296322965                                93EEC1E509C2877700C515D1 /* Attr.idl */,
    2296422966                                A8C4A7F909D563270003AC8D /* Attribute.h */,
    22965                                 E461D65C1BB0C7F000CB5645 /* AuthorStyleSheets.cpp */,
    22966                                 E461D65E1BB0C80D00CB5645 /* AuthorStyleSheets.h */,
    2296722967                                760847CD19A6A27700428CCC /* AutocompleteErrorEvent.h */,
    2296822968                                760847CF19A6A28600428CCC /* AutocompleteErrorEvent.idl */,
    … …  
    2392623926                                E124748410AA161D00B79493 /* AuthenticationClient.h in Headers */,
    2392723927                                514C764C0CE9234E007EF3CD /* AuthenticationMac.h in Headers */,
    23928                                 E461D65F1BB0C80D00CB5645 /* AuthorStyleSheets.h in Headers */,
     23928                                E461D65F1BB0C80D00CB5645 /* StyleScope.h in Headers */,
    2392923929                                A501920E132EBF2E008BFE55 /* Autocapitalize.h in Headers */,
    2393023930                                760847CE19A6A27800428CCC /* AutocompleteErrorEvent.h in Headers */,
    … …  
    2769127691                                934F71380D5A6EFF00018D69 /* AuthenticationChallengeBase.cpp in Sources */,
    2769227692                                514C764D0CE9234E007EF3CD /* AuthenticationMac.mm in Sources */,
    27693                                 E461D65D1BB0C7F000CB5645 /* AuthorStyleSheets.cpp in Sources */,
     27693                                E461D65D1BB0C7F000CB5645 /* StyleScope.cpp in Sources */,
    2769427694                                A5F6E16B132ED46E008EDAE3 /* Autocapitalize.cpp in Sources */,
    2769527695                                5597F8261D91C3130066BC21 /* ImageFrameCache.cpp in Sources */,

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

    r206880 r206917  
    2222#include "CSSStyleSheet.h"
    2323
    24 #include "AuthorStyleSheets.h"
    2524#include "CSSCharsetRule.h"
    2625#include "CSSFontFaceRule.h"
    … …  
    4544#include "StyleResolver.h"
    4645#include "StyleRule.h"
     46#include "StyleScope.h"
    4747#include "StyleSheetContents.h"
     48
    4849#include <wtf/text/StringBuilder.h>
    4950
    … …  
    171172    ASSERT(m_contents->hasOneClient());
    172173
    173     auto* scope = styleSheetScope();
     174    auto* scope = styleScope();
    174175    if (!scope)
    175176        return;
    … …  
    192193void CSSStyleSheet::didMutate()
    193194{
    194     auto* scope = styleSheetScope();
     195    auto* scope = styleScope();
    195196    if (!scope)
    196197        return;
    … …  
    416417}
    417418
    418 AuthorStyleSheets* CSSStyleSheet::styleSheetScope()
     419Style::Scope* CSSStyleSheet::styleScope()
    419420{
    420421    auto* ownerNode = rootStyleSheet().ownerNode();
    421422    if (!ownerNode)
    422423        return nullptr;
    423     return &AuthorStyleSheets::forNode(*ownerNode);
     424    return &Style::Scope::forNode(*ownerNode);
    424425}
    425426

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

    r206880 r206917  
    3232namespace WebCore {
    3333
    34 class AuthorStyleSheets;
    3534class CSSCharsetRule;
    3635class CSSImportRule;
    … …  
    4544class StyleRuleKeyframes;
    4645class StyleSheetContents;
     46
     47namespace Style {
     48class Scope;
     49}
    4750
    4851typedef int ExceptionCode;
    … …  
    8891    CSSStyleSheet& rootStyleSheet();
    8992    const CSSStyleSheet& rootStyleSheet() const;
    90     AuthorStyleSheets* styleSheetScope();
     93    Style::Scope* styleScope();
    9194
    9295    MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }

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

    r190169 r206917  
    3030#include "InspectorCSSOMWrappers.h"
    3131
    32 #include "AuthorStyleSheets.h"
    3332#include "CSSDefaultStyleSheets.h"
    3433#include "CSSImportRule.h"
    … …  
    3938#include "CSSSupportsRule.h"
    4039#include "ExtensionStyleSheets.h"
     40#include "StyleScope.h"
    4141#include "StyleSheetContents.h"
    4242#include "WebKitCSSRegionRule.h"
    … …  
    9797}
    9898
    99 CSSStyleRule* InspectorCSSOMWrappers::getWrapperForRuleInSheets(StyleRule* rule, AuthorStyleSheets& authorStyleSheets, ExtensionStyleSheets& extensionStyleSheets)
     99CSSStyleRule* InspectorCSSOMWrappers::getWrapperForRuleInSheets(StyleRule* rule, Style::Scope& styleScope, ExtensionStyleSheets& extensionStyleSheets)
    100100{
    101101    if (m_styleRuleToCSSOMWrapperMap.isEmpty()) {
    … …  
    109109        collectFromStyleSheetContents(m_styleSheetCSSOMWrapperSet, CSSDefaultStyleSheets::plugInsStyleSheet);
    110110
    111         collectFromStyleSheets(authorStyleSheets.activeStyleSheets());
     111        collectFromStyleSheets(styleScope.activeStyleSheets());
    112112        collect(extensionStyleSheets.pageUserSheet());
    113113        collectFromStyleSheets(extensionStyleSheets.injectedUserStyleSheets());

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

    r190169 r206917  
    3232namespace WebCore {
    3333
    34 class AuthorStyleSheets;
    3534class CSSStyleRule;
    3635class CSSStyleSheet;
    … …  
    3938class StyleSheetContents;
    4039
     40namespace Style {
     41class Scope;
     42}
     43
    4144class InspectorCSSOMWrappers {
    4245public:
    4346    // WARNING. This will construct CSSOM wrappers for all style rules and cache them in a map for significant memory cost.
    4447    // It is here to support inspector. Don't use for any regular engine functions.
    45     CSSStyleRule* getWrapperForRuleInSheets(StyleRule*, AuthorStyleSheets&, ExtensionStyleSheets&);
     48    CSSStyleRule* getWrapperForRuleInSheets(StyleRule*, Style::Scope&, ExtensionStyleSheets&);
    4649    void collectFromStyleSheetIfNeeded(CSSStyleSheet*);
    4750

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

    r190280 r206917  
    2222#include "StyleSheetList.h"
    2323
    24 #include "AuthorStyleSheets.h"
    2524#include "CSSStyleSheet.h"
    2625#include "Document.h"
    2726#include "HTMLNames.h"
    2827#include "HTMLStyleElement.h"
     28#include "StyleScope.h"
    2929#include <wtf/text/WTFString.h>
    3030
    … …  
    4646    if (!m_document)
    4747        return m_detachedStyleSheets;
    48     return m_document->authorStyleSheets().styleSheetsForStyleSheetList();
     48    return m_document->styleScope().styleSheetsForStyleSheetList();
    4949}
    5050
    5151void StyleSheetList::detachFromDocument()
    5252{
    53     m_detachedStyleSheets = m_document->authorStyleSheets().styleSheetsForStyleSheetList();
     53    m_detachedStyleSheets = m_document->styleScope().styleSheetsForStyleSheetList();
    5454    m_document = nullptr;
    5555}

  • trunk/Source/WebCore/dom/Document.cpp

    r206890 r206917  
    3232#include "AnimationController.h"
    3333#include "Attr.h"
    34 #include "AuthorStyleSheets.h"
    3534#include "CDATASection.h"
    3635#include "CSSFontSelector.h"
    … …  
    169168#include "StyleResolveForDocument.h"
    170169#include "StyleResolver.h"
     170#include "StyleScope.h"
    171171#include "StyleSheetContents.h"
    172172#include "StyleSheetList.h"
    … …  
    452452    , m_listenerTypes(0)
    453453    , m_mutationObserverTypes(0)
    454     , m_authorStyleSheets(std::make_unique<AuthorStyleSheets>(*this))
     454    , m_styleScope(std::make_unique<Style::Scope>(*this))
    455455    , m_extensionStyleSheets(std::make_unique<ExtensionStyleSheets>(*this))
    456456    , m_visitedLinkState(std::make_unique<VisitedLinkState>(*this))
    … …  
    13551355
    13561356    // Recalculate style so language is used when selecting the initial font.
    1357     m_authorStyleSheets->didChangeContentsOrInterpretation();
     1357    m_styleScope->didChangeContentsOrInterpretation();
    13581358}
    13591359
    … …  
    18131813    // hits a null-dereference due to security code always assuming the document has a SecurityOrigin.
    18141814
    1815     authorStyleSheets().flushPendingUpdate();
     1815    styleScope().flushPendingUpdate();
    18161816
    18171817    frameView.willRecalcStyle();
    … …  
    18961896        return false;
    18971897
    1898     return m_pendingStyleRecalcShouldForce || childNeedsStyleRecalc() || authorStyleSheets().hasPendingUpdate();
     1898    return m_pendingStyleRecalcShouldForce || childNeedsStyleRecalc() || styleScope().hasPendingUpdate();
    18991899}
    19001900
    … …  
    19071907        return;
    19081908
    1909     authorStyleSheets().flushPendingUpdate();
     1909    styleScope().flushPendingUpdate();
    19101910
    19111911    if (!needsStyleRecalc())
    … …  
    19611961        if (bodyElement && !bodyElement->renderer() && m_pendingSheetLayout == NoLayoutWithPendingSheets) {
    19621962            m_pendingSheetLayout = DidLayoutWithPendingSheets;
    1963             authorStyleSheets().didChangeContentsOrInterpretation();
     1963            styleScope().didChangeContentsOrInterpretation();
    19641964            recalcStyle(Style::Force);
    19651965        } else if (m_hasNodesWithPlaceholderStyle)
    … …  
    21432143{
    21442144    m_styleResolver = std::make_unique<StyleResolver>(*this);
    2145     m_styleResolver->appendAuthorStyleSheets(authorStyleSheets().activeStyleSheets());
     2145    m_styleResolver->appendAuthorStyleSheets(styleScope().activeStyleSheets());
    21462146}
    21472147
    … …  
    30863086    m_needsNotifyRemoveAllPendingStylesheet = false;
    30873087
    3088     authorStyleSheets().didChangeCandidatesForActiveSet();
     3088    styleScope().didChangeCandidatesForActiveSet();
    30893089
    30903090    if (m_pendingSheetLayout == DidLayoutWithPendingSheets) {
    … …  
    31093109    ASSERT(!m_inStyleRecalc);
    31103110
    3111     auto& authorSheets = const_cast<AuthorStyleSheets&>(authorStyleSheets());
    3112     authorSheets.flushPendingUpdate();
    3113     return authorSheets.usesStyleBasedEditability();
     3111    auto& styleScope = const_cast<Style::Scope&>(this->styleScope());
     3112    styleScope.flushPendingUpdate();
     3113    return styleScope.usesStyleBasedEditability();
    31143114}
    31153115
    … …  
    31573157        // http://www.hixie.ch/tests/evil/css/import/main/preferred.html
    31583158        // -dwh
    3159         authorStyleSheets().setSelectedStylesheetSetName(content);
    3160         authorStyleSheets().setPreferredStylesheetSetName(content);
    3161         authorStyleSheets().didChangeContentsOrInterpretation();
     3159        styleScope().setSelectedStylesheetSetName(content);
     3160        styleScope().setPreferredStylesheetSetName(content);
     3161        styleScope().didChangeContentsOrInterpretation();
    31623162        break;
    31633163
    … …  
    34533453String Document::preferredStylesheetSet() const
    34543454{
    3455     return authorStyleSheets().preferredStylesheetSetName();
     3455    return styleScope().preferredStylesheetSetName();
    34563456}
    34573457
    34583458String Document::selectedStylesheetSet() const
    34593459{
    3460     return authorStyleSheets().selectedStylesheetSetName();
     3460    return styleScope().selectedStylesheetSetName();
    34613461}
    34623462
    34633463void Document::setSelectedStylesheetSet(const String& aString)
    34643464{
    3465     authorStyleSheets().setSelectedStylesheetSetName(aString);
    3466     authorStyleSheets().didChangeContentsOrInterpretation();
     3465    styleScope().setSelectedStylesheetSetName(aString);
     3466    styleScope().didChangeContentsOrInterpretation();
    34673467}
    34683468
    … …  
    66666666bool Document::haveStylesheetsLoaded() const
    66676667{
    6668     return !authorStyleSheets().hasPendingSheets() || m_ignorePendingStylesheets;
     6668    return !styleScope().hasPendingSheets() || m_ignorePendingStylesheets;
    66696669}
    66706670

  • trunk/Source/WebCore/dom/Document.h

    r206795 r206917  
    7575class AXObjectCache;
    7676class Attr;
    77 class AuthorStyleSheets;
    7877class CDATASection;
    7978class CSSFontSelector;
    … …  
    225224#endif
    226225
     226namespace Style {
     227class Scope;
     228};
     229
    227230const uint64_t HTMLMediaElementInvalidID = 0;
    228231
    … …  
    505508    WEBCORE_EXPORT StyleSheetList& styleSheets();
    506509
    507     AuthorStyleSheets& authorStyleSheets() { return *m_authorStyleSheets; }
    508     const AuthorStyleSheets& authorStyleSheets() const { return *m_authorStyleSheets; }
     510    Style::Scope& styleScope() { return *m_styleScope; }
     511    const Style::Scope& styleScope() const { return *m_styleScope; }
    509512    ExtensionStyleSheets& extensionStyleSheets() { return *m_extensionStyleSheets; }
    510513    const ExtensionStyleSheets& extensionStyleSheets() const { return *m_extensionStyleSheets; }
    … …  
    14701473    MutationObserverOptions m_mutationObserverTypes;
    14711474
    1472     std::unique_ptr<AuthorStyleSheets> m_authorStyleSheets;
     1475    std::unique_ptr<Style::Scope> m_styleScope;
    14731476    std::unique_ptr<ExtensionStyleSheets> m_extensionStyleSheets;
    14741477    RefPtr<StyleSheetList> m_styleSheetList;

  • trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp

    r206361 r206917  
    2929#include "ExtensionStyleSheets.h"
    3030
    31 #include "AuthorStyleSheets.h"
    3231#include "CSSStyleSheet.h"
    3332#include "Element.h"
    … …  
    4342#include "StyleInvalidationAnalysis.h"
    4443#include "StyleResolver.h"
     44#include "StyleScope.h"
    4545#include "StyleSheetContents.h"
    4646#include "StyleSheetList.h"
    … …  
    8484    if (m_pageUserSheet) {
    8585        m_pageUserSheet = nullptr;
    86         m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     86        m_document.styleScope().didChangeContentsOrInterpretation();
    8787    }
    8888}
    … …  
    9292    clearPageUserSheet();
    9393    if (pageUserSheet())
    94         m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     94        m_document.styleScope().didChangeContentsOrInterpretation();
    9595}
    9696
    … …  
    156156    if (m_injectedUserStyleSheets.isEmpty() && m_injectedAuthorStyleSheets.isEmpty())
    157157        return;
    158     m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     158    m_document.styleScope().didChangeContentsOrInterpretation();
    159159}
    160160
    … …  
    163163    ASSERT(userSheet.get().isUserStyleSheet());
    164164    m_userStyleSheets.append(CSSStyleSheet::create(WTFMove(userSheet), m_document));
    165     m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     165    m_document.styleScope().didChangeContentsOrInterpretation();
    166166}
    167167
    … …  
    170170    ASSERT(!authorSheet.get().isUserStyleSheet());
    171171    m_authorStyleSheetsForTesting.append(CSSStyleSheet::create(WTFMove(authorSheet), m_document));
    172     m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     172    m_document.styleScope().didChangeContentsOrInterpretation();
    173173}
    174174
    … …  
    202202void ExtensionStyleSheets::styleResolverChangedTimerFired()
    203203{
    204     m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     204    m_document.styleScope().didChangeContentsOrInterpretation();
    205205}
    206206

  • trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

    r206880 r206917  
    2222#include "InlineStyleSheetOwner.h"
    2323
    24 #include "AuthorStyleSheets.h"
    2524#include "ContentSecurityPolicy.h"
    2625#include "Element.h"
    … …  
    2928#include "ScriptableDocumentParser.h"
    3029#include "ShadowRoot.h"
     30#include "StyleScope.h"
    3131#include "StyleSheetContents.h"
    3232#include "TextNodeTraversal.h"
    … …  
    5252void InlineStyleSheetOwner::insertedIntoDocument(Element& element)
    5353{
    54     m_styleSheetScope = &AuthorStyleSheets::forNode(element);
    55     m_styleSheetScope->addStyleSheetCandidateNode(element, m_isParsingChildren);
     54    m_styleScope = &Style::Scope::forNode(element);
     55    m_styleScope->addStyleSheetCandidateNode(element, m_isParsingChildren);
    5656
    5757    if (m_isParsingChildren)
    … …  
    6262void InlineStyleSheetOwner::removedFromDocument(Element& element)
    6363{
    64     if (m_styleSheetScope) {
    65         m_styleSheetScope->removeStyleSheetCandidateNode(element);
    66         m_styleSheetScope = nullptr;
     64    if (m_styleScope) {
     65        m_styleScope->removeStyleSheetCandidateNode(element);
     66        m_styleScope = nullptr;
    6767    }
    6868    if (m_sheet)
    … …  
    7575        m_sheet->clearOwnerNode();
    7676
    77     if (m_styleSheetScope) {
    78         m_styleSheetScope->removeStyleSheetCandidateNode(element);
    79         m_styleSheetScope = nullptr;
     77    if (m_styleScope) {
     78        m_styleScope->removeStyleSheetCandidateNode(element);
     79        m_styleScope = nullptr;
    8080    }
    8181}
    … …  
    125125    Document& document = element.document();
    126126    if (m_sheet) {
    127         if (m_sheet->isLoading() && m_styleSheetScope)
    128             m_styleSheetScope->removePendingSheet();
     127        if (m_sheet->isLoading() && m_styleScope)
     128            m_styleScope->removePendingSheet();
    129129        clearSheet();
    130130    }
    … …  
    150150        return;
    151151
    152     if (m_styleSheetScope)
    153         m_styleSheetScope->addPendingSheet();
     152    if (m_styleScope)
     153        m_styleScope->addPendingSheet();
    154154
    155155    m_loading = true;
    … …  
    178178        return false;
    179179
    180     if (m_styleSheetScope)
    181         m_styleSheetScope->removePendingSheet();
     180    if (m_styleScope)
     181        m_styleScope->removePendingSheet();
    182182
    183183    return true;
    … …  
    186186void InlineStyleSheetOwner::startLoadingDynamicSheet(Element&)
    187187{
    188     if (m_styleSheetScope)
    189         m_styleSheetScope->addPendingSheet();
     188    if (m_styleScope)
     189        m_styleScope->addPendingSheet();
    190190}
    191191

  • trunk/Source/WebCore/dom/InlineStyleSheetOwner.h

    r206880 r206917  
    5151    void finishParsingChildren(Element&);
    5252
    53     AuthorStyleSheets* styleSheetScope() { return m_styleSheetScope; }
     53    Style::Scope* styleScope() { return m_styleScope; }
    5454
    5555private:
    … …  
    6464    AtomicString m_media;
    6565    RefPtr<CSSStyleSheet> m_sheet;
    66     AuthorStyleSheets* m_styleSheetScope { nullptr };
     66    Style::Scope* m_styleScope { nullptr };
    6767};
    6868

  • trunk/Source/WebCore/dom/ProcessingInstruction.cpp

    r206867 r206917  
    2323#include "ProcessingInstruction.h"
    2424
    25 #include "AuthorStyleSheets.h"
    2625#include "CSSStyleSheet.h"
    2726#include "CachedCSSStyleSheet.h"
    … …  
    3635#include "XMLDocumentParser.h" // for parseAttributes()
    3736#include "MediaList.h"
     37#include "StyleScope.h"
    3838#include "StyleSheetContents.h"
    3939
    … …  
    6060
    6161    if (inDocument())
    62         document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
     62        document().styleScope().removeStyleSheetCandidateNode(*this);
    6363}
    6464
    … …  
    136136
    137137            m_loading = true;
    138             document().authorStyleSheets().addPendingSheet();
     138            document().styleScope().addPendingSheet();
    139139
    140140#if ENABLE(XSLT)
    … …  
    159159                // The request may have been denied if (for example) the stylesheet is local and the document is remote.
    160160                m_loading = false;
    161                 document().authorStyleSheets().removePendingSheet();
     161                document().styleScope().removePendingSheet();
    162162            }
    163163        }
    … …  
    177177{
    178178    if (!isLoading()) {
    179         document().authorStyleSheets().removePendingSheet();
     179        document().styleScope().removePendingSheet();
    180180        return true;
    181181    }
    … …  
    252252    if (!insertionPoint.inDocument())
    253253        return InsertionDone;
    254     document().authorStyleSheets().addStyleSheetCandidateNode(*this, m_createdByParser);
     254    document().styleScope().addStyleSheetCandidateNode(*this, m_createdByParser);
    255255    checkStyleSheet();
    256256    return InsertionDone;
    … …  
    263263        return;
    264264   
    265     document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
     265    document().styleScope().removeStyleSheetCandidateNode(*this);
    266266
    267267    if (m_sheet) {
    … …  
    273273    if (m_loading) {
    274274        m_loading = false;
    275         document().authorStyleSheets().removePendingSheet();
     275        document().styleScope().removePendingSheet();
    276276    }
    277277
    278278    // If we're in document teardown, then we don't need to do any notification of our sheet's removal.
    279279    if (document().hasLivingRenderTree())
    280         document().authorStyleSheets().didChangeContentsOrInterpretation();
     280        document().styleScope().didChangeContentsOrInterpretation();
    281281}
    282282

  • trunk/Source/WebCore/dom/ShadowRoot.cpp

    r206880 r206917  
    2929#include "ShadowRoot.h"
    3030
    31 #include "AuthorStyleSheets.h"
    3231#include "CSSStyleSheet.h"
    3332#include "ElementTraversal.h"
    … …  
    3635#include "SlotAssignment.h"
    3736#include "StyleResolver.h"
     37#include "StyleScope.h"
    3838#include "markup.h"
    3939
    … …  
    4343    unsigned countersAndFlags[1];
    4444    void* styleResolver;
    45     void* authorStyleSheets;
     45    void* styleScope;
    4646    void* host;
    4747    void* slotAssignment;
    … …  
    8989        // FIXME: We could share style resolver with shadow roots that have identical style.
    9090        m_styleResolver = std::make_unique<StyleResolver>(document());
    91         if (m_authorStyleSheets)
    92             m_styleResolver->appendAuthorStyleSheets(m_authorStyleSheets->activeStyleSheets());
     91        if (m_styleScope)
     92            m_styleResolver->appendAuthorStyleSheets(m_styleScope->activeStyleSheets());
    9393    }
    9494    return *m_styleResolver;
    … …  
    108108}
    109109
    110 AuthorStyleSheets& ShadowRoot::authorStyleSheets()
    111 {
    112     if (!m_authorStyleSheets)
    113         m_authorStyleSheets = std::make_unique<AuthorStyleSheets>(*this);
    114     return *m_authorStyleSheets;
     110Style::Scope& ShadowRoot::styleScope()
     111{
     112    if (!m_styleScope)
     113        m_styleScope = std::make_unique<Style::Scope>(*this);
     114    return *m_styleScope;
    115115}
    116116
    117117void ShadowRoot::updateStyle()
    118118{
    119     if (!m_authorStyleSheets)
     119    if (!m_styleScope)
    120120        return;
    121121    // FIXME: Make optimized updated work.
    122     m_authorStyleSheets->didChangeContentsOrInterpretation();
     122    m_styleScope->didChangeContentsOrInterpretation();
    123123}
    124124

  • trunk/Source/WebCore/dom/ShadowRoot.h

    r206880 r206917  
    3737namespace WebCore {
    3838
    39 class AuthorStyleSheets;
    4039class HTMLSlotElement;
    4140class SlotAssignment;
    … …  
    6564    StyleResolver& styleResolver();
    6665    StyleResolver* styleResolverIfExists();
    67     AuthorStyleSheets& authorStyleSheets();
     66    Style::Scope& styleScope();
    6867
    6968    void updateStyle();
    … …  
    117116
    118117    std::unique_ptr<StyleResolver> m_styleResolver;
    119     std::unique_ptr<AuthorStyleSheets> m_authorStyleSheets;
     118    std::unique_ptr<Style::Scope> m_styleScope;
    120119
    121120    std::unique_ptr<SlotAssignment> m_slotAssignment;

  • trunk/Source/WebCore/html/HTMLLinkElement.cpp

    r206902 r206917  
    2727
    2828#include "Attribute.h"
    29 #include "AuthorStyleSheets.h"
    3029#include "CachedCSSStyleSheet.h"
    3130#include "CachedResource.h"
    … …  
    5554#include "StyleInheritedData.h"
    5655#include "StyleResolveForDocument.h"
     56#include "StyleScope.h"
    5757#include "StyleSheetContents.h"
    5858#include <wtf/Ref.h>
    … …  
    103103
    104104    if (inDocument())
    105         document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
     105        document().styleScope().removeStyleSheetCandidateNode(*this);
    106106
    107107    linkLoadEventSender().cancelEvent(*this);
    … …  
    141141            process();
    142142        else
    143             document().authorStyleSheets().didChangeContentsOrInterpretation();
     143            document().styleScope().didChangeContentsOrInterpretation();
    144144    }
    145145}
    … …  
    177177        process();
    178178        if (m_sheet && !isDisabled())
    179             document().authorStyleSheets().didChangeContentsOrInterpretation();
     179            document().styleScope().didChangeContentsOrInterpretation();
    180180        return;
    181181    }
    … …  
    284284        // we no longer contain a stylesheet, e.g. perhaps rel or type was changed
    285285        clearSheet();
    286         document().authorStyleSheets().didChangeContentsOrInterpretation();
     286        document().styleScope().didChangeContentsOrInterpretation();
    287287    }
    288288}
    … …  
    306306        return InsertionDone;
    307307
    308     document().authorStyleSheets().addStyleSheetCandidateNode(*this, m_createdByParser);
     308    document().styleScope().addStyleSheetCandidateNode(*this, m_createdByParser);
    309309
    310310    process();
    … …  
    322322        return;
    323323    }
    324     document().authorStyleSheets().removeStyleSheetCandidateNode(*this);
     324    document().styleScope().removeStyleSheetCandidateNode(*this);
    325325
    326326    if (m_sheet)
    … …  
    545545    if (m_pendingSheetType == InactiveSheet)
    546546        return;
    547     document().authorStyleSheets().addPendingSheet();
     547    document().styleScope().addPendingSheet();
    548548}
    549549
    … …  
    558558    if (type == InactiveSheet) {
    559559        // Document just needs to know about the sheet for exposure through document.styleSheets
    560         document().authorStyleSheets().didChangeCandidatesForActiveSet();
    561         return;
    562     }
    563 
    564     document().authorStyleSheets().removePendingSheet(
     560        document().styleScope().didChangeCandidatesForActiveSet();
     561        return;
     562    }
     563
     564    document().styleScope().removePendingSheet(
    565565        notification == RemovePendingSheetNotifyImmediately
    566         ? AuthorStyleSheets::RemovePendingSheetNotifyImmediately
    567         : AuthorStyleSheets::RemovePendingSheetNotifyLater);
     566        ? Style::Scope::RemovePendingSheetNotifyImmediately
     567        : Style::Scope::RemovePendingSheetNotifyLater);
    568568}
    569569

  • trunk/Source/WebCore/html/HTMLStyleElement.cpp

    r206880 r206917  
    2525#include "HTMLStyleElement.h"
    2626
    27 #include "AuthorStyleSheets.h"
    2827#include "CachedResource.h"
    2928#include "Document.h"
    … …  
    3635#include "ScriptableDocumentParser.h"
    3736#include "ShadowRoot.h"
     37#include "StyleScope.h"
    3838#include "StyleSheetContents.h"
    3939
    … …  
    7777        if (sheet()) {
    7878            sheet()->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(value));
    79             if (auto* scope = m_styleSheetOwner.styleSheetScope())
     79            if (auto* scope = m_styleSheetOwner.styleScope())
    8080                scope->didChangeContentsOrInterpretation();
    8181        } else

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

    r206361 r206917  
    2727#include "InspectorCSSAgent.h"
    2828
    29 #include "AuthorStyleSheets.h"
    3029#include "CSSComputedStyleDeclaration.h"
    3130#include "CSSImportRule.h"
    … …  
    5756#include "StyleResolver.h"
    5857#include "StyleRule.h"
     58#include "StyleScope.h"
    5959#include "StyleSheetList.h"
    6060#include "WebKitNamedFlow.h"
    … …  
    671671void InspectorCSSAgent::collectAllDocumentStyleSheets(Document& document, Vector<CSSStyleSheet*>& result)
    672672{
    673     auto cssStyleSheets = document.authorStyleSheets().activeStyleSheetsForInspector();
     673    auto cssStyleSheets = document.styleScope().activeStyleSheetsForInspector();
    674674    for (auto& cssStyleSheet : cssStyleSheets)
    675675        collectStyleSheets(cssStyleSheet.get(), result);
    … …  
    890890    else
    891891        m_nodeIdToForcedPseudoState.remove(nodeId);
    892     element->document().authorStyleSheets().didChangeContentsOrInterpretation();
     892    element->document().styleScope().didChangeContentsOrInterpretation();
    893893}
    894894
    … …  
    10161016    // StyleRules returned by StyleResolver::styleRulesForElement lack parent pointers since that infomation is not cheaply available.
    10171017    // Since the inspector wants to walk the parent chain, we construct the full wrappers here.
    1018     CSSStyleRule* cssomWrapper = styleResolver.inspectorCSSOMWrappers().getWrapperForRuleInSheets(styleRule, styleResolver.document().authorStyleSheets(), styleResolver.document().extensionStyleSheets());
     1018    CSSStyleRule* cssomWrapper = styleResolver.inspectorCSSOMWrappers().getWrapperForRuleInSheets(styleRule, styleResolver.document().styleScope(), styleResolver.document().extensionStyleSheets());
    10191019    if (!cssomWrapper)
    10201020        return nullptr;
    … …  
    11901190    m_nodeIdToForcedPseudoState.clear();
    11911191    for (auto& document : documentsToChange)
    1192         document->authorStyleSheets().didChangeContentsOrInterpretation();
     1192        document->styleScope().didChangeContentsOrInterpretation();
    11931193}
    11941194

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

    r206361 r206917  
    3333#include "InspectorPageAgent.h"
    3434
    35 #include "AuthorStyleSheets.h"
    3635#include "CachedCSSStyleSheet.h"
    3736#include "CachedFont.h"
    … …  
    6867#include "SecurityOrigin.h"
    6968#include "Settings.h"
     69#include "StyleScope.h"
    7070#include "TextEncoding.h"
    7171#include "TextResourceDecoder.h"
    … …  
    10031003    Document* document = m_page.mainFrame().document();
    10041004    if (document) {
    1005         document->authorStyleSheets().didChangeContentsOrInterpretation();
     1005        document->styleScope().didChangeContentsOrInterpretation();
    10061006        document->updateLayout();
    10071007    }

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r206880 r206917  
    2828#include "DOMWindow.h"
    2929
    30 #include "AuthorStyleSheets.h"
    3130#include "BackForwardController.h"
    3231#include "BarProp.h"
    … …  
    9897#include "StyleMedia.h"
    9998#include "StyleResolver.h"
     99#include "StyleScope.h"
    100100#include "SuddenTermination.h"
    101101#include "URL.h"
    … …  
    14331433        return nullptr;
    14341434
    1435     m_frame->document()->authorStyleSheets().flushPendingUpdate();
     1435    m_frame->document()->styleScope().flushPendingUpdate();
    14361436
    14371437    unsigned rulesToInclude = StyleResolver::AuthorCSSRules;

  • trunk/Source/WebCore/page/Frame.cpp

    r206361 r206917  
    3333#include "AnimationController.h"
    3434#include "ApplyStyleCommand.h"
    35 #include "AuthorStyleSheets.h"
    3635#include "BackForwardController.h"
    3736#include "CSSComputedStyleDeclaration.h"
    … …  
    9493#include "Settings.h"
    9594#include "StyleProperties.h"
     95#include "StyleScope.h"
    9696#include "TextNodeTraversal.h"
    9797#include "TextResourceDecoder.h"
    … …  
    645645    view()->adjustMediaTypeForPrinting(printing);
    646646
    647     m_doc->authorStyleSheets().didChangeContentsOrInterpretation();
     647    m_doc->styleScope().didChangeContentsOrInterpretation();
    648648    if (shouldUsePrintingLayout()) {
    649649        view()->forceLayoutForPagination(pageSize, originalPageSize, maximumShrinkRatio, shouldAdjustViewSize);

  • trunk/Source/WebCore/page/FrameView.cpp

    r206743 r206917  
    3030#include "AXObjectCache.h"
    3131#include "AnimationController.h"
    32 #include "AuthorStyleSheets.h"
    3332#include "BackForwardController.h"
    3433#include "CachedImage.h"
    … …  
    9392#include "Settings.h"
    9493#include "StyleResolver.h"
     94#include "StyleScope.h"
    9595#include "TextResourceDecoder.h"
    9696#include "TextStream.h"
    … …  
    13361336        if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
    13371337            LOG(Layout, "  hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
    1338             document.authorStyleSheets().didChangeContentsOrInterpretation();
     1338            document.styleScope().didChangeContentsOrInterpretation();
    13391339            // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
    13401340            InspectorInstrumentation::mediaQueryResultChanged(document);
    … …  
    35333533    m_pagination = pagination;
    35343534
    3535     frame().document()->authorStyleSheets().didChangeContentsOrInterpretation();
     3535    frame().document()->styleScope().didChangeContentsOrInterpretation();
    35363536}
    35373537
    … …  
    50025002        // FIXME: this should probably be updateViewportUnitsOnResize(), but synchronously
    50035003        // dirtying style here causes assertions on iOS (rdar://problem/19998166).
    5004         document->authorStyleSheets().didChangeContentsOrInterpretation();
     5004        document->styleScope().didChangeContentsOrInterpretation();
    50055005    }
    50065006}

  • trunk/Source/WebCore/page/Page.cpp

    r206527 r206917  
    2424#include "AnimationController.h"
    2525#include "ApplicationCacheStorage.h"
    26 #include "AuthorStyleSheets.h"
    2726#include "BackForwardClient.h"
    2827#include "BackForwardController.h"
    … …  
    9190#include "StorageNamespaceProvider.h"
    9291#include "StyleResolver.h"
     92#include "StyleScope.h"
    9393#include "SubframeLoader.h"
    9494#include "TextResourceDecoder.h"
    … …  
    425425
    426426    if (m_mainFrame->document())
    427         m_mainFrame->document()->authorStyleSheets().didChangeContentsOrInterpretation();
     427        m_mainFrame->document()->styleScope().didChangeContentsOrInterpretation();
    428428}
    429429#endif // ENABLE(VIEW_MODE_CSS_MEDIA)
    … …  
    503503    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
    504504        if (Document* document = frame->document())
    505             document->authorStyleSheets().didChangeContentsOrInterpretation();
     505            document->styleScope().didChangeContentsOrInterpretation();
    506506    }
    507507}
    … …  
    11641164            continue;
    11651165        document->extensionStyleSheets().invalidateInjectedStyleSheetCache();
    1166         document->authorStyleSheets().didChangeContentsOrInterpretation();
     1166        document->styleScope().didChangeContentsOrInterpretation();
    11671167    }
    11681168}

  • trunk/Source/WebCore/style/StyleScope.cpp

    r206916 r206917  
    44 *           (C) 2001 Dirk Mueller (mueller@kde.org)
    55 *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
    6  * Copyright (C) 2004-2009, 2011-2012, 2015 Apple Inc. All rights reserved.
     6 * Copyright (C) 2004-2009, 2011-2012, 2015-2016 Apple Inc. All rights reserved.
    77 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    88 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
    … …  
    2727
    2828#include "config.h"
    29 #include "AuthorStyleSheets.h"
     29#include "StyleScope.h"
    3030
    3131#include "CSSStyleSheet.h"
    … …  
    5757using namespace HTMLNames;
    5858
    59 AuthorStyleSheets::AuthorStyleSheets(Document& document)
     59namespace Style {
     60
     61Scope::Scope(Document& document)
    6062    : m_document(document)
    61     , m_pendingUpdateTimer(*this, &AuthorStyleSheets::pendingUpdateTimerFired)
    62 {
    63 }
    64 
    65 AuthorStyleSheets::AuthorStyleSheets(ShadowRoot& shadowRoot)
     63    , m_pendingUpdateTimer(*this, &Scope::pendingUpdateTimerFired)
     64{
     65}
     66
     67Scope::Scope(ShadowRoot& shadowRoot)
    6668    : m_document(shadowRoot.documentScope())
    6769    , m_shadowRoot(&shadowRoot)
    68     , m_pendingUpdateTimer(*this, &AuthorStyleSheets::pendingUpdateTimerFired)
    69 {
    70 }
    71 
    72 StyleResolver& AuthorStyleSheets::styleResolver()
     70    , m_pendingUpdateTimer(*this, &Scope::pendingUpdateTimerFired)
     71{
     72}
     73
     74StyleResolver& Scope::styleResolver()
    7375{
    7476    if (m_shadowRoot)
    … …  
    7880}
    7981
    80 StyleResolver* AuthorStyleSheets::styleResolverIfExists()
     82StyleResolver* Scope::styleResolverIfExists()
    8183{
    8284    if (m_shadowRoot)
    … …  
    8688}
    8789
    88 AuthorStyleSheets& AuthorStyleSheets::forNode(Node& node)
     90Scope& Scope::forNode(Node& node)
    8991{
    9092    ASSERT(node.inDocument());
    9193    auto* shadowRoot = node.containingShadowRoot();
    9294    if (shadowRoot)
    93         return shadowRoot->authorStyleSheets();
    94     return node.document().authorStyleSheets();
     95        return shadowRoot->styleScope();
     96    return node.document().styleScope();
    9597}
    9698
    9799// This method is called whenever a top-level stylesheet has finished loading.
    98 void AuthorStyleSheets::removePendingSheet(RemovePendingSheetNotificationType notification)
     100void Scope::removePendingSheet(RemovePendingSheetNotificationType notification)
    99101{
    100102    // Make sure we knew this sheet was pending, and that our count isn't out of sync.
    … …  
    124126}
    125127
    126 void AuthorStyleSheets::addStyleSheetCandidateNode(Node& node, bool createdByParser)
     128void Scope::addStyleSheetCandidateNode(Node& node, bool createdByParser)
    127129{
    128130    if (!node.inDocument())
    … …  
    157159}
    158160
    159 void AuthorStyleSheets::removeStyleSheetCandidateNode(Node& node)
     161void Scope::removeStyleSheetCandidateNode(Node& node)
    160162{
    161163    if (m_styleSheetCandidateNodes.remove(&node))
    … …  
    163165}
    164166
    165 void AuthorStyleSheets::collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>& sheets)
     167void Scope::collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>& sheets)
    166168{
    167169    if (m_document.settings() && !m_document.settings()->authorAndUserStylesEnabled())
    … …  
    241243}
    242244
    243 AuthorStyleSheets::StyleResolverUpdateType AuthorStyleSheets::analyzeStyleSheetChange(const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, bool& requiresFullStyleRecalc)
     245Scope::StyleResolverUpdateType Scope::analyzeStyleSheetChange(const Vector<RefPtr<CSSStyleSheet>>& newStylesheets, bool& requiresFullStyleRecalc)
    244246{
    245247    requiresFullStyleRecalc = true;
    … …  
    308310}
    309311
    310 void AuthorStyleSheets::updateActiveStyleSheets(UpdateType updateType)
     312void Scope::updateActiveStyleSheets(UpdateType updateType)
    311313{
    312314    ASSERT(!m_pendingUpdateType);
    … …  
    374376}
    375377
    376 void AuthorStyleSheets::updateStyleResolver(Vector<RefPtr<CSSStyleSheet>>& activeStyleSheets, StyleResolverUpdateType updateType)
     378void Scope::updateStyleResolver(Vector<RefPtr<CSSStyleSheet>>& activeStyleSheets, StyleResolverUpdateType updateType)
    377379{
    378380    if (updateType == Reconstruct) {
    … …  
    405407}
    406408
    407 const Vector<RefPtr<CSSStyleSheet>> AuthorStyleSheets::activeStyleSheetsForInspector() const
     409const Vector<RefPtr<CSSStyleSheet>> Scope::activeStyleSheetsForInspector() const
    408410{
    409411    Vector<RefPtr<CSSStyleSheet>> result;
    … …  
    426428}
    427429
    428 bool AuthorStyleSheets::activeStyleSheetsContains(const CSSStyleSheet* sheet) const
     430bool Scope::activeStyleSheetsContains(const CSSStyleSheet* sheet) const
    429431{
    430432    if (!m_weakCopyOfActiveStyleSheetListForFastLookup) {
    … …  
    436438}
    437439
    438 void AuthorStyleSheets::flushPendingUpdate()
     440void Scope::flushPendingUpdate()
    439441{
    440442    if (!m_pendingUpdateType)
    … …  
    447449}
    448450
    449 void AuthorStyleSheets::clearPendingUpdate()
     451void Scope::clearPendingUpdate()
    450452{
    451453    m_pendingUpdateTimer.stop();
    … …  
    453455}
    454456
    455 void AuthorStyleSheets::scheduleActiveSetUpdate()
     457void Scope::scheduleActiveSetUpdate()
    456458{
    457459    if (m_shadowRoot) {
    … …  
    467469}
    468470
    469 void AuthorStyleSheets::didChangeCandidatesForActiveSet()
     471void Scope::didChangeCandidatesForActiveSet()
    470472{
    471473    auto updateType = m_pendingUpdateType.valueOr(UpdateType::ActiveSet);
    … …  
    474476}
    475477
    476 void AuthorStyleSheets::didChangeContentsOrInterpretation()
     478void Scope::didChangeContentsOrInterpretation()
    477479{
    478480    clearPendingUpdate();
    … …  
    480482}
    481483
    482 void AuthorStyleSheets::pendingUpdateTimerFired()
     484void Scope::pendingUpdateTimerFired()
    483485{
    484486    flushPendingUpdate();
    … …  
    486488
    487489}
     490}

  • trunk/Source/WebCore/style/StyleScope.h

    r206916 r206917  
    44 *           (C) 2001 Dirk Mueller (mueller@kde.org)
    55 *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
    6  * Copyright (C) 2004-2010, 2012-2013, 2015 Apple Inc. All rights reserved.
     6 * Copyright (C) 2004-2010, 2012-2013, 2015-2016 Apple Inc. All rights reserved.
    77 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
    88 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
    … …  
    2626 */
    2727
    28 #ifndef AuthorStyleSheets_h
    29 #define AuthorStyleSheets_h
     28#pragma once
    3029
    3130#include "Timer.h"
    … …  
    5049class TreeScope;
    5150
    52 class AuthorStyleSheets {
     51namespace Style {
     52
     53class Scope {
    5354    WTF_MAKE_FAST_ALLOCATED;
    5455public:
    55     explicit AuthorStyleSheets(Document&);
    56     explicit AuthorStyleSheets(ShadowRoot&);
     56    explicit Scope(Document&);
     57    explicit Scope(ShadowRoot&);
    5758
    5859    const Vector<RefPtr<CSSStyleSheet>>& activeStyleSheets() const { return m_activeStyleSheets; }
    … …  
    9293    StyleResolver* styleResolverIfExists();
    9394
    94     static AuthorStyleSheets& forNode(Node&);
     95    static Scope& forNode(Node&);
    9596
    9697private:
    … …  
    119120    Timer m_pendingUpdateTimer;
    120121
    121     // This is a mirror of m_activeAuthorStyleSheets that gets populated on demand for activeStyleSheetsContains().
    122122    mutable std::unique_ptr<HashSet<const CSSStyleSheet*>> m_weakCopyOfActiveStyleSheetListForFastLookup;
    123123
    … …  
    140140
    141141}
    142 
    143 #endif
    144 
     142}

  • trunk/Source/WebCore/style/StyleTreeResolver.cpp

    r206641 r206917  
    2727#include "StyleTreeResolver.h"
    2828
    29 #include "AuthorStyleSheets.h"
    3029#include "CSSFontSelector.h"
    3130#include "ComposedTreeAncestorIterator.h"
    … …  
    4645#include "StyleFontSizeFunctions.h"
    4746#include "StyleResolver.h"
     47#include "StyleScope.h"
    4848#include "Text.h"
    4949

  • trunk/Source/WebCore/svg/SVGFontFaceElement.cpp

    r206361 r206917  
    2525#include "SVGFontFaceElement.h"
    2626
    27 #include "AuthorStyleSheets.h"
    2827#include "CSSFontFaceSrcValue.h"
    2928#include "CSSParser.h"
    … …  
    4342#include "StyleResolver.h"
    4443#include "StyleRule.h"
     44#include "StyleScope.h"
    4545#include <math.h>
    4646
    … …  
    268268    }
    269269
    270     document().authorStyleSheets().didChangeContentsOrInterpretation();
     270    document().styleScope().didChangeContentsOrInterpretation();
    271271}
    272272
    … …  
    293293        m_fontFaceRule->mutableProperties().clear();
    294294
    295         document().authorStyleSheets().didChangeContentsOrInterpretation();
     295        document().styleScope().didChangeContentsOrInterpretation();
    296296    } else
    297297        ASSERT(!m_fontElement);

  • trunk/Source/WebCore/xml/XMLTreeViewer.cpp

    r206361 r206917  
    3333#if ENABLE(XSLT)
    3434
    35 #include "AuthorStyleSheets.h"
    3635#include "Document.h"
    3736#include "Element.h"
    … …  
    4241#include "SecurityOrigin.h"
    4342#include "SecurityOriginPolicy.h"
     43#include "StyleScope.h"
    4444#include "Text.h"
    4545#include "XMLViewerCSS.h"
    … …  
    6565    auto text = m_document.createTextNode(cssString);
    6666    m_document.getElementById(String(ASCIILiteral("xml-viewer-style")))->appendChild(text, IGNORE_EXCEPTION);
    67     m_document.authorStyleSheets().didChangeContentsOrInterpretation();
     67    m_document.styleScope().didChangeContentsOrInterpretation();
    6868}
    6969

  • trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp

    r206903 r206917  
    2727#include "XMLDocumentParser.h"
    2828
    29 #include "AuthorStyleSheets.h"
    3029#include "CDATASection.h"
    3130#include "CachedScript.h"
    … …  
    5049#include "ScriptElement.h"
    5150#include "ScriptSourceCode.h"
     51#include "StyleScope.h"
    5252#include "TextResourceDecoder.h"
    5353#include "TreeDepthLimit.h"
    … …  
    201201    else {
    202202        updateLeafTextNode();
    203         document()->authorStyleSheets().didChangeContentsOrInterpretation();
     203        document()->styleScope().didChangeContentsOrInterpretation();
    204204    }
    205205

  • trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

    r206867 r206917  
    2929#include "XMLDocumentParser.h"
    3030
    31 #include "AuthorStyleSheets.h"
    3231#include "CDATASection.h"
    3332#include "CachedScript.h"
    … …  
    5756#include "SecurityOrigin.h"
    5857#include "Settings.h"
     58#include "StyleScope.h"
    5959#include "TextResourceDecoder.h"
    6060#include "TransformSource.h"
    … …  
    13881388
    13891389        document()->setParsing(false); // Make the document think it's done, so it will apply XSL stylesheets.
    1390         document()->authorStyleSheets().didChangeContentsOrInterpretation();
     1390        document()->styleScope().didChangeContentsOrInterpretation();
    13911391
    13921392        // styleResolverChanged() call can detach the parser and null out its document.

  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r206867 r206917  
    7373#import "WebUIDelegatePrivate.h"
    7474#import "WebViewInternal.h"
    75 #import <WebCore/AuthorStyleSheets.h>
    7675#import <WebCore/CSSStyleDeclaration.h>
    7776#import <WebCore/CachedImage.h>
    … …  
    120119#import <WebCore/SharedBuffer.h>
    121120#import <WebCore/StyleProperties.h>
     121#import <WebCore/StyleScope.h>
    122122#import <WebCore/Text.h>
    123123#import <WebCore/TextAlternativeWithRange.h>
    … …  
    36133613
    36143614    if (Frame* coreFrame = core([self _frame])) {
    3615         coreFrame->document()->authorStyleSheets().didChangeContentsOrInterpretation();
     3615        coreFrame->document()->styleScope().didChangeContentsOrInterpretation();
    36163616        coreFrame->document()->updateStyleIfNeeded();
    36173617    }
    … …  
    50085008            document->setPaginatedForScreen(_private->paginateScreenContent);
    50095009            document->setPrinting(_private->printing);
    5010             document->authorStyleSheets().didChangeContentsOrInterpretation();
     5010            document->styleScope().didChangeContentsOrInterpretation();
    50115011        }
    50125012    }
Note: See TracChangeset for help on using the changeset viewer.