Changeset 129009 in webkit


Ignore:
Timestamp:
Sep 19, 2012 8:30:43 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[CSSRegions][CSSOM] Make sure all Regions APIs are not visible if CSS_REGIONS is not defined
https://bugs.webkit.org/show_bug.cgi?id=96300

Patch by Raul Hudea <rhudea@adobe.com> on 2012-09-19
Reviewed by Yury Semikhatsky.

All CSS Regions APIs should be exposed only if CSS_REGIONS is enabled

No new tests because of no behavior changes.

  • css/StyleRule.cpp:

(WebCore::StyleRuleBase::reportMemoryUsage): Fix compile without CSS_REGIONS enabled and added an ASSERT_NOT_REACHED as in other functions

  • dom/Element.cpp: Compile webkitRegionOverset only if CSS_REGIONS is enabled

(WebCore):

  • dom/Element.h:
  • dom/Element.idl: Expose webkitRegionOverset only if CSS_REGIONS is enabled
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r129005 r129009  
     12012-09-19  Raul Hudea  <rhudea@adobe.com>
     2
     3        [CSSRegions][CSSOM] Make sure all Regions APIs are not visible if CSS_REGIONS is not defined
     4        https://bugs.webkit.org/show_bug.cgi?id=96300
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        All CSS Regions APIs should be exposed only if CSS_REGIONS is enabled
     9
     10        No new tests because of no behavior changes.
     11
     12        * css/StyleRule.cpp:
     13        (WebCore::StyleRuleBase::reportMemoryUsage): Fix compile without CSS_REGIONS enabled and added an ASSERT_NOT_REACHED as in other functions
     14        * dom/Element.cpp: Compile webkitRegionOverset only if CSS_REGIONS is enabled
     15        (WebCore):
     16        * dom/Element.h:
     17        * dom/Element.idl: Expose webkitRegionOverset only if CSS_REGIONS is enabled
     18
    1192012-09-19  Patrick Gansterer  <paroga@webkit.org>
    220
  • trunk/Source/WebCore/css/StyleRule.cpp

    r128762 r129009  
    8282    case Charset:
    8383    case Keyframe:
    84         MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     84#if !ENABLE(CSS_REGIONS)
     85    case Region:
     86#endif
     87        ASSERT_NOT_REACHED();
    8588        return;
    8689    }
  • trunk/Source/WebCore/dom/Element.cpp

    r128559 r129009  
    20342034}
    20352035
     2036#if ENABLE(CSS_REGIONS)
     2037
    20362038const AtomicString& Element::webkitRegionOverset() const
    20372039{
     
    20622064    return undefinedState;
    20632065}
    2064 
    2065 #if ENABLE(CSS_REGIONS)
    20662066
    20672067Vector<RefPtr<Range> > Element::webkitGetRegionFlowRanges() const
  • trunk/Source/WebCore/dom/Element.h

    r128762 r129009  
    427427
    428428    RenderRegion* renderRegion() const;
     429#if ENABLE(CSS_REGIONS)
    429430    const AtomicString& webkitRegionOverset() const;
    430 #if ENABLE(CSS_REGIONS)
    431431    Vector<RefPtr<Range> > webkitGetRegionFlowRanges() const;
    432432#endif
  • trunk/Source/WebCore/dom/Element.idl

    r128416 r129009  
    144144
    145145        // CSS Regions API
    146         readonly attribute DOMString webkitRegionOverset;
     146        readonly attribute [Conditional=CSS_REGIONS] DOMString webkitRegionOverset;
    147147        [Conditional=CSS_REGIONS] sequence<Range> webkitGetRegionFlowRanges();
    148148
Note: See TracChangeset for help on using the changeset viewer.