Changeset 101593 in webkit


Ignore:
Timestamp:
Nov 30, 2011 7:43:09 PM (12 years ago)
Author:
mihnea@adobe.com
Message:

[CSSRegions]Rename CSSRegionStyleRule to WebKitCSSRegionRule
​https://bugs.webkit.org/show_bug.cgi?id=73450

Reviewed by Andreas Kling.

No functionality changed so no new tests. The new name has the webkit prefix as required for new api.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSParser.cpp:

(WebCore::CSSParser::createRegionStylingRule):

  • css/CSSRule.cpp:

(WebCore::CSSRule::cssText):
(WebCore::CSSRule::destroy):

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::addRegionStyleRule):
(WebCore::CSSStyleSelector::checkRegionStyle):
(WebCore::RuleSet::addRulesFromSheet):

  • css/CSSStyleSelector.h:
  • css/WebKitCSSRegionRule.cpp: Renamed from Source/WebCore/css/CSSRegionStyleRule.cpp.

(WebCore::WebKitCSSRegionRule::WebKitCSSRegionRule):
(WebCore::WebKitCSSRegionRule::~WebKitCSSRegionRule):
(WebCore::WebKitCSSRegionRule::cssText):

  • css/WebKitCSSRegionRule.h: Renamed from Source/WebCore/css/CSSRegionStyleRule.h.
Location:
trunk/Source/WebCore
Files:
11 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r101578 r101593  
    456456    css/CSSPropertySourceData.cpp
    457457    css/CSSReflectValue.cpp
    458     css/CSSRegionStyleRule.cpp
    459458    css/CSSRule.cpp
    460459    css/CSSRuleList.cpp
    … …  
    493492    css/WebKitCSSKeyframesRule.cpp
    494493    css/WebKitCSSMatrix.cpp
     494    css/WebKitCSSRegionRule.cpp
    495495    css/WebKitCSSTransformValue.cpp
    496496

  • trunk/Source/WebCore/ChangeLog

    r101592 r101593  
     12011-11-30  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]Rename CSSRegionStyleRule to WebKitCSSRegionRule
     4        https://bugs.webkit.org/show_bug.cgi?id=73450
     5
     6        Reviewed by Andreas Kling.
     7
     8        No functionality changed so no new tests. The new name has the webkit prefix as required for new api.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * Target.pri:
     13        * WebCore.gypi:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * css/CSSParser.cpp:
     17        (WebCore::CSSParser::createRegionStylingRule):
     18        * css/CSSRule.cpp:
     19        (WebCore::CSSRule::cssText):
     20        (WebCore::CSSRule::destroy):
     21        * css/CSSStyleSelector.cpp:
     22        (WebCore::CSSStyleSelector::addRegionStyleRule):
     23        (WebCore::CSSStyleSelector::checkRegionStyle):
     24        (WebCore::RuleSet::addRulesFromSheet):
     25        * css/CSSStyleSelector.h:
     26        * css/WebKitCSSRegionRule.cpp: Renamed from Source/WebCore/css/CSSRegionStyleRule.cpp.
     27        (WebCore::WebKitCSSRegionRule::WebKitCSSRegionRule):
     28        (WebCore::WebKitCSSRegionRule::~WebKitCSSRegionRule):
     29        (WebCore::WebKitCSSRegionRule::cssText):
     30        * css/WebKitCSSRegionRule.h: Renamed from Source/WebCore/css/CSSRegionStyleRule.h.
     31
    1322011-11-30  Jeff Timanus  <twiz@chromium.org>
    233

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

    r101578 r101593  
    10421042        Source/WebCore/css/CSSReflectValue.cpp \
    10431043        Source/WebCore/css/CSSReflectValue.h \
    1044         Source/WebCore/css/CSSRegionStyleRule.cpp \
    1045         Source/WebCore/css/CSSRegionStyleRule.h \
    10461044        Source/WebCore/css/CSSRule.cpp \
    10471045        Source/WebCore/css/CSSRule.h \
    … …  
    11231121        Source/WebCore/css/WebKitCSSMatrix.cpp \
    11241122        Source/WebCore/css/WebKitCSSMatrix.h \
     1123        Source/WebCore/css/WebKitCSSRegionRule.cpp \
     1124        Source/WebCore/css/WebKitCSSRegionRule.h \
    11251125        Source/WebCore/css/WebKitCSSShaderValue.cpp \
    11261126        Source/WebCore/css/WebKitCSSShaderValue.h \

  • trunk/Source/WebCore/Target.pri

    r101578 r101593  
    422422    css/CSSPropertySourceData.cpp \
    423423    css/CSSReflectValue.cpp \
    424     css/CSSRegionStyleRule.cpp \
    425424    css/CSSRule.cpp \
    426425    css/CSSRuleList.cpp \
    … …  
    459458    css/WebKitCSSKeyframesRule.cpp \
    460459    css/WebKitCSSMatrix.cpp \
     460    css/WebKitCSSRegionRule.cpp \
    461461    css/WebKitCSSShaderValue.cpp \
    462462    css/WebKitCSSTransformValue.cpp \
    … …  
    15171517    css/CSSPropertyLonghand.h \
    15181518    css/CSSReflectValue.h \
    1519     css/CSSRegionStyleRule.h \
    15201519    css/CSSRule.h \
    15211520    css/CSSRuleList.h \
    … …  
    15551554    css/WebKitCSSKeyframesRule.h \
    15561555    css/WebKitCSSMatrix.h \
     1556    css/WebKitCSSRegionRule.h \
    15571557    css/WebKitCSSShaderValue.h \
    15581558    css/WebKitCSSTransformValue.h \

  • trunk/Source/WebCore/WebCore.gypi

    r101578 r101593  
    24102410            'css/CSSPropertySourceData.cpp',
    24112411            'css/CSSReflectValue.cpp',
    2412             'css/CSSRegionStyleRule.cpp',
    2413             'css/CSSRegionStyleRule.h',
    24142412            'css/CSSRule.cpp',
    24152413            'css/CSSRule.h',
    … …  
    24852483            'css/WebKitCSSMatrix.cpp',
    24862484            'css/WebKitCSSMatrix.h',
     2485            'css/WebKitCSSRegionRule.cpp',
     2486            'css/WebKitCSSRegionRule.h',
    24872487            'css/WebKitCSSShaderValue.cpp',
    24882488            'css/WebKitCSSShaderValue.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r101517 r101593  
    3267532675                        </File>
    3267632676                        <File
    32677                                 RelativePath="..\css\CSSRegionStyleRule.cpp"
    32678                                 >
    32679                         </File>
    32680                         <File
    32681                                 RelativePath="..\css\CSSRegionStyleRule.h"
     32677                                RelativePath="..\css\WebKitCSSRegionRule.cpp"
     32678                                >
     32679                        </File>
     32680                        <File
     32681                                RelativePath="..\css\WebKitCSSRegionRule.h"
    3268232682                                >
    3268332683                        </File>

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

    r101578 r101593  
    29272927                8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */; };
    29282928                8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */; };
    2929                 8AA61CFF144D595B00F37350 /* CSSRegionStyleRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */; };
    2930                 8AA61D00144D595B00F37350 /* CSSRegionStyleRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */; };
     2929                8AA61CFF144D595B00F37350 /* WebKitCSSRegionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AA61CFD144D595B00F37350 /* WebKitCSSRegionRule.cpp */; };
     2930                8AA61D00144D595B00F37350 /* WebKitCSSRegionRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AA61CFE144D595B00F37350 /* WebKitCSSRegionRule.h */; };
    29312931                8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */; };
    29322932                8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */; };
    … …  
    1013210132                8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformanceTiming.cpp; sourceTree = "<group>"; };
    1013310133                8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformanceTiming.h; sourceTree = "<group>"; };
    10134                 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSRegionStyleRule.cpp; sourceTree = "<group>"; };
    10135                 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSRegionStyleRule.h; sourceTree = "<group>"; };
     10134                8AA61CFD144D595B00F37350 /* WebKitCSSRegionRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSRegionRule.cpp; sourceTree = "<group>"; };
     10135                8AA61CFE144D595B00F37350 /* WebKitCSSRegionRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSRegionRule.h; sourceTree = "<group>"; };
    1013610136                8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IgnoreDestructiveWriteCountIncrementer.h; sourceTree = "<group>"; };
    1013710137                8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceNavigation.cpp; sourceTree = "<group>"; };
    … …  
    2071420714                                BC5A12DD0DC0414800C9AFAD /* CSSReflectValue.cpp */,
    2071520715                                BC5A12DE0DC0414800C9AFAD /* CSSReflectValue.h */,
    20716                                 8AA61CFD144D595B00F37350 /* CSSRegionStyleRule.cpp */,
    20717                                 8AA61CFE144D595B00F37350 /* CSSRegionStyleRule.h */,
    2071820716                                A80E6CDC0A1989CA007FB8C5 /* CSSRule.cpp */,
    2071920717                                A80E6CE30A1989CA007FB8C5 /* CSSRule.h */,
    … …  
    2083120829                                498391560F1E776900C23782 /* WebKitCSSMatrix.h */,
    2083220830                                498391570F1E776900C23782 /* WebKitCSSMatrix.idl */,
     20831                                8AA61CFD144D595B00F37350 /* WebKitCSSRegionRule.cpp */,
     20832                                8AA61CFE144D595B00F37350 /* WebKitCSSRegionRule.h */,
    2083320833                                50B42157146976960087E604 /* WebKitCSSShaderValue.h */,
    2083420834                                BC9ADD7F0CC4092200098C4C /* WebKitCSSTransformValue.cpp */,
    … …  
    2471524715                                49AF2D6914435D050016A784 /* DisplayRefreshMonitor.h in Headers */,
    2471624716                                0753860314489E9800B78452 /* CachedTextTrack.h in Headers */,
    24717                                 8AA61D00144D595B00F37350 /* CSSRegionStyleRule.h in Headers */,
     24717                                8AA61D00144D595B00F37350 /* WebKitCSSRegionRule.h in Headers */,
    2471824718                                97665013144FAA4200F6BB51 /* EventFactory.h in Headers */,
    2471924719                                A0EE0DF6144F825500F80B0D /* WebGLDebugRendererInfo.h in Headers */,
    … …  
    2759927599                                49FC7A501444AF5F00A5D864 /* DisplayRefreshMonitor.cpp in Sources */,
    2760027600                                0753860214489E9800B78452 /* CachedTextTrack.cpp in Sources */,
    27601                                 8AA61CFF144D595B00F37350 /* CSSRegionStyleRule.cpp in Sources */,
     27601                                8AA61CFF144D595B00F37350 /* WebKitCSSRegionRule.cpp in Sources */,
    2760227602                                9766504F144FBFFE00F6BB51 /* EventFactory.cpp in Sources */,
    2760327603                                A0EE0DF5144F825500F80B0D /* WebGLDebugRendererInfo.cpp in Sources */,

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

    r101504 r101593  
    5151#include "CSSPropertySourceData.h"
    5252#include "CSSReflectValue.h"
    53 #include "CSSRegionStyleRule.h"
    5453#include "CSSRuleList.h"
    5554#include "CSSSelector.h"
    … …  
    8180#include "WebKitCSSKeyframeRule.h"
    8281#include "WebKitCSSKeyframesRule.h"
     82#include "WebKitCSSRegionRule.h"
    8383#include "WebKitCSSTransformValue.h"
    8484#if ENABLE(CSS_SHADERS)
    … …  
    77327732    m_allowImportRules = m_allowNamespaceDeclarations = false;
    77337733
    7734     RefPtr<CSSRegionStyleRule> regionRule = CSSRegionStyleRule::create(m_styleSheet, regionSelector, rules);
    7735 
    7736     CSSRegionStyleRule* result = regionRule.get();
     7734    RefPtr<WebKitCSSRegionRule> regionRule = WebKitCSSRegionRule::create(m_styleSheet, regionSelector, rules);
     7735
     7736    WebKitCSSRegionRule* result = regionRule.get();
    77377737    m_parsedRules.append(regionRule.release());
    77387738

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

    r99171 r101593  
    2828#include "CSSMediaRule.h"
    2929#include "CSSPageRule.h"
    30 #include "CSSRegionStyleRule.h"
    3130#include "CSSStyleRule.h"
    3231#include "CSSUnknownRule.h"
    3332#include "WebKitCSSKeyframeRule.h"
    3433#include "WebKitCSSKeyframesRule.h"
     34#include "WebKitCSSRegionRule.h"
    3535#include "NotImplemented.h"
    3636
    … …  
    6363        return static_cast<const WebKitCSSKeyframeRule*>(this)->cssText();
    6464    case WEBKIT_REGION_STYLE_RULE:
    65         return static_cast<const CSSRegionStyleRule*>(this)->cssText();
     65        return static_cast<const WebKitCSSRegionRule*>(this)->cssText();
    6666    }
    6767    ASSERT_NOT_REACHED();
    … …  
    100100        return;
    101101    case WEBKIT_REGION_STYLE_RULE:
    102         delete static_cast<CSSRegionStyleRule*>(this);
     102        delete static_cast<WebKitCSSRegionRule*>(this);
    103103        return;
    104104    }

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

    r101524 r101593  
    4646#include "CSSPropertyNames.h"
    4747#include "CSSReflectValue.h"
    48 #include "CSSRegionStyleRule.h"
    4948#include "CSSRuleList.h"
    5049#include "CSSSelector.h"
    … …  
    109108#include "WebKitCSSKeyframeRule.h"
    110109#include "WebKitCSSKeyframesRule.h"
     110#include "WebKitCSSRegionRule.h"
    111111#include "WebKitCSSTransformValue.h"
    112112#include "WebKitFontFamilyNames.h"
    … …  
    426426}
    427427
    428 void CSSStyleSelector::addRegionStyleRule(PassRefPtr<CSSRegionStyleRule> regionStyleRule)
     428void CSSStyleSelector::addRegionStyleRule(PassRefPtr<WebKitCSSRegionRule> regionStyleRule)
    429429{
    430430    m_regionStyleRules.append(regionStyleRule);
    … …  
    16751675    m_checker.setPseudoStyle(NOPSEUDO);
    16761676
    1677     for (Vector<RefPtr<CSSRegionStyleRule> >::iterator it = m_regionStyleRules.begin(); it != m_regionStyleRules.end(); ++it) {
     1677    for (Vector<RefPtr<WebKitCSSRegionRule> >::iterator it = m_regionStyleRules.begin(); it != m_regionStyleRules.end(); ++it) {
    16781678        const CSSSelectorList& regionSelectorList = (*it)->selectorList();
    16791679        for (CSSSelector* s = regionSelectorList.first(); s; s = regionSelectorList.next(s)) {
    … …  
    19711971            styleSelector->addKeyframeStyle(static_cast<WebKitCSSKeyframesRule*>(rule));
    19721972        else if (rule->isRegionStyleRule() && styleSelector)
    1973             styleSelector->addRegionStyleRule(static_cast<CSSRegionStyleRule*>(rule));
     1973            styleSelector->addRegionStyleRule(static_cast<WebKitCSSRegionRule*>(rule));
    19741974    }
    19751975    if (m_autoShrinkToFitEnabled)

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

    r101524 r101593  
    4747class CSSImageGeneratorValue;
    4848class CSSImageValue;
    49 class CSSRegionStyleRule;
    5049class CSSRuleList;
    5150class CSSSelector;
    … …  
    7776class WebKitCSSKeyframesRule;
    7877class WebKitCSSFilterValue;
     78class WebKitCSSRegionRule;
    7979class WebKitCSSShaderValue;
    8080
    … …  
    201201    void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule>);
    202202    void addPageStyle(PassRefPtr<CSSPageRule>);
    203     void addRegionStyleRule(PassRefPtr<CSSRegionStyleRule>);
     203    void addRegionStyleRule(PassRefPtr<WebKitCSSRegionRule>);
    204204
    205205    bool checkRegionStyle(Element*);
    … …  
    290290    KeyframesRuleMap m_keyframesRuleMap;
    291291
    292     typedef Vector<RefPtr<CSSRegionStyleRule> > RegionStyleRules;
     292    typedef Vector<RefPtr<WebKitCSSRegionRule> > RegionStyleRules;
    293293    RegionStyleRules m_regionStyleRules;
    294294

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

    r101592 r101593  
    3030#include "config.h"
    3131
    32 #include "CSSRegionStyleRule.h"
     32#include "WebKitCSSRegionRule.h"
    3333
    3434#include "CSSParserValues.h"
    … …  
    3636
    3737namespace WebCore {
    38 CSSRegionStyleRule::CSSRegionStyleRule(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules)
     38WebKitCSSRegionRule::WebKitCSSRegionRule(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules)
    3939    : CSSRule(parent, CSSRule::WEBKIT_REGION_STYLE_RULE)
    4040    , m_ruleList(rules)
    … …  
    4646}
    4747
    48 CSSRegionStyleRule::~CSSRegionStyleRule()
     48WebKitCSSRegionRule::~WebKitCSSRegionRule()
    4949{
    5050    for (unsigned index = 0; index < m_ruleList->length(); ++index)
    … …  
    5252}
    5353
    54 String CSSRegionStyleRule::cssText() const
     54String WebKitCSSRegionRule::cssText() const
    5555{
    5656    String result = "@-webkit-region ";

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

    r101592 r101593  
    2828 */
    2929
    30 #ifndef CSSRegionStyleRule_h
    31 #define CSSRegionStyleRule_h
     30#ifndef WebKitCSSRegionRule_h
     31#define WebKitCSSRegionRule_h
    3232
    3333#include "CSSSelectorList.h"
    … …  
    4343class CSSRuleList;
    4444
    45 class CSSRegionStyleRule: public CSSRule {
     45class WebKitCSSRegionRule: public CSSRule {
    4646public:
    47     static PassRefPtr<CSSRegionStyleRule> create(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules)
     47    static PassRefPtr<WebKitCSSRegionRule> create(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules)
    4848    {
    49         return adoptRef(new CSSRegionStyleRule(parent, selectors, rules));
     49        return adoptRef(new WebKitCSSRegionRule(parent, selectors, rules));
    5050    }
    5151
    52     ~CSSRegionStyleRule();
     52    ~WebKitCSSRegionRule();
    5353
    5454    String cssText() const;
    … …  
    5757
    5858private:
    59     CSSRegionStyleRule(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules);
     59    WebKitCSSRegionRule(CSSStyleSheet* parent, Vector<OwnPtr<CSSParserSelector> >* selectors, PassRefPtr<CSSRuleList> rules);
    6060
    6161    CSSSelectorList m_selectorList;
Note: See TracChangeset for help on using the changeset viewer.