Changeset 92792 in webkit


Ignore:
Timestamp:
Aug 10, 2011 1:36:55 PM (13 years ago)
Author:
hyatt@apple.com
Message:

​https://bugs.webkit.org/show_bug.cgi?id=66004

Source/WebCore:

Remove ifdefs for CSS Exclusions (since the feature doesn't exist any longer and has morphed into positioned
floats instead). Go ahead and yank the ifdefs for CSS Regions also and just turn them on.

Reviewed by Adam Roben.

  • Configurations/FeatureDefines.xcconfig:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseWrapShape):
(WebCore::CSSParser::parseFromFlowContent):

  • css/CSSParser.h:
  • css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::init):
(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::getStringValue):
(WebCore::CSSPrimitiveValue::cssText):

  • css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::getShapeValue):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::operator RegionOverflow):

  • css/CSSPropertyNames.in:
  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

  • css/CSSValueKeywords.in:
  • css/CSSWrapShapes.cpp:
  • css/CSSWrapShapes.h:
  • css/SVGCSSValueKeywords.in:
  • dom/Node.cpp:

(WebCore::Node::diff):

  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):
(WebCore::NodeRenderingContext::setStyle):
(WebCore::NodeRenderingContext::nextRenderer):
(WebCore::NodeRenderingContext::previousRenderer):
(WebCore::NodeRenderingContext::parentRenderer):
(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
(WebCore::NodeRendererFactory::createRendererIfNeeded):

  • dom/NodeRenderingContext.h:
  • rendering/RenderFlowThread.cpp:
  • rendering/RenderFlowThread.h:
  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::collectLayers):

  • rendering/RenderObject.cpp:

(WebCore::RenderObject::createObject):

  • rendering/RenderObject.h:

(WebCore::RenderObject::isRenderRegion):
(WebCore::RenderObject::isRenderFlowThread):

  • rendering/RenderRegion.cpp:
  • rendering/RenderRegion.h:
  • rendering/RenderTreeAsText.cpp:

(WebCore::writeLayers):

  • rendering/RenderView.cpp:

(WebCore::RenderView::renderFlowThreadWithName):

  • rendering/RenderView.h:
  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

  • rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::regionOverflow):
(WebCore::InheritedFlags::setRegionOverflow):
(WebCore::InheritedFlags::initialWrapShape):
(WebCore::InheritedFlags::initialRegionOverflow):

  • rendering/style/RenderStyleConstants.h:
  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

  • rendering/style/StyleRareNonInheritedData.h:

Source/WebKit/mac:

Removing the CSS Regions and Exclusions ifdefs.

Reviewed by Adam Roben.

  • Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

Removing the CSS Regions and CSS Exclusions ifdefs.

Reviewed by Adam Roben.

  • Configurations/FeatureDefines.xcconfig:

Tools:

Remove the regions and exclusions bots and also the flags in build-webkit, since I'm just turning
the code on by default.

Reviewed by Adam Roben.

  • BuildSlaveSupport/build.webkit.org-config/config.json:
  • Scripts/build-webkit:

LayoutTests:

Removing ifdefs for CSS Exclusions and CSS Regions. The code is now on by default, so the new CSS
properties are showing up in the computed style results.

Reviewed by Adam Roben.

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r92791 r92792  
     12011-08-10  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=66004
     4
     5        Removing ifdefs for CSS Exclusions and CSS Regions. The code is now on by default, so the new CSS
     6        properties are showing up in the computed style results.
     7
     8        Reviewed by Adam Roben.
     9
     10        * fast/css/getComputedStyle/computed-style-expected.txt:
     11        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     12        * svg/css/getComputedStyle-basic-expected.txt:
     13
    1142011-08-10  Abhishek Arya  <inferno@chromium.org>
    215

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r87121 r92792  
    187187-webkit-user-select: text;
    188188-webkit-writing-mode: horizontal-tb;
     189-webkit-flow: auto;
     190-webkit-content-order: 0;
     191-webkit-region-overflow: auto;
    189192clip-path: none;
    190193clip-rule: nonzero;

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r87121 r92792  
    186186    -webkit-user-select: text
    187187    -webkit-writing-mode: horizontal-tb
     188    -webkit-flow: auto
     189    -webkit-content-order: 0
     190    -webkit-region-overflow: auto
    188191    clip-path: none
    189192    clip-rule: nonzero

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r87121 r92792  
    371371rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    372372rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
     373rect: style.getPropertyValue(-webkit-flow) : auto
     374rect: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     375rect: style.getPropertyValue(-webkit-content-order) : 0
     376rect: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]
     377rect: style.getPropertyValue(-webkit-region-overflow) : auto
     378rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    373379rect: style.getPropertyValue(clip-path) : none
    374380rect: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]
    … …  
    817823g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
    818824g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
     825g: style.getPropertyValue(-webkit-flow) : auto
     826g: style.getPropertyCSSValue(-webkit-flow) : [object CSSPrimitiveValue]
     827g: style.getPropertyValue(-webkit-content-order) : 0
     828g: style.getPropertyCSSValue(-webkit-content-order) : [object CSSPrimitiveValue]
     829g: style.getPropertyValue(-webkit-region-overflow) : auto
     830g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
    819831g: style.getPropertyValue(clip-path) : none
    820832g: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r92791 r92792  
     12011-08-10  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=66004
     4
     5        Remove ifdefs for CSS Exclusions (since the feature doesn't exist any longer and has morphed into positioned
     6        floats instead). Go ahead and yank the ifdefs for CSS Regions also and just turn them on.
     7
     8        Reviewed by Adam Roben.
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11        * css/CSSComputedStyleDeclaration.cpp:
     12        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     13        * css/CSSParser.cpp:
     14        (WebCore::CSSParser::parseValue):
     15        (WebCore::CSSParser::parseContent):
     16        (WebCore::CSSParser::parseWrapShape):
     17        (WebCore::CSSParser::parseFromFlowContent):
     18        * css/CSSParser.h:
     19        * css/CSSPrimitiveValue.cpp:
     20        (WebCore::CSSPrimitiveValue::init):
     21        (WebCore::CSSPrimitiveValue::cleanup):
     22        (WebCore::CSSPrimitiveValue::getStringValue):
     23        (WebCore::CSSPrimitiveValue::cssText):
     24        * css/CSSPrimitiveValue.h:
     25        (WebCore::CSSPrimitiveValue::getShapeValue):
     26        * css/CSSPrimitiveValueMappings.h:
     27        (WebCore::CSSPrimitiveValue::operator RegionOverflow):
     28        * css/CSSPropertyNames.in:
     29        * css/CSSStyleSelector.cpp:
     30        (WebCore::CSSStyleSelector::applyProperty):
     31        * css/CSSValueKeywords.in:
     32        * css/CSSWrapShapes.cpp:
     33        * css/CSSWrapShapes.h:
     34        * css/SVGCSSValueKeywords.in:
     35        * dom/Node.cpp:
     36        (WebCore::Node::diff):
     37        * dom/NodeRenderingContext.cpp:
     38        (WebCore::NodeRenderingContext::NodeRenderingContext):
     39        (WebCore::NodeRenderingContext::setStyle):
     40        (WebCore::NodeRenderingContext::nextRenderer):
     41        (WebCore::NodeRenderingContext::previousRenderer):
     42        (WebCore::NodeRenderingContext::parentRenderer):
     43        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
     44        (WebCore::NodeRendererFactory::createRendererIfNeeded):
     45        * dom/NodeRenderingContext.h:
     46        * rendering/RenderFlowThread.cpp:
     47        * rendering/RenderFlowThread.h:
     48        * rendering/RenderLayer.cpp:
     49        (WebCore::RenderLayer::collectLayers):
     50        * rendering/RenderObject.cpp:
     51        (WebCore::RenderObject::createObject):
     52        * rendering/RenderObject.h:
     53        (WebCore::RenderObject::isRenderRegion):
     54        (WebCore::RenderObject::isRenderFlowThread):
     55        * rendering/RenderRegion.cpp:
     56        * rendering/RenderRegion.h:
     57        * rendering/RenderTreeAsText.cpp:
     58        (WebCore::writeLayers):
     59        * rendering/RenderView.cpp:
     60        (WebCore::RenderView::renderFlowThreadWithName):
     61        * rendering/RenderView.h:
     62        * rendering/style/RenderStyle.cpp:
     63        (WebCore::RenderStyle::diff):
     64        * rendering/style/RenderStyle.h:
     65        (WebCore::InheritedFlags::regionOverflow):
     66        (WebCore::InheritedFlags::setRegionOverflow):
     67        (WebCore::InheritedFlags::initialWrapShape):
     68        (WebCore::InheritedFlags::initialRegionOverflow):
     69        * rendering/style/RenderStyleConstants.h:
     70        * rendering/style/StyleRareNonInheritedData.cpp:
     71        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     72        (WebCore::StyleRareNonInheritedData::operator==):
     73        * rendering/style/StyleRareNonInheritedData.h:
     74
    1752011-08-10  Abhishek Arya  <inferno@chromium.org>
    276

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r92333 r92792  
    5555ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
    5656ENABLE_CSS3_FLEXBOX = ;
    57 ENABLE_CSS_EXCLUSIONS = ;
    58 ENABLE_CSS_REGIONS = ;
    5957ENABLE_DATABASE = ENABLE_DATABASE;
    6058ENABLE_DATA_TRANSFER_ITEMS = ;
    … …  
    10199ENABLE_XSLT = ENABLE_XSLT;
    102100
    103 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     101FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

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

    r92457 r92792  
    248248    CSSPropertyWebkitUserModify,
    249249    CSSPropertyWebkitUserSelect,
    250     CSSPropertyWebkitWritingMode
    251 #if ENABLE(CSS_REGIONS)
    252     , CSSPropertyWebkitFlow
    253     , CSSPropertyWebkitContentOrder
    254     , CSSPropertyWebkitRegionOverflow
    255 #endif
     250    CSSPropertyWebkitWritingMode,
     251    CSSPropertyWebkitFlow,
     252    CSSPropertyWebkitContentOrder,
     253    CSSPropertyWebkitRegionOverflow
    256254#if ENABLE(SVG)
    257255    ,
    … …  
    16821680        case CSSPropertyCounterReset:
    16831681            return counterToCSSValue(style.get(), propertyID, primitiveValueCache);
    1684 #if ENABLE(CSS_REGIONS)
    16851682        case CSSPropertyWebkitFlow:
    16861683            if (style->flowThread().isNull())
    … …  
    16911688        case CSSPropertyWebkitRegionOverflow:
    16921689            return primitiveValueCache->createValue(style->regionOverflow());
    1693 #endif
     1690
    16941691        /* Shorthand properties, currently not supported see bug 13658*/
    16951692        case CSSPropertyBackground:
    … …  
    18001797            break;
    18011798
    1802 #if ENABLE(CSS_EXCLUSIONS)
    18031799        case CSSPropertyWebkitWrapShape:
    18041800            if (!style->wrapShape())
    … …  
    18061802
    18071803            return primitiveValueCache->createValue(style->wrapShape());
    1808 #endif
    18091804
    18101805#if ENABLE(SVG)

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

    r92588 r92792  
    15901590        break;
    15911591#endif
    1592 #if ENABLE(CSS_REGIONS)
     1592
    15931593    case CSSPropertyWebkitFlow:
    15941594        return parseFlowThread(propId, important);
    … …  
    16001600            validPrimitive = true;
    16011601        break;
    1602 #endif
     1602
    16031603    case CSSPropertyWebkitUserDrag: // auto | none | element
    16041604        if (id == CSSValueAuto || id == CSSValueNone || id == CSSValueElement)
    … …  
    20932093        break;
    20942094
    2095 #if ENABLE(CSS_EXCLUSIONS)
    20962095    case CSSPropertyWebkitWrapShape:
    20972096        if (id == CSSValueAuto)
    … …  
    21002099            return parseWrapShape(important);
    21012100        break;
    2102 #endif
    21032101
    21042102#if ENABLE(SVG)
    … …  
    26822680                if (!parseGeneratedImage(parsedValue))
    26832681                    return false;
    2684 #if ENABLE(CSS_REGIONS)
    26852682            } else if (equalIgnoringCase(val->function->name, "-webkit-from-flow(")) {
    26862683                parsedValue = parseFromFlowContent(args);
    26872684                if (!parsedValue)
    26882685                    return false;
    2689 #endif
    26902686            } else
    26912687                return false;
    … …  
    36743670}
    36753671
    3676 #if ENABLE(CSS_EXCLUSIONS)
    36773672PassRefPtr<CSSWrapShape> CSSParser::parseWrapShapeRect(CSSParserValueList* args)
    36783673{
    … …  
    39003895    return false;
    39013896}
    3902 #endif // ENABLE(CSS_EXCLUSIONS)
    39033897
    39043898// [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? 'font-family'
    … …  
    60956089}
    60966090
    6097 #if ENABLE(CSS_REGIONS)
    60986091// auto | <flow_name>
    60996092bool CSSParser::parseFlowThread(int propId, bool important)
    … …  
    61406133    return CSSPrimitiveValue::create(argFlowThreadName->string, CSSPrimitiveValue::CSS_FROM_FLOW);
    61416134}
    6142 #endif
    61436135
    61446136bool CSSParser::parseTransformOrigin(int propId, int& propId1, int& propId2, int& propId3, RefPtr<CSSValue>& value, RefPtr<CSSValue>& value2, RefPtr<CSSValue>& value3)

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

    r92457 r92792  
    5353    class WebKitCSSKeyframeRule;
    5454    class WebKitCSSKeyframesRule;
    55 
    56 #if ENABLE(CSS_EXCLUSIONS)
    5755    class CSSWrapShape;
    58 #endif
    5956
    6057    class CSSParser {
    … …  
    130127        bool parseShape(int propId, bool important);
    131128
    132 #if ENABLE(CSS_EXCLUSIONS)
    133129        bool parseWrapShape(bool important);
    134130        PassRefPtr<CSSWrapShape> parseWrapShapeRect(CSSParserValueList* args);
    … …  
    136132        PassRefPtr<CSSWrapShape> parseWrapShapeEllipse(CSSParserValueList* args);
    137133        PassRefPtr<CSSWrapShape> parseWrapShapePolygon(CSSParserValueList* args);
    138 #endif
    139134
    140135        bool parseFont(bool important);
    … …  
    169164#endif
    170165
    171 #if ENABLE(CSS_REGIONS)
    172         bool parseFlowThread(int propId, bool important);
    173         PassRefPtr<CSSValue> parseFromFlowContent(CSSParserValueList*);
    174 #endif
    175166        // CSS3 Parsing Routines (for properties specific to CSS3)
    176167        bool parseShadow(int propId, bool important);
    … …  
    200191        bool parseFontFeatureTag(CSSValueList*);
    201192        bool parseFontFeatureSettings(bool important);
     193
     194        bool parseFlowThread(int propId, bool important);
     195        PassRefPtr<CSSValue> parseFromFlowContent(CSSParserValueList*);
    202196
    203197        int yyparse();

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

    r91969 r92792  
    212212}
    213213
    214 #if ENABLE(CSS_EXCLUSIONS)
    215214void CSSPrimitiveValue::init(PassRefPtr<CSSWrapShape> shape)
    216215{
    … …  
    219218    m_value.shape = shape.releaseRef();
    220219}
    221 #endif
    222220
    223221CSSPrimitiveValue::~CSSPrimitiveValue()
    … …  
    232230        case CSS_URI:
    233231        case CSS_ATTR:
    234 #if ENABLE(CSS_REGIONS)
    235232        case CSS_FROM_FLOW:
    236 #endif
    237233        case CSS_PARSER_HEXCOLOR:
    238234            if (m_value.string)
    … …  
    254250            break;
    255251#endif
    256 #if ENABLE(CSS_EXCLUSIONS)
    257252        case CSS_SHAPE:
    258253            m_value.shape->deref();
    259254            break;
    260 #endif
    261255        default:
    262256            break;
    … …  
    522516        case CSS_ATTR:
    523517        case CSS_URI:
    524 #if ENABLE(CSS_REGIONS)
    525518        case CSS_FROM_FLOW:
    526 #endif
    527519            return m_value.string;
    528520        case CSS_IDENT:
    … …  
    542534        case CSS_ATTR:
    543535        case CSS_URI:
    544 #if ENABLE(CSS_REGIONS)
    545536        case CSS_FROM_FLOW:
    546 #endif
    547537             return m_value.string;
    548538        case CSS_IDENT:
    … …  
    708698            text = quoteCSSStringIfNeeded(m_value.string);
    709699            break;
    710 #if ENABLE(CSS_REGIONS)
    711700        case CSS_FROM_FLOW:
    712701            text = "-webkit-from-flow(" + quoteCSSStringIfNeeded(m_value.string) + ")";
    713702            break;
    714 #endif
    715703        case CSS_URI:
    716704            text = "url(" + quoteCSSURLIfNeeded(m_value.string) + ")";
    … …  
    844832            text = quoteCSSStringIfNeeded(m_value.string);
    845833            break;
    846 #if ENABLE(CSS_EXCLUSIONS)
    847834        case CSS_SHAPE:
    848835            text = m_value.shape->cssText();
    849836            break;
    850 #endif
    851837    }
    852838

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

    r92253 r92792  
    3737class Rect;
    3838class RenderStyle;
    39 
    40 #if ENABLE(CSS_EXCLUSIONS)
    4139class CSSWrapShape;
    42 #endif
    4340
    4441struct Length;
    … …  
    188185    DashboardRegion* getDashboardRegionValue() const { return m_type != CSS_DASHBOARD_REGION ? 0 : m_value.region; }
    189186
    190 #if ENABLE(CSS_EXCLUSIONS)
    191187    CSSWrapShape* getShapeValue() const { return m_type != CSS_SHAPE ? 0 : m_value.shape; }
    192 #endif
    193188
    194189    int getIdent() const;
    … …  
    231226    void init(PassRefPtr<Pair>);
    232227    void init(PassRefPtr<DashboardRegion>); // FIXME: Dashboard region should not be a primitive value.
    233 #if ENABLE(CSS_EXCLUSIONS)
    234228    void init(PassRefPtr<CSSWrapShape>);
    235 #endif
     229
    236230    bool getDoubleValueInternal(UnitTypes targetUnitType, double* result) const;
    237231
    … …  
    253247        Pair* pair;
    254248        DashboardRegion* region;
    255 #if ENABLE(CSS_EXCLUSIONS)
    256249        CSSWrapShape* shape;
    257 #endif
    258250    } m_value;
    259251};

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

    r92628 r92792  
    14331433}
    14341434
    1435 #if ENABLE(CSS_REGIONS)
    14361435template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionOverflow e)
    14371436    : m_type(CSS_IDENT)
    … …  
    14601459    }
    14611460}
    1462 #endif
    14631461
    14641462template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarqueeDirection e)

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r92457 r92792  
    328328-webkit-user-modify
    329329-webkit-user-select
    330 #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
    331330-webkit-flow
    332331-webkit-content-order
    333332-webkit-region-overflow
    334 #endif
    335 #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
    336333-webkit-wrap-shape
    337 #endif
     334

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

    r92749 r92792  
    40244024            return;
    40254025
    4026 #if ENABLE(CSS_REGIONS)
    40274026        CSSValueListInspector inspector = value;
    40284027        if (inspector.length() == 1 && inspector.first()->isPrimitiveValue()) {
    … …  
    40334032            }
    40344033        }
    4035 #endif
    40364034
    40374035        bool didSet = false;
    … …  
    46884686        return;
    46894687#endif
    4690 #if ENABLE(CSS_REGIONS)
     4688
    46914689    case CSSPropertyWebkitFlow:
    46924690        if (isInitial)
    … …  
    47084706        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(regionOverflow, RegionOverflow);
    47094707        return;
    4710 #endif
     4708
    47114709    case CSSPropertyWebkitMarqueeDirection:
    47124710        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marqueeDirection, MarqueeDirection)
    … …  
    50525050    }
    50535051   
    5054 #if ENABLE(CSS_EXCLUSIONS)
    50555052    case CSSPropertyWebkitWrapShape:
    50565053        HANDLE_INHERIT_AND_INITIAL(wrapShape, WrapShape);
    … …  
    50645061
    50655062        return;
    5066 #endif
    50675063
    50685064    // CSS Fonts Module Level 3

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r92457 r92792  
    820820-webkit-positioned
    821821
    822 #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
    823822// -webkit-wrap-shape
    824823nonzero
    825824evenodd
    826 #endif
    827 
    828 #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
     825
    829826// -webkit-region-overflow
    830827// auto
    831828-webkit-break
    832 #endif

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

    r90863 r92792  
    2929
    3030#include "config.h"
    31 
    32 #if ENABLE(CSS_EXCLUSIONS)
    3331
    3432#include "CSSWrapShapes.h"
    … …  
    148146} // namespace WebCore
    149147
    150 #endif // ENABLE(CSS_EXCLUSIONS)

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

    r90937 r92792  
    3030#ifndef CSSWrapShapes_h
    3131#define CSSWrapShapes_h
    32 
    33 #if ENABLE(CSS_EXCLUSIONS)
    3432
    3533#include "CSSPrimitiveValue.h"
    … …  
    173171} // namespace WebCore
    174172
    175 #endif // ENABLE(CSS_EXCLUSIONS)
    176 
    177173#endif // CSSWrapShapes_h

  • trunk/Source/WebCore/css/SVGCSSValueKeywords.in

    r90863 r92792  
    163163// CSS_PROP_CLIP_PATH
    164164// CSS_PROP_CLIP_RULE
    165 #if !defined(ENABLE_CSS_EXCLUSIONS) || !ENABLE_CSS_EXCLUSIONS
    166 // CSS exclusions also uses nonzero and evenodd, so don't duplicate the values
    167 // if ENABLED_CSS_EXCLUSIONS is enabled.
    168 nonzero
    169 evenodd
    170 #endif
     165// nonzero and evenodd part of core CSS values now.
    171166
    172167// CSS_PROP_MASK

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

    r92450 r92792  
    358358        ch = Detach;
    359359
    360 #if ENABLE(CSS_REGIONS)
    361360    // We need to reattach the node, so that it is moved to the correct RenderFlowThread.
    362361    if ((s1 && s2) && (s1->flowThread() != s2->flowThread()))
    … …  
    367366    if ((s1 && s2) && ((s1->regionThread() != s2->regionThread() || (s1->regionIndex() != s2->regionIndex()))))
    368367            ch = Detach;
    369 #endif
    370368
    371369    return ch;

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

    r91760 r92792  
    4747    , m_includer(0)
    4848    , m_style(0)
    49 #if ENABLE(CSS_REGIONS)
    5049    , m_parentFlowRenderer(0)
    51 #endif
    5250{
    5351    ContainerNode* parent = m_node->parentOrHostNode();
    … …  
    9088    , m_includer(0)
    9189    , m_style(style)
    92 #if ENABLE(CSS_REGIONS)
    9390    , m_parentFlowRenderer(0)
    94 #endif
    9591{
    9692}
    … …  
    10399{
    104100    m_style = style;
    105 #if ENABLE(CSS_REGIONS)
    106101    moveToFlowThreadIfNeeded();
    107 #endif
    108102}
    109103
    … …  
    167161        return renderer->nextSibling();
    168162
    169 #if ENABLE(CSS_REGIONS)
    170163    if (m_parentFlowRenderer)
    171164        return m_parentFlowRenderer->nextRendererForNode(m_node);
    172 #endif
    173165
    174166    if (m_phase == AttachContentForwarded) {
    … …  
    185177    for (Node* node = m_node->nextSibling(); node; node = node->nextSibling()) {
    186178        if (node->renderer()) {
    187 #if ENABLE(CSS_REGIONS)
    188179            // Do not return elements that are attached to a different flow-thread.
    189180            if (node->renderer()->style() && !node->renderer()->style()->flowThread().isEmpty())
    190181                continue;
    191 #endif
    192182            return node->renderer();
    193183        }
    … …  
    207197        return renderer->previousSibling();
    208198
    209 #if ENABLE(CSS_REGIONS)
    210199    if (m_parentFlowRenderer)
    211200        return m_parentFlowRenderer->previousRendererForNode(m_node);
    212 #endif
    213201
    214202    if (m_phase == AttachContentForwarded) {
    … …  
    222210    for (Node* node = m_node->previousSibling(); node; node = node->previousSibling()) {
    223211        if (node->renderer()) {
    224 #if ENABLE(CSS_REGIONS)
    225212            // Do not return elements that are attached to a different flow-thread.
    226213            if (node->renderer()->style() && !node->renderer()->style()->flowThread().isEmpty())
    227214                continue;
    228 #endif
    229215            return node->renderer();
    230216        }
    … …  
    245231    }
    246232
    247 #if ENABLE(CSS_REGIONS)
    248233    if (m_parentFlowRenderer)
    249234        return m_parentFlowRenderer;
    250 #endif
    251235
    252236    ASSERT(m_location != LocationUndetermined);
    … …  
    288272}
    289273
    290 #if ENABLE(CSS_REGIONS)
    291274void NodeRenderingContext::moveToFlowThreadIfNeeded()
    292275{
    … …  
    298281    m_parentFlowRenderer = m_node->document()->renderView()->renderFlowThreadWithName(m_flowThread);
    299282}
    300 #endif
    301283
    302284NodeRendererFactory::NodeRendererFactory(Node* node)
    … …  
    366348    RenderObject* newRenderer = createRendererAndStyle();
    367349
    368 #if ENABLE(CSS_REGIONS)
    369350    if (m_context.hasFlowThreadParent()) {
    370351        parentRenderer = m_context.parentFlowRenderer();
    … …  
    373354        nextRenderer = m_context.parentFlowRenderer()->nextRendererForNode(node);
    374355    }
    375 #endif
    376356
    377357#if ENABLE(FULLSCREEN_API)

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

    r91760 r92792  
    3636class Document;
    3737class Node;
     38class RenderFlowThread;
    3839class RenderObject;
    3940class RenderStyle;
    4041class ShadowContentElement;
    4142class ShadowRoot;
    42 
    43 #if ENABLE(CSS_REGIONS)
    44 class RenderFlowThread;
    45 #endif
    4643
    4744class NodeRenderingContext {
    … …  
    6663    void hostChildrenChanged();
    6764
    68 #if ENABLE(CSS_REGIONS)
    6965    bool hasFlowThreadParent() const { return m_parentFlowRenderer; }
    7066    RenderFlowThread* parentFlowRenderer() const { return m_parentFlowRenderer; }
    7167    void moveToFlowThreadIfNeeded();
    72 #endif
     68
    7369private:
    7470
    … …  
    9389    ShadowContentElement* m_includer;
    9490    RefPtr<RenderStyle> m_style;
    95 #if ENABLE(CSS_REGIONS)
    9691    RenderFlowThread* m_parentFlowRenderer;
    9792    AtomicString m_flowThread;
    98 #endif
    9993};
    10094

  • trunk/Source/WebCore/rendering/RenderFlowThread.cpp

    r91760 r92792  
    3030#include "config.h"
    3131
    32 #if ENABLE(CSS_REGIONS)
    33 
    3432#include "RenderFlowThread.h"
    35 
    3633#include "Node.h"
    3734
    … …  
    115112
    116113} // namespace WebCore
    117 
    118 #endif // ENABLE(CSS_REGIONS)

  • trunk/Source/WebCore/rendering/RenderFlowThread.h

    r91760 r92792  
    3131#define RenderFlowThread_h
    3232
    33 #if ENABLE(CSS_REGIONS)
    3433
    3534#include "RenderBlock.h"
    … …  
    9594} // namespace WebCore
    9695
    97 #endif // ENABLE(CSS_REGIONS)
    98 
    9996#endif // RenderFlowThread_h

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r92025 r92792  
    38803880    updateVisibilityStatus();
    38813881
    3882 #if ENABLE(CSS_REGIONS)
    38833882    // Do not let the RenderFlowThread to render directly to screen. It will only render
    38843883    // inside the RenderRegion objects, so avoid collecting it.
    38853884    if (renderer()->isRenderFlowThread())
    38863885        return;
    3887 #endif
    38883886
    38893887    // Overflow layers are just painted by their enclosing layers, so they don't get put in zorder lists.

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r92628 r92792  
    138138        case RUN_IN:
    139139        case COMPACT:
    140 #if ENABLE(CSS_REGIONS)
    141140            // Only non-replaced block elements can become a region.
    142141            if (!style->regionThread().isEmpty())
    143142                return new (arena) RenderRegion(node);
    144 #endif
    145143            return new (arena) RenderBlock(node);
    146144        case LIST_ITEM:

  • trunk/Source/WebCore/rendering/RenderObject.h

    r92438 r92792  
    288288    virtual bool isRenderInline() const { return false; }
    289289    virtual bool isRenderPart() const { return false; }
     290    virtual bool isRenderRegion() const { return false; }
    290291    virtual bool isRenderView() const { return false; }
    291292    virtual bool isReplica() const { return false; }
    … …  
    317318#endif
    318319
    319 #if ENABLE(CSS_REGIONS)
    320320    virtual bool isRenderFlowThread() const { return false; }
    321 #endif
    322321
    323322    bool isRoot() const { return document()->documentElement() == m_node; }
    … …  
    431430    bool isReplaced() const { return m_replaced; } // a "replaced" element (see CSS)
    432431    bool isHorizontalWritingMode() const { return m_horizontalWritingMode; }
    433 
    434 #if ENABLE(CSS_REGIONS)
    435     virtual bool isRenderRegion() const { return false; }
    436 #endif
    437432
    438433    bool hasLayer() const { return m_hasLayer; }

  • trunk/Source/WebCore/rendering/RenderRegion.cpp

    r91955 r92792  
    3535#include "PaintInfo.h"
    3636#include "RenderView.h"
    37 
    38 #if ENABLE(CSS_REGIONS)
    3937
    4038namespace WebCore {
    … …  
    8785
    8886} // namespace WebCore
    89 
    90 #endif // ENABLE(CSS_REGIONS)

  • trunk/Source/WebCore/rendering/RenderRegion.h

    r91955 r92792  
    3030#ifndef RenderRegion_h
    3131#define RenderRegion_h
    32 
    33 #if ENABLE(CSS_REGIONS)
    3432
    3533#include "RenderBox.h"
    … …  
    6866} // namespace WebCore
    6967
    70 #endif // ENABLE(CSS_REGIONS)
    71 
    7268#endif // RenderRegion_h

  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r91760 r92792  
    708708    }
    709709   
    710 #if ENABLE(CSS_REGIONS)
    711710    // Altough the RenderFlowThread requires a layer, it is not collected by its parent,
    712711    // so we have to treat it as a special case.
    … …  
    726725        }
    727726    }
    728 #endif
    729727}
    730728

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r92438 r92792  
    794794}
    795795
    796 #if ENABLE(CSS_REGIONS)
    797796RenderFlowThread* RenderView::renderFlowThreadWithName(const AtomicString& flowThread)
    798797{
    … …  
    810809    return flowRenderer;
    811810}
    812 #endif
    813811
    814812} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderView.h

    r92438 r92792  
    3030namespace WebCore {
    3131
     32class RenderFlowThread;
    3233class RenderWidget;
    33 
    34 #if ENABLE(CSS_REGIONS)
    35 class RenderFlowThread;
    36 #endif
    3734
    3835#if USE(ACCELERATED_COMPOSITING)
    … …  
    170167    IntRect documentRect() const;
    171168
    172 #if ENABLE(CSS_REGIONS)
    173169    RenderFlowThread* renderFlowThreadWithName(const AtomicString& flowThread);
    174 #endif
    175170
    176171protected:

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r92631 r92792  
    349349            return StyleDifferenceLayout;
    350350
    351 #if ENABLE(CSS_REGIONS)
    352351        if (rareNonInheritedData->m_regionOverflow != other->rareNonInheritedData->m_regionOverflow)
    353352            return StyleDifferenceLayout;
    354 #endif
     353
    355354        if (rareNonInheritedData->m_deprecatedFlexibleBox.get() != other->rareNonInheritedData->m_deprecatedFlexibleBox.get()
    356355            && *rareNonInheritedData->m_deprecatedFlexibleBox.get() != *other->rareNonInheritedData->m_deprecatedFlexibleBox.get())
    … …  
    579578        return StyleDifferenceRepaint;
    580579       
    581 #if ENABLE(CSS_EXCLUSIONS)
    582580        // FIXME: The current spec is being reworked to remove dependencies between exclusions and affected
    583581        // content. There's a proposal to use floats instead. In that case, wrap-shape should actually relayout
    … …  
    587585        if (rareNonInheritedData->m_wrapShape != other->rareNonInheritedData->m_wrapShape)
    588586            return StyleDifferenceRepaint;
    589 #endif
    590587
    591588#if USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r92631 r92792  
    752752    // End CSS3 Getters
    753753
    754 #if ENABLE(CSS_REGIONS)
    755754    const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
    756755    const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
    757756    int regionIndex() const { return rareNonInheritedData->m_regionIndex; }
    758757    RegionOverflow regionOverflow() const { return rareNonInheritedData->m_regionOverflow; }
    759 #endif
    760758
    761759    // Apple-specific property getter methods
    … …  
    11141112    // End CSS3 Setters
    11151113
    1116 #if ENABLE(CSS_REGIONS)
    11171114    void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
    11181115    void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
    11191116    void setRegionIndex(int regionIndex) { SET_VAR(rareNonInheritedData, m_regionIndex, regionIndex); }
    11201117    void setRegionOverflow(RegionOverflow regionOverflow) { SET_VAR(rareNonInheritedData, m_regionOverflow, regionOverflow); }
    1121 #endif
    11221118
    11231119    // Apple-specific property setters
    … …  
    11711167#endif
    11721168
    1173 #if ENABLE(CSS_EXCLUSIONS)
    11741169    void setWrapShape(PassRefPtr<CSSWrapShape> shape)
    11751170    {
    … …  
    11791174    CSSWrapShape* wrapShape() const { return rareNonInheritedData->m_wrapShape.get(); }
    11801175    static CSSWrapShape* initialWrapShape() { return 0; }
    1181 #endif
    11821176
    11831177    bool hasContent() const { return contentData(); }
    … …  
    13641358    static EImageRendering initialImageRendering() { return ImageRenderingAuto; }
    13651359
    1366 #if ENABLE(CSS_REGIONS)
    13671360    static const AtomicString& initialFlowThread() { return nullAtom; }
    13681361    static const AtomicString& initialRegionThread() { return nullAtom; }
    13691362    static int initialRegionIndex() { return 0; }
    13701363    static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; }
    1371 #endif
    13721364
    13731365    // Keep these at the end.

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r92628 r92792  
    439439enum Order { LogicalOrder = 0, VisualOrder };
    440440
    441 #if ENABLE(CSS_REGIONS)
    442441enum RegionOverflow { AutoRegionOverflow, BreakRegionOverflow };
    443 #endif
    444442
    445443} // namespace WebCore

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r91392 r92792  
    5656    , m_pageSize()
    5757    , m_pageSizeType(PAGE_SIZE_AUTO)
    58 #if ENABLE(CSS_REGIONS)
    5958    , m_flowThread(RenderStyle::initialFlowThread())
    6059    , m_regionThread(RenderStyle::initialRegionThread())
    6160    , m_regionIndex(RenderStyle::initialRegionIndex())
    6261    , m_regionOverflow(RenderStyle::initialRegionOverflow())
    63 #endif
    64 #if ENABLE(CSS_EXCLUSIONS)
    6562    , m_wrapShape(RenderStyle::initialWrapShape())
    66 #endif
    6763{
    6864}
    … …  
    107103    , m_pageSize(o.m_pageSize)
    108104    , m_pageSizeType(o.m_pageSizeType)
    109 #if ENABLE(CSS_REGIONS)
    110105    , m_flowThread(o.m_flowThread)
    111106    , m_regionThread(o.m_regionThread)
    112107    , m_regionIndex(o.m_regionIndex)
    113108    , m_regionOverflow(o.m_regionOverflow)
    114 #endif
    115 #if ENABLE(CSS_EXCLUSIONS)
    116109    , m_wrapShape(o.m_wrapShape)
    117 #endif
    118110{
    119111}
    … …  
    165157        && (m_pageSize == o.m_pageSize)
    166158        && (m_pageSizeType == o.m_pageSizeType)
    167 #if ENABLE(CSS_REGIONS)
    168159        && (m_flowThread == o.m_flowThread)
    169160        && (m_regionThread == o.m_regionThread)
    170161        && (m_regionIndex == o.m_regionIndex)
    171162        && (m_regionOverflow == o.m_regionOverflow)
    172 #endif
    173 #if ENABLE(CSS_EXCLUSIONS)
    174         && (m_wrapShape == o.m_wrapShape)
    175 #endif
    176         ;
     163        && (m_wrapShape == o.m_wrapShape);
    177164}
    178165

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

    r91392 r92792  
    137137    PageSizeType m_pageSizeType;
    138138
    139 #if ENABLE(CSS_REGIONS)
    140139    AtomicString m_flowThread;
    141140    AtomicString m_regionThread;
    142141    int m_regionIndex;
    143142    RegionOverflow m_regionOverflow;
    144 #endif
    145143
    146 #if ENABLE(CSS_EXCLUSIONS)
    147144    RefPtr<CSSWrapShape> m_wrapShape;
    148 #endif
    149145
    150146private:

  • trunk/Source/WebKit/mac/ChangeLog

    r92706 r92792  
     12011-08-10  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=66004
     4
     5        Removing the CSS Regions and Exclusions ifdefs.
     6
     7        Reviewed by Adam Roben.
     8
     9        * Configurations/FeatureDefines.xcconfig:
     10
    1112011-08-09  Mark Hahnenberg  <mhahnenberg@apple.com>
    212

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r92333 r92792  
    5555ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
    5656ENABLE_CSS3_FLEXBOX = ;
    57 ENABLE_CSS_EXCLUSIONS = ;
    58 ENABLE_CSS_REGIONS = ;
    5957ENABLE_DATABASE = ENABLE_DATABASE;
    6058ENABLE_DATA_TRANSFER_ITEMS = ;
    … …  
    10199ENABLE_XSLT = ENABLE_XSLT;
    102100
    103 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     101FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/Source/WebKit2/ChangeLog

    r92778 r92792  
     12011-08-10  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=66004
     4
     5        Removing the CSS Regions and CSS Exclusions ifdefs.
     6
     7        Reviewed by Adam Roben.
     8
     9        * Configurations/FeatureDefines.xcconfig:
     10
    1112011-08-10  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r92333 r92792  
    5555ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
    5656ENABLE_CSS3_FLEXBOX = ;
    57 ENABLE_CSS_EXCLUSIONS = ;
    58 ENABLE_CSS_REGIONS = ;
    5957ENABLE_DATABASE = ENABLE_DATABASE;
    6058ENABLE_DATA_TRANSFER_ITEMS = ;
    … …  
    10199ENABLE_XSLT = ENABLE_XSLT;
    102100
    103 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
     101FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_EVENTSOURCE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_NOTIFICATIONS) $(ENABLE_OFFLINE_WEB_APPLICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_ANIMATION) $(ENABLE_SVG_AS_IMAGE) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_FOREIGN_OBJECT) $(ENABLE_SVG_USE) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r92647 r92792  
    6767                    { "name": "efl-linux-slave-1", "platform": "efl" },
    6868
    69                     { "name": "adobe-mac-slave1", "platform": "mac-snowleopard" },
    70 
    7169                    { "name": "hfreyther-mipsel-linux1", "platform": "qt"}
    7270                  ],
    … …  
    257255                      "platform": "efl", "configuration": "release", "architectures": ["i386"],
    258256                      "slavenames": ["efl-linux-slave-1"]
    259                     },
    260                     { "name": "CSSRegions SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "cssregions-snowleopard-intel-release",
    261                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], "features": ["css-regions", "css-exclusions"],
    262                       "upload": true,
    263                       "slavenames": ["adobe-mac-slave1"]
    264257                    }
    265258                  ],
    … …  
    276269                      "builderNames": ["Leopard Intel Debug (Build)"]
    277270                    },
    278                     { "type": "PlatformSpecificScheduler", "platform": "mac-snowleopard", "branch": "trunk", "treeStableTimer": 45.0,
    279                       "builderNames": ["SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks", "SnowLeopard Intel Debug (Build)",
    280                                        "CSSRegions SnowLeopard Intel Release (Build)"]
    281                     },
    282271                    { "type": "PlatformSpecificScheduler", "platform": "mac-lion", "branch": "trunk", "treeStableTimer": 45.0,
    283272                      "builderNames": ["Lion Intel Release (Build)", "Lion Intel Debug (Build)"]

  • trunk/Tools/ChangeLog

    r92785 r92792  
     12011-08-10  David Hyatt  <hyatt@apple.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=66004
     4
     5        Remove the regions and exclusions bots and also the flags in build-webkit, since I'm just turning
     6        the code on by default.
     7
     8        Reviewed by Adam Roben.
     9
     10        * BuildSlaveSupport/build.webkit.org-config/config.json:
     11        * Scripts/build-webkit:
     12
    1132011-08-10  Oliver Hunt  <oliver@apple.com>
    214

  • trunk/Tools/Scripts/build-webkit

    r90689 r92792  
    7474    $coverageSupport,
    7575    $css3FlexboxSupport,
    76     $cssRegionsSupport,
    77     $cssExclusionsSupport,
    7876    $databaseSupport,
    7977    $datalistSupport,
    … …  
    157155      define => "ENABLE_CSS3_FLEXBOX", default => 0, value => \$css3FlexboxSupport },
    158156
    159     { option => "css-regions", desc => "Toggle CSS Regions support",
    160       define => "ENABLE_CSS_REGIONS", default => 0, value => \$cssRegionsSupport },
    161      
    162     { option => "css-exclusions", desc => "Toggle CSS Exclusions support",
    163       define => "ENABLE_CSS_EXCLUSIONS", default => 0, value => \$cssExclusionsSupport },
    164 
    165157    { option => "coverage", desc => "Toggle code coverage support",
    166158      define => "", default => 0, value => \$coverageSupport },
Note: See TracChangeset for help on using the changeset viewer.