Changeset 90832 in webkit


Ignore:
Timestamp:
Jul 12, 2011 11:37:09 AM (13 years ago)
Author:
leviw@chromium.org
Message:

Change roundedIntRect to roundedRect
​https://bugs.webkit.org/show_bug.cgi?id=64326

Reviewed by Eric Seidel.

Renaming RoundedIntRect to RoundedRect and moving the underlying type to Layout units from
integer-based versions.

No new tests, no new functionality

  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/graphics/GraphicsContext.cpp:

(WebCore::GraphicsContext::addRoundedRectClip):
(WebCore::GraphicsContext::clipOutRoundedRect):
(WebCore::GraphicsContext::fillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):

  • platform/graphics/GraphicsContext.h:
  • platform/graphics/Path.cpp:

(WebCore::Path::addRoundedRect):

  • platform/graphics/Path.h:
  • platform/graphics/RoundedIntRect.cpp: Removed.
  • platform/graphics/RoundedIntRect.h: Removed.
  • platform/graphics/RoundedRect.cpp: Copied from Source/WebCore/platform/graphics/RoundedIntRect.cpp.

(WebCore::RoundedRect::Radii::isZero):
(WebCore::RoundedRect::Radii::scale):
(WebCore::RoundedRect::Radii::expand):
(WebCore::RoundedRect::inflateWithRadii):
(WebCore::RoundedRect::Radii::includeLogicalEdges):
(WebCore::RoundedRect::Radii::excludeLogicalEdges):
(WebCore::RoundedRect::RoundedRect):
(WebCore::RoundedRect::includeLogicalEdges):
(WebCore::RoundedRect::excludeLogicalEdges):
(WebCore::RoundedRect::isRenderable):

  • platform/graphics/RoundedRect.h: Copied from Source/WebCore/platform/graphics/RoundedIntRect.h.

(WebCore::RoundedRect::Radii::Radii):
(WebCore::RoundedRect::Radii::setTopLeft):
(WebCore::RoundedRect::Radii::setTopRight):
(WebCore::RoundedRect::Radii::setBottomLeft):
(WebCore::RoundedRect::Radii::setBottomRight):
(WebCore::RoundedRect::Radii::topLeft):
(WebCore::RoundedRect::Radii::topRight):
(WebCore::RoundedRect::Radii::bottomLeft):
(WebCore::RoundedRect::Radii::bottomRight):
(WebCore::RoundedRect::Radii::expand):
(WebCore::RoundedRect::Radii::shrink):
(WebCore::RoundedRect::rect):
(WebCore::RoundedRect::setRect):
(WebCore::RoundedRect::move):
(WebCore::RoundedRect::inflate):
(WebCore::RoundedRect::expandRadii):
(WebCore::RoundedRect::shrinkRadii):
(WebCore::operator==):

  • platform/graphics/ShadowBlur.cpp:

(WebCore::ScratchBuffer::setLastShadowValues):
(WebCore::ScratchBuffer::setLastInsetShadowValues):
(WebCore::ScratchBuffer::matchesLastShadow):
(WebCore::ScratchBuffer::matchesLastInsetShadow):
(WebCore::computeSliceSizesFromRadii):
(WebCore::ShadowBlur::templateSize):
(WebCore::ShadowBlur::drawRectShadow):
(WebCore::ShadowBlur::drawInsetShadow):
(WebCore::ShadowBlur::drawRectShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
(WebCore::ShadowBlur::drawInsetShadowWithTiling):
(WebCore::ShadowBlur::drawRectShadowWithTiling):
(WebCore::ShadowBlur::drawLayerPieces):

  • platform/graphics/ShadowBlur.h:
  • platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::fillRect):
(WebCore::GraphicsContext::fillRoundedRect):
(WebCore::GraphicsContext::fillRectWithRoundedHole):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::paintBoxDecorations):

  • rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::getBackgroundRoundedRect):
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::paintOneBorderSide):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::paintTranslucentBorderSides):
(WebCore::RenderBoxModelObject::paintBorder):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
(WebCore::RenderBoxModelObject::clipBorderSidePolygon):
(WebCore::RenderBoxModelObject::paintBoxShadow):

  • rendering/RenderBoxModelObject.h:
  • rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintMenuListButtonGradients):
(WebCore::RenderThemeMac::paintSliderTrack):

  • rendering/style/RenderStyle.cpp:

(WebCore::calcRadiiFor):
(WebCore::calcConstraintScaleFor):
(WebCore::RenderStyle::getRoundedBorderFor):
(WebCore::RenderStyle::getRoundedInnerBorderFor):

  • rendering/style/RenderStyle.h:
Location:
trunk/Source/WebCore
Files:
23 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r90680 r90832  
    10801080    platform/graphics/PathTraversalState.cpp
    10811081    platform/graphics/Pattern.cpp
    1082     platform/graphics/RoundedIntRect.cpp
     1082    platform/graphics/RoundedRect.cpp
    10831083    platform/graphics/SegmentedFontData.cpp
    10841084    platform/graphics/ShadowBlur.cpp

  • trunk/Source/WebCore/ChangeLog

    r90831 r90832  
     12011-07-12  Levi Weintraub  <leviw@chromium.org>
     2
     3        Change roundedIntRect to roundedRect
     4        https://bugs.webkit.org/show_bug.cgi?id=64326
     5
     6        Reviewed by Eric Seidel.
     7
     8        Renaming RoundedIntRect to RoundedRect and moving the underlying type to Layout units from
     9        integer-based versions.
     10
     11        No new tests, no new functionality
     12
     13        * WebCore.gypi:
     14        * WebCore.pro:
     15        * WebCore.vcproj/WebCore.vcproj:
     16        * WebCore.xcodeproj/project.pbxproj:
     17        * platform/graphics/GraphicsContext.cpp:
     18        (WebCore::GraphicsContext::addRoundedRectClip):
     19        (WebCore::GraphicsContext::clipOutRoundedRect):
     20        (WebCore::GraphicsContext::fillRoundedRect):
     21        (WebCore::GraphicsContext::fillRectWithRoundedHole):
     22        * platform/graphics/GraphicsContext.h:
     23        * platform/graphics/Path.cpp:
     24        (WebCore::Path::addRoundedRect):
     25        * platform/graphics/Path.h:
     26        * platform/graphics/RoundedIntRect.cpp: Removed.
     27        * platform/graphics/RoundedIntRect.h: Removed.
     28        * platform/graphics/RoundedRect.cpp: Copied from Source/WebCore/platform/graphics/RoundedIntRect.cpp.
     29        (WebCore::RoundedRect::Radii::isZero):
     30        (WebCore::RoundedRect::Radii::scale):
     31        (WebCore::RoundedRect::Radii::expand):
     32        (WebCore::RoundedRect::inflateWithRadii):
     33        (WebCore::RoundedRect::Radii::includeLogicalEdges):
     34        (WebCore::RoundedRect::Radii::excludeLogicalEdges):
     35        (WebCore::RoundedRect::RoundedRect):
     36        (WebCore::RoundedRect::includeLogicalEdges):
     37        (WebCore::RoundedRect::excludeLogicalEdges):
     38        (WebCore::RoundedRect::isRenderable):
     39        * platform/graphics/RoundedRect.h: Copied from Source/WebCore/platform/graphics/RoundedIntRect.h.
     40        (WebCore::RoundedRect::Radii::Radii):
     41        (WebCore::RoundedRect::Radii::setTopLeft):
     42        (WebCore::RoundedRect::Radii::setTopRight):
     43        (WebCore::RoundedRect::Radii::setBottomLeft):
     44        (WebCore::RoundedRect::Radii::setBottomRight):
     45        (WebCore::RoundedRect::Radii::topLeft):
     46        (WebCore::RoundedRect::Radii::topRight):
     47        (WebCore::RoundedRect::Radii::bottomLeft):
     48        (WebCore::RoundedRect::Radii::bottomRight):
     49        (WebCore::RoundedRect::Radii::expand):
     50        (WebCore::RoundedRect::Radii::shrink):
     51        (WebCore::RoundedRect::rect):
     52        (WebCore::RoundedRect::setRect):
     53        (WebCore::RoundedRect::move):
     54        (WebCore::RoundedRect::inflate):
     55        (WebCore::RoundedRect::expandRadii):
     56        (WebCore::RoundedRect::shrinkRadii):
     57        (WebCore::operator==):
     58        * platform/graphics/ShadowBlur.cpp:
     59        (WebCore::ScratchBuffer::setLastShadowValues):
     60        (WebCore::ScratchBuffer::setLastInsetShadowValues):
     61        (WebCore::ScratchBuffer::matchesLastShadow):
     62        (WebCore::ScratchBuffer::matchesLastInsetShadow):
     63        (WebCore::computeSliceSizesFromRadii):
     64        (WebCore::ShadowBlur::templateSize):
     65        (WebCore::ShadowBlur::drawRectShadow):
     66        (WebCore::ShadowBlur::drawInsetShadow):
     67        (WebCore::ShadowBlur::drawRectShadowWithoutTiling):
     68        (WebCore::ShadowBlur::drawInsetShadowWithoutTiling):
     69        (WebCore::ShadowBlur::drawInsetShadowWithTiling):
     70        (WebCore::ShadowBlur::drawRectShadowWithTiling):
     71        (WebCore::ShadowBlur::drawLayerPieces):
     72        * platform/graphics/ShadowBlur.h:
     73        * platform/graphics/cg/GraphicsContextCG.cpp:
     74        (WebCore::GraphicsContext::fillRect):
     75        (WebCore::GraphicsContext::fillRoundedRect):
     76        (WebCore::GraphicsContext::fillRectWithRoundedHole):
     77        * rendering/RenderBox.cpp:
     78        (WebCore::RenderBox::paintBoxDecorations):
     79        * rendering/RenderBoxModelObject.cpp:
     80        (WebCore::RenderBoxModelObject::getBackgroundRoundedRect):
     81        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
     82        (WebCore::RenderBoxModelObject::paintOneBorderSide):
     83        (WebCore::RenderBoxModelObject::paintBorderSides):
     84        (WebCore::RenderBoxModelObject::paintTranslucentBorderSides):
     85        (WebCore::RenderBoxModelObject::paintBorder):
     86        (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
     87        (WebCore::RenderBoxModelObject::clipBorderSidePolygon):
     88        (WebCore::RenderBoxModelObject::paintBoxShadow):
     89        * rendering/RenderBoxModelObject.h:
     90        * rendering/RenderThemeMac.mm:
     91        (WebCore::RenderThemeMac::paintMenuListButtonGradients):
     92        (WebCore::RenderThemeMac::paintSliderTrack):
     93        * rendering/style/RenderStyle.cpp:
     94        (WebCore::calcRadiiFor):
     95        (WebCore::calcConstraintScaleFor):
     96        (WebCore::RenderStyle::getRoundedBorderFor):
     97        (WebCore::RenderStyle::getRoundedInnerBorderFor):
     98        * rendering/style/RenderStyle.h:
     99
    11002011-07-12  Mike Reed  <reed@google.com>
    2101

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

    r90680 r90832  
    25442544        Source/WebCore/platform/graphics/Pattern.cpp \
    25452545        Source/WebCore/platform/graphics/Pattern.h \
    2546         Source/WebCore/platform/graphics/RoundedIntRect.cpp \
    2547         Source/WebCore/platform/graphics/RoundedIntRect.h \
     2546        Source/WebCore/platform/graphics/RoundedRect.cpp \
     2547        Source/WebCore/platform/graphics/RoundedRect.h \
    25482548        Source/WebCore/platform/graphics/SegmentedFontData.cpp \
    25492549        Source/WebCore/platform/graphics/SegmentedFontData.h \

  • trunk/Source/WebCore/WebCore.gypi

    r90830 r90832  
    856856            'platform/graphics/Path.h',
    857857            'platform/graphics/Pattern.h',
    858             'platform/graphics/RoundedIntRect.h',
     858            'platform/graphics/RoundedRect.h',
    859859            'platform/graphics/SimpleFontData.h',
    860860            'platform/graphics/StringTruncator.h',
    … …  
    39743974            'platform/graphics/PathTraversalState.h',
    39753975            'platform/graphics/Pattern.cpp',
    3976             'platform/graphics/RoundedIntRect.cpp',
     3976            'platform/graphics/RoundedRect.cpp',
    39773977            'platform/graphics/SegmentedFontData.cpp',
    39783978            'platform/graphics/SegmentedFontData.h',

  • trunk/Source/WebCore/WebCore.order

    r90253 r90832  
    52115211__ZNK7WebCore20RenderBoxModelObject17getBorderEdgeInfoEPNS_10BorderEdgeEbb
    52125212__ZNK7WebCore11RenderStyle19getRoundedBorderForERKNS_7IntRectEbb
    5213 __ZN7WebCore14RoundedIntRectC1ERKNS_7IntRectERKNS0_5RadiiE
     5213__ZN7WebCore14RoundedRectC1ERKNS_7IntRectERKNS0_5RadiiE
    52145214__ZNK7WebCore11RenderStyle24getRoundedInnerBorderForERKNS_7IntRectEbb
    52155215__ZNK7WebCore11RenderStyle24getRoundedInnerBorderForERKNS_7IntRectEiiiibb
    52165216__ZNK7WebCore15GraphicsContext6getCTMEv
    52175217__ZN7WebCore15AffineTransformC1Edddddd
    5218 __ZNK7WebCore14RoundedIntRect5Radii6isZeroEv
    5219 __ZN7WebCore20RenderBoxModelObject16paintBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_PKNS_10BorderEdgeEjNS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
    5220 __ZN7WebCore20RenderBoxModelObject18paintOneBorderSideEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_RKNS_7IntRectENS_7BoxSideESC_SC_PKNS_10BorderEdgeEPKNS_4PathENS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
     5218__ZNK7WebCore14RoundedRect5Radii6isZeroEv
     5219__ZN7WebCore20RenderBoxModelObject16paintBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_PKNS_10BorderEdgeEjNS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
     5220__ZN7WebCore20RenderBoxModelObject18paintOneBorderSideEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_RKNS_7IntRectENS_7BoxSideESC_SC_PKNS_10BorderEdgeEPKNS_4PathENS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
    52215221__ZN7WebCoreL17joinRequiresMitreENS_7BoxSideES0_PKNS_10BorderEdgeEb
    52225222__ZN7WebCore12RenderObject18drawLineForBoxSideEPNS_15GraphicsContextEiiiiNS_7BoxSideENS_5ColorENS_12EBorderStyleEiib
    … …  
    57565756__ZNK7WebCore9RenderBox27computeReplacedLogicalWidthEb
    57575757__ZN7WebCore9RenderBox26repaintDuringLayoutIfMovedERKNS_7IntRectE
    5758 __ZNK7WebCore14RoundedIntRect12isRenderableEv
     5758__ZNK7WebCore14RoundedRect12isRenderableEv
    57595759__ZN7WebCore11RenderImage13paintIntoRectEPNS_15GraphicsContextERKNS_7IntRectE
    57605760__ZN7WebCore20RenderBoxModelObject23shouldPaintAtLowQualityEPNS_15GraphicsContextEPNS_5ImageEPKvRKNS_7IntSizeE
    … …  
    97939793__ZNK7WebCore10ShadowData19adjustRectForShadowERNS_7IntRectEi
    97949794__ZN7WebCore10ShadowBlurC1ERKNS_9FloatSizeES3_RKNS_5ColorENS_10ColorSpaceE
    9795 __ZN7WebCore10ShadowBlur14drawRectShadowEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiE
     9795__ZN7WebCore10ShadowBlur14drawRectShadowEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiE
    97969796__ZNK7WebCore15GraphicsContext10clipBoundsEv
    97979797__ZN7WebCore10ShadowBlur26calculateLayerBoundingRectEPNS_15GraphicsContextERKNS_9FloatRectERKNS_7IntRectE
    97989798__ZN7WebCore10ShadowBlur16adjustBlurRadiusEPNS_15GraphicsContextE
    9799 __ZN7WebCore10ShadowBlur24drawRectShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_
     9799__ZN7WebCore10ShadowBlur24drawRectShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_
    98009800__ZN7WebCore13ScratchBuffer16getScratchBufferERKNS_7IntSizeE
    9801 __ZNK7WebCore13ScratchBuffer17matchesLastShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiE
     9801__ZNK7WebCore13ScratchBuffer17matchesLastShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectERKNS_14RoundedRect5RadiiE
    98029802__ZN7WebCore10ShadowBlur16blurShadowBufferERKNS_7IntSizeE
    98039803__ZN7WebCore10ShadowBlur14blurLayerImageEPhRKNS_7IntSizeEi
    9804 __ZN7WebCore10ShadowBlur15drawLayerPiecesEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_NS0_15ShadowDirectionE
     9804__ZN7WebCore10ShadowBlur15drawLayerPiecesEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_NS0_15ShadowDirectionE
    98059805__ZN7WebCore5TimerINS_13ScratchBufferEE5firedEv
    98069806__ZN7WebCore13ScratchBuffer10timerFiredEPNS_5TimerIS0_EE
    … …  
    1123811238__ZNK7WebCore16HTMLElementStack13inButtonScopeERKNS_13QualifiedNameE
    1123911239__ZN7WebCoreL22decodeNonASCIISequenceEPKhj
    11240 __ZN7WebCore20RenderBoxModelObject21clipBorderSidePolygonEPNS_15GraphicsContextERKNS_14RoundedIntRectES5_NS_7BoxSideEbb
     11240__ZN7WebCore20RenderBoxModelObject21clipBorderSidePolygonEPNS_15GraphicsContextERKNS_14RoundedRectES5_NS_7BoxSideEbb
    1124111241__ZN7WebCore15GraphicsContext17clipConvexPolygonEmPKNS_10FloatPointEb
    1124211242__ZN7WebCore15GraphicsContext8clipPathERKNS_4PathENS_8WindRuleE
    … …  
    1426414264__ZNK7WebCore15RenderTableCell20cellBaselinePositionEv
    1426514265__ZNK7WebCore11RenderBlock20firstLineBoxBaselineEv
    14266 __ZN7WebCore14RoundedIntRect5Radii5scaleEf
    14267 __ZN7WebCore14RoundedIntRect19includeLogicalEdgesERKNS0_5RadiiEbbb
    14268 __ZN7WebCore14RoundedIntRect5Radii6expandEiiii
    14269 __ZN7WebCore4Path14addRoundedRectERKNS_14RoundedIntRectE
     14266__ZN7WebCore14RoundedRect5Radii5scaleEf
     14267__ZN7WebCore14RoundedRect19includeLogicalEdgesERKNS0_5RadiiEbbb
     14268__ZN7WebCore14RoundedRect5Radii6expandEiiii
     14269__ZN7WebCore4Path14addRoundedRectERKNS_14RoundedRectE
    1427014270__ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeES6_S6_S6_
    1427114271__ZN7WebCore21createListItemElementEPNS_8DocumentE
    … …  
    1436714367__ZN3WTF9HashTableIPKN7WebCore13InlineTextBoxESt4pairIS4_NS1_7IntRectEENS_18PairFirstExtractorIS7_EENS_7PtrHashIS4_EENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS6_EEEESE_E6rehashEi
    1436814368__ZNK7WebCore15GraphicsContext23shadowsIgnoreTransformsEv
    14369 __ZN7WebCore15GraphicsContext18clipOutRoundedRectERKNS_14RoundedIntRectE
     14369__ZN7WebCore15GraphicsContext18clipOutRoundedRectERKNS_14RoundedRectE
    1437014370__ZN7WebCore15GraphicsContext7clipOutERKNS_4PathE
    14371 __ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_14RoundedIntRectERKNS_5ColorENS_10ColorSpaceE
     14371__ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_14RoundedRectERKNS_5ColorENS_10ColorSpaceE
    1437214372__ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_RKNS_5ColorENS_10ColorSpaceE
    1437314373__ZN7WebCoreL39backgroundRectAdjustedForBleedAvoidanceEPNS_15GraphicsContextERKNS_7IntRectENS_24BackgroundBleedAvoidanceE
    1437414374__ZN7WebCore20RenderBoxModelObject24getBackgroundRoundedRectERKNS_7IntRectEPNS_13InlineFlowBoxEiibb
    14375 __ZN7WebCore15GraphicsContext18addRoundedRectClipERKNS_14RoundedIntRectE
     14375__ZN7WebCore15GraphicsContext18addRoundedRectClipERKNS_14RoundedRectE
    1437614376__ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E16lookupForWritingIS2_NS_22IdentityHashTranslatorIS2_S7_SB_EEEES3_IPS7_bERKT_
    1437714377__ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E3addIS2_S6_NS_17HashMapTranslatorIS7_SG_SB_EEEES3_INS_17HashTableIteratorIS2_S7_S9_SB_SG_SE_EEbERKT_RKT0_
    … …  
    1438114381__ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E6removeEPS7_
    1438214382__ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_ED1Ev
    14383 __ZN7WebCore15GraphicsContext23fillRectWithRoundedHoleERKNS_7IntRectERKNS_14RoundedIntRectERKNS_5ColorENS_10ColorSpaceE
    14384 __ZN7WebCore10ShadowBlur15drawInsetShadowEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiE
    14385 __ZN7WebCore10ShadowBlur25drawInsetShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_
    14386 __ZNK7WebCore13ScratchBuffer22matchesLastInsetShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectESA_RKNS_14RoundedIntRect5RadiiE
     14383__ZN7WebCore15GraphicsContext23fillRectWithRoundedHoleERKNS_7IntRectERKNS_14RoundedRectERKNS_5ColorENS_10ColorSpaceE
     14384__ZN7WebCore10ShadowBlur15drawInsetShadowEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiE
     14385__ZN7WebCore10ShadowBlur25drawInsetShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_
     14386__ZNK7WebCore13ScratchBuffer22matchesLastInsetShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectESA_RKNS_14RoundedRect5RadiiE
    1438714387__ZN7WebCore14GeneratedImage11drawPatternEPNS_15GraphicsContextERKNS_9FloatRectERKNS_15AffineTransformERKNS_10FloatPointENS_10ColorSpaceENS_17CompositeOperatorES5_
    1438814388__ZN7WebCore8Gradient31adjustParametersForTiledDrawingERNS_7IntSizeERNS_9FloatRectE
    … …  
    1669316693__ZN7WebCore16findIntersectionERKNS_10FloatPointES2_S2_S2_RS0_
    1669416694__ZN7WebCore20RenderBoxModelObject19drawBoxSideFromPathEPNS_15GraphicsContextERKNS_7IntRectERKNS_4PathEPKNS_10BorderEdgeEffNS_7BoxSideEPKNS_11RenderStyleENS_5ColorENS_12EBorderStyleENS_24BackgroundBleedAvoidanceEbb
    16695 __ZN7WebCore20RenderBoxModelObject27paintTranslucentBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_PKNS_10BorderEdgeENS_24BackgroundBleedAvoidanceEbbb
     16695__ZN7WebCore20RenderBoxModelObject27paintTranslucentBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_PKNS_10BorderEdgeENS_24BackgroundBleedAvoidanceEbbb
    1669616696__ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore11RenderBlock14FloatingObjectELm4EEES7_NS_17IdentityExtractorIS7_EENS_28ListHashSetNodeHashFunctionsIS5_Lm4ENS3_27FloatingObjectHashFunctionsEEENS_10HashTraitsIS7_EESE_E16lookupForWritingERKS7_
    1669716697__ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore11RenderBlock14FloatingObjectELm4EEES7_NS_17IdentityExtractorIS7_EENS_28ListHashSetNodeHashFunctionsIS5_Lm4ENS3_27FloatingObjectHashFunctionsEEENS_10HashTraitsIS7_EESE_E3addIS5_PNS_24ListHashSetNodeAllocatorIS5_Lm4EEENS_21ListHashSetTranslatorIS5_Lm4ESB_EEEESt4pairINS_17HashTableIteratorIS7_S7_S9_SC_SE_SE_EEbERKT_RKT0_
    … …  
    1711617116__ZN7WebCore11RenderStyle12setBorderFitENS_10EBorderFitE
    1711717117__ZNK7WebCore11RenderBlock18adjustForBorderFitEiRiS1_
    17118 __ZN7WebCore10ShadowBlur27drawRectShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntRectE
     17118__ZN7WebCore10ShadowBlur27drawRectShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntRectE
    1711917119__ZN7WebCore10ShadowBlur16drawShadowBufferEPNS_15GraphicsContextE
    1712017120__ZNK7WebCore4Path6lengthEv
    … …  
    1713217132__ZN7WebCore13InlineFlowBox9paintMaskERNS_9PaintInfoEii
    1713317133__ZN7WebCore8SVGImage26nativeImageForCurrentFrameEv
    17134 __ZN7WebCore10ShadowBlur28drawInsetShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiERKNS_7IntRectE
     17134__ZN7WebCore10ShadowBlur28drawInsetShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiERKNS_7IntRectE
    1713517135__ZN7WebCore11RenderStyle12setMaxHeightENS_6LengthE
    1713617136__ZN7WebCore13CSSStyleSheet18determineNamespaceERKN3WTF12AtomicStringE
    … …  
    1941719417__ZNK7WebCore17SpinButtonElement21isReadOnlyFormControlEv
    1941819418__ZN7WebCore14RenderThemeMac16paintSliderTrackEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
    19419 __ZN7WebCore14RoundedIntRectC1ERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_
     19419__ZN7WebCore14RoundedRectC1ERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_
    1942019420__ZN7WebCoreL24TrackGradientInterpolateEPvPKdPd
    1942119421__ZN7WebCore14RenderThemeMac16paintSliderThumbEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE

  • trunk/Source/WebCore/WebCore.pro

    r90680 r90832  
    10001000    platform/graphics/PathTraversalState.cpp \
    10011001    platform/graphics/Pattern.cpp \
    1002     platform/graphics/RoundedIntRect.cpp \
     1002    platform/graphics/RoundedRect.cpp \
    10031003    platform/graphics/SegmentedFontData.cpp \
    10041004    platform/graphics/ShadowBlur.cpp \
    … …  
    19911991    platform/graphics/PathTraversalState.h \
    19921992    platform/graphics/Pattern.h \
    1993     platform/graphics/RoundedIntRect.h \
     1993    platform/graphics/RoundedRect.h \
    19941994    platform/graphics/qt/FontCustomPlatformData.h \
    19951995    platform/graphics/qt/ImageDecoderQt.h \

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

    r90830 r90832  
    2765827658                                </File>
    2765927659                                <File
    27660                                         RelativePath="..\platform\graphics\RoundedIntRect.cpp"
    27661                                         >
    27662                                 </File>
    27663                                 <File
    27664                                         RelativePath="..\platform\graphics\RoundedIntRect.h"
     27660                                        RelativePath="..\platform\graphics\RoundedRect.cpp"
     27661                                        >
     27662                                </File>
     27663                                <File
     27664                                        RelativePath="..\platform\graphics\RoundedRect.h"
    2766527665                                        >
    2766627666                                </File>

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

    r90680 r90832  
    32963296                A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */; };
    32973297                A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowContentSelector.h */; };
    3298                 A73F95FE12C97BFE0031AAF9 /* RoundedIntRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */; };
    3299                 A73F95FF12C97BFE0031AAF9 /* RoundedIntRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3298                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
     3299                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    33003300                A74C2D3C13811E0D00F83572 /* ShadowContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A74C2D3B13811E0D00F83572 /* ShadowContentElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    33013301                A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A75E497410752ACB00C9B896 /* SerializedScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    98259825                A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowContentSelector.cpp; sourceTree = "<group>"; };
    98269826                A71C30B71381265E00DBC351 /* ShadowContentSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentSelector.h; sourceTree = "<group>"; };
    9827                 A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedIntRect.cpp; sourceTree = "<group>"; };
    9828                 A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedIntRect.h; sourceTree = "<group>"; };
     9827                A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
     9828                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
    98299829                A74C2D3B13811E0D00F83572 /* ShadowContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentElement.h; sourceTree = "<group>"; };
    98309830                A75E497410752ACB00C9B896 /* SerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedScriptValue.h; sourceTree = "<group>"; };
    … …  
    1808618086                                A8FA6E5C0E4CFDED00D5CF49 /* Pattern.cpp */,
    1808718087                                A8FA6E5B0E4CFDED00D5CF49 /* Pattern.h */,
    18088                                 A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */,
    18089                                 A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */,
     18088                                A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */,
     18089                                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */,
    1809018090                                371F4FFB0D25E7F300ECE0D5 /* SegmentedFontData.cpp */,
    1809118091                                371F4FFA0D25E7F300ECE0D5 /* SegmentedFontData.h */,
    … …  
    2245922459                                A8CFF5E10A155A05000A4234 /* RootInlineBox.h in Headers */,
    2246022460                                49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
    22461                                 A73F95FF12C97BFE0031AAF9 /* RoundedIntRect.h in Headers */,
     22461                                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
    2246222462                                1C63A2480F71646600C09D5A /* RunLoopTimer.h in Headers */,
    2246322463                                1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */,
    … …  
    2536425364                                A8CFF5E70A155A05000A4234 /* RootInlineBox.cpp in Sources */,
    2536525365                                49E911C80EF86D47009D0CAF /* RotateTransformOperation.cpp in Sources */,
    25366                                 A73F95FE12C97BFE0031AAF9 /* RoundedIntRect.cpp in Sources */,
     25366                                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */,
    2536725367                                1C63A2490F71646600C09D5A /* RunLoopTimerCF.cpp in Sources */,
    2536825368                                1A569D1E0D7E2B82007C3983 /* runtime_array.cpp in Sources */,

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

    r90767 r90832  
    3232#include "ImageBuffer.h"
    3333#include "IntRect.h"
    34 #include "RoundedIntRect.h"
     34#include "RoundedRect.h"
    3535#include "TextRun.h"
    3636
    … …  
    555555#endif
    556556
    557 void GraphicsContext::addRoundedRectClip(const RoundedIntRect& rect)
     557void GraphicsContext::addRoundedRectClip(const RoundedRect& rect)
    558558{
    559559    if (paintingDisabled())
    … …  
    565565}
    566566
    567 void GraphicsContext::clipOutRoundedRect(const RoundedIntRect& rect)
     567void GraphicsContext::clipOutRoundedRect(const RoundedRect& rect)
    568568{
    569569    if (paintingDisabled())
    … …  
    621621}
    622622
    623 void GraphicsContext::fillRoundedRect(const RoundedIntRect& rect, const Color& color, ColorSpace colorSpace)
     623void GraphicsContext::fillRoundedRect(const RoundedRect& rect, const Color& color, ColorSpace colorSpace)
    624624{
    625625    fillRoundedRect(rect.rect(), rect.radii().topLeft(), rect.radii().topRight(), rect.radii().bottomLeft(), rect.radii().bottomRight(), color, colorSpace);
    … …  
    627627
    628628#if !USE(CG)
    629 void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedIntRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
     629void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
    630630{
    631631    if (paintingDisabled())

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.h

    r90767 r90832  
    127127    class ImageBuffer;
    128128    class IntRect;
    129     class RoundedIntRect;
     129    class RoundedRect;
    130130    class KURL;
    131131    class SharedGraphicsContext3D;
    … …  
    300300        void fillRect(const FloatRect&, const Color&, ColorSpace, CompositeOperator);
    301301        void fillRoundedRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color&, ColorSpace);
    302         void fillRoundedRect(const RoundedIntRect&, const Color&, ColorSpace);
    303         void fillRectWithRoundedHole(const IntRect&, const RoundedIntRect& roundedHoleRect, const Color&, ColorSpace);
     302        void fillRoundedRect(const RoundedRect&, const Color&, ColorSpace);
     303        void fillRectWithRoundedHole(const IntRect&, const RoundedRect& roundedHoleRect, const Color&, ColorSpace);
    304304
    305305        void clearRect(const FloatRect&);
    … …  
    331331        void clip(const IntRect&);
    332332        void clip(const FloatRect&);
    333         void addRoundedRectClip(const RoundedIntRect&);
     333        void addRoundedRectClip(const RoundedRect&);
    334334        void addInnerRoundedRectClip(const IntRect&, int thickness);
    335335        void clipOut(const IntRect&);
    336         void clipOutRoundedRect(const RoundedIntRect&);
     336        void clipOutRoundedRect(const RoundedRect&);
    337337        void clipPath(const Path&, WindRule);
    338338        void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias = true);

  • trunk/Source/WebCore/platform/graphics/Path.cpp

    r87955 r90832  
    9393#endif
    9494
    95 void Path::addRoundedRect(const RoundedIntRect& r)
     95void Path::addRoundedRect(const RoundedRect& r)
    9696{
    9797    addRoundedRect(r.rect(), r.radii().topLeft(), r.radii().topRight(), r.radii().bottomLeft(), r.radii().bottomRight());

  • trunk/Source/WebCore/platform/graphics/Path.h

    r87955 r90832  
    2929#define Path_h
    3030
    31 #include "RoundedIntRect.h"
     31#include "RoundedRect.h"
    3232#include <wtf/FastAllocBase.h>
    3333#include <wtf/Forward.h>
    … …  
    139139        void addRoundedRect(const FloatRect&, const FloatSize& roundingRadii);
    140140        void addRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
    141         void addRoundedRect(const RoundedIntRect&);
     141        void addRoundedRect(const RoundedRect&);
    142142
    143143        void translate(const FloatSize&);

  • trunk/Source/WebCore/platform/graphics/RoundedRect.cpp

    r90831 r90832  
    2626
    2727#include "config.h"
    28 #include "RoundedIntRect.h"
     28#include "RoundedRect.h"
    2929
    30 #include "IntRect.h"
    3130#include <algorithm>
    3231
    … …  
    3534namespace WebCore {
    3635
    37 bool RoundedIntRect::Radii::isZero() const
     36bool RoundedRect::Radii::isZero() const
    3837{
    3938    return m_topLeft.isZero() && m_topRight.isZero() && m_bottomLeft.isZero() && m_bottomRight.isZero();
    4039}
    4140
    42 void RoundedIntRect::Radii::scale(float factor)
     41void RoundedRect::Radii::scale(float factor)
    4342{
    4443    if (factor == 1)
    … …  
    4847    m_topLeft.scale(factor);
    4948    if (!m_topLeft.width() || !m_topLeft.height())
    50         m_topLeft = IntSize();
     49        m_topLeft = LayoutSize();
    5150    m_topRight.scale(factor);
    5251    if (!m_topRight.width() || !m_topRight.height())
    53         m_topRight = IntSize();
     52        m_topRight = LayoutSize();
    5453    m_bottomLeft.scale(factor);
    5554    if (!m_bottomLeft.width() || !m_bottomLeft.height())
    56         m_bottomLeft = IntSize();
     55        m_bottomLeft = LayoutSize();
    5756    m_bottomRight.scale(factor);
    5857    if (!m_bottomRight.width() || !m_bottomRight.height())
    59         m_bottomRight = IntSize();
     58        m_bottomRight = LayoutSize();
    6059
    6160}
    6261
    63 void RoundedIntRect::Radii::expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth)
     62void RoundedRect::Radii::expand(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth)
    6463{
    6564    m_topLeft.setWidth(max(0, m_topLeft.width() + leftWidth));
    … …  
    7675}
    7776
    78 void RoundedIntRect::inflateWithRadii(int size)
     77void RoundedRect::inflateWithRadii(LayoutUnit size)
    7978{
    80     IntRect old = m_rect;
     79    LayoutRect old = m_rect;
    8180
    8281    m_rect.inflate(size);
    … …  
    9190}
    9291
    93 void RoundedIntRect::Radii::includeLogicalEdges(const RoundedIntRect::Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
     92void RoundedRect::Radii::includeLogicalEdges(const RoundedRect::Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
    9493{
    9594    if (includeLogicalLeftEdge) {
    … …  
    110109}
    111110
    112 void RoundedIntRect::Radii::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
     111void RoundedRect::Radii::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
    113112{
    114113    if (excludeLogicalLeftEdge) {
    115114        if (isHorizontal)
    116             m_bottomLeft = IntSize();
     115            m_bottomLeft = LayoutSize();
    117116        else
    118             m_topRight = IntSize();
    119         m_topLeft = IntSize();
     117            m_topRight = LayoutSize();
     118        m_topLeft = LayoutSize();
    120119    }
    121120       
    122121    if (excludeLogicalRightEdge) {
    123122        if (isHorizontal)
    124             m_topRight = IntSize();
     123            m_topRight = LayoutSize();
    125124        else
    126             m_bottomLeft = IntSize();
    127         m_bottomRight = IntSize();
     125            m_bottomLeft = LayoutSize();
     126        m_bottomRight = LayoutSize();
    128127    }
    129128}
    130129
    131 RoundedIntRect::RoundedIntRect(int x, int y, int width, int height)
     130RoundedRect::RoundedRect(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height)
    132131    : m_rect(x, y, width, height)
    133132{
    134133}
    135134
    136 RoundedIntRect::RoundedIntRect(const IntRect& rect, const Radii& radii)
     135RoundedRect::RoundedRect(const LayoutRect& rect, const Radii& radii)
    137136    : m_rect(rect)
    138137    , m_radii(radii)
    … …  
    140139}
    141140
    142 RoundedIntRect::RoundedIntRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
     141RoundedRect::RoundedRect(const LayoutRect& rect, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
    143142    : m_rect(rect)
    144143    , m_radii(topLeft, topRight, bottomLeft, bottomRight)
    … …  
    146145}
    147146
    148 void RoundedIntRect::includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
     147void RoundedRect::includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
    149148{
    150149    m_radii.includeLogicalEdges(edges, isHorizontal, includeLogicalLeftEdge, includeLogicalRightEdge);
    151150}
    152151
    153 void RoundedIntRect::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
     152void RoundedRect::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
    154153{
    155154    m_radii.excludeLogicalEdges(isHorizontal, excludeLogicalLeftEdge, excludeLogicalRightEdge);
    156155}
    157156
    158 bool RoundedIntRect::isRenderable() const
     157bool RoundedRect::isRenderable() const
    159158{
    160159    return m_radii.topLeft().width() + m_radii.topRight().width() <= m_rect.width()

  • trunk/Source/WebCore/platform/graphics/RoundedRect.h

    r90831 r90832  
    2525 */
    2626
    27 #ifndef RoundedIntRect_h
    28 #define RoundedIntRect_h
     27#ifndef RoundedRect_h
     28#define RoundedRect_h
    2929
    30 #include "IntRect.h"
     30#include "LayoutTypes.h"
    3131
    3232namespace WebCore {
    3333
    3434
    35 class RoundedIntRect {
     35class RoundedRect {
    3636public:
    3737    class Radii {
    3838    public:
    3939        Radii() {}
    40         Radii(const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
     40        Radii(const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
    4141            : m_topLeft(topLeft)
    4242            , m_topRight(topRight)
    … …  
    4646        }
    4747
    48         void setTopLeft(const IntSize& size) { m_topLeft = size; }
    49         void setTopRight(const IntSize& size) { m_topRight = size; }
    50         void setBottomLeft(const IntSize& size) { m_bottomLeft = size; }
    51         void setBottomRight(const IntSize& size) { m_bottomRight = size; }
    52         const IntSize& topLeft() const { return m_topLeft; }
    53         const IntSize& topRight() const { return m_topRight; }
    54         const IntSize& bottomLeft() const { return m_bottomLeft; }
    55         const IntSize& bottomRight() const { return m_bottomRight; }
     48        void setTopLeft(const LayoutSize& size) { m_topLeft = size; }
     49        void setTopRight(const LayoutSize& size) { m_topRight = size; }
     50        void setBottomLeft(const LayoutSize& size) { m_bottomLeft = size; }
     51        void setBottomRight(const LayoutSize& size) { m_bottomRight = size; }
     52        const LayoutSize& topLeft() const { return m_topLeft; }
     53        const LayoutSize& topRight() const { return m_topRight; }
     54        const LayoutSize& bottomLeft() const { return m_bottomLeft; }
     55        const LayoutSize& bottomRight() const { return m_bottomRight; }
    5656
    5757        bool isZero() const;
    … …  
    6161
    6262        void scale(float factor);
    63         void expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth);
    64         void expand(int size) { expand(size, size, size, size); }
    65         void shrink(int topWidth, int bottomWidth, int leftWidth, int rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
    66         void shrink(int size) { shrink(size, size, size, size); }
     63        void expand(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth);
     64        void expand(LayoutUnit size) { expand(size, size, size, size); }
     65        void shrink(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
     66        void shrink(LayoutUnit size) { shrink(size, size, size, size); }
    6767
    6868    private:
    69         IntSize m_topLeft;
    70         IntSize m_topRight;
    71         IntSize m_bottomLeft;
    72         IntSize m_bottomRight;
     69        LayoutSize m_topLeft;
     70        LayoutSize m_topRight;
     71        LayoutSize m_bottomLeft;
     72        LayoutSize m_bottomRight;
    7373    };
    7474
    75     explicit RoundedIntRect(const IntRect&, const Radii& = Radii());
    76     RoundedIntRect(int x, int y, int width, int height);
    77     RoundedIntRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight);
     75    explicit RoundedRect(const LayoutRect&, const Radii& = Radii());
     76    RoundedRect(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height);
     77    RoundedRect(const LayoutRect&, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight);
    7878
    79     const IntRect& rect() const { return m_rect; }
     79    const LayoutRect& rect() const { return m_rect; }
    8080    const Radii& radii() const { return m_radii; }
    8181    bool isRounded() const { return !m_radii.isZero(); }
    8282    bool isEmpty() const { return m_rect.isEmpty(); }
    8383
    84     void setRect(const IntRect& rect) { m_rect = rect; }
     84    void setRect(const LayoutRect& rect) { m_rect = rect; }
    8585    void setRadii(const Radii& radii) { m_radii = radii; }
    8686
    87     void move(const IntSize& size) { m_rect.move(size); }
    88     void inflate(int size) { m_rect.inflate(size);  }
    89     void inflateWithRadii(int size);
    90     void expandRadii(int size) { m_radii.expand(size); }
    91     void shrinkRadii(int size) { m_radii.shrink(size); }
     87    void move(const LayoutSize& size) { m_rect.move(size); }
     88    void inflate(LayoutUnit size) { m_rect.inflate(size);  }
     89    void inflateWithRadii(LayoutUnit size);
     90    void expandRadii(LayoutUnit size) { m_radii.expand(size); }
     91    void shrinkRadii(LayoutUnit size) { m_radii.shrink(size); }
    9292
    9393    void includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
    … …  
    9797
    9898private:
    99     IntRect m_rect;
     99    LayoutRect m_rect;
    100100    Radii m_radii;
    101101};
    102102
    103 inline bool operator==(const RoundedIntRect::Radii& a, const RoundedIntRect::Radii& b)
     103inline bool operator==(const RoundedRect::Radii& a, const RoundedRect::Radii& b)
    104104{
    105105    return a.topLeft() == b.topLeft() && a.topRight() == b.topRight() && a.bottomLeft() == b.bottomLeft() && a.bottomRight() == b.bottomRight();
    106106}
    107107
    108 inline bool operator==(const RoundedIntRect& a, const RoundedIntRect& b)
     108inline bool operator==(const RoundedRect& a, const RoundedRect& b)
    109109{
    110110    return a.rect() == b.rect() && a.radii() == b.radii();
    … …  
    114114} // namespace WebCore
    115115
    116 #endif // RoundedIntRect_h
     116#endif // RoundedRect_h

  • trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp

    r90406 r90832  
    8484    }
    8585
    86     void setLastShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii)
     86    void setLastShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedRect::Radii& radii)
    8787    {
    8888        m_lastWasInset = false;
    … …  
    9494    }
    9595
    96     void setLastInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii)
     96    void setLastInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedRect::Radii& radii)
    9797    {
    9898        m_lastWasInset = true;
    … …  
    105105    }
    106106   
    107     bool matchesLastShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii) const
     107    bool matchesLastShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedRect::Radii& radii) const
    108108    {
    109109        if (m_lastWasInset)
    … …  
    112112    }
    113113
    114     bool matchesLastInsetShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii) const
     114    bool matchesLastInsetShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedRect::Radii& radii) const
    115115    {
    116116        if (!m_lastWasInset)
    … …  
    150150    FloatRect m_lastInsetBounds;
    151151    FloatRect m_lastShadowRect;
    152     RoundedIntRect::Radii m_lastRadii;
     152    RoundedRect::Radii m_lastRadii;
    153153    Color m_lastColor;
    154154    ColorSpace m_lastColorSpace;
    … …  
    477477}
    478478
    479 static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const RoundedIntRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
     479static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const RoundedRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
    480480{
    481481    leftSlice = twiceRadius.width() + max(radii.topLeft().width(), radii.bottomLeft().width());
    … …  
    486486}
    487487
    488 IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedIntRect::Radii& radii) const
     488IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedRect::Radii& radii) const
    489489{
    490490    const int templateSideLength = 1;
    … …  
    504504}
    505505
    506 void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii)
     506void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii)
    507507{
    508508    IntRect layerRect = calculateLayerBoundingRect(graphicsContext, shadowedRect, graphicsContext->clipBounds());
    … …  
    531531}
    532532
    533 void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii)
     533void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii)
    534534{
    535535    IntRect layerRect = calculateLayerBoundingRect(graphicsContext, rect, graphicsContext->clipBounds());
    … …  
    558558}
    559559
    560 void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii, const IntRect& layerRect)
     560void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntRect& layerRect)
    561561{
    562562    m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
    … …  
    592592}
    593593
    594 void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii, const IntRect& layerRect)
     594void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii, const IntRect& layerRect)
    595595{
    596596    m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
    … …  
    665665 */
    666666
    667 void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
     667void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
    668668{
    669669    GraphicsContextStateSaver stateSaver(*graphicsContext);
    … …  
    727727}
    728728
    729 void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
     729void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
    730730{
    731731    GraphicsContextStateSaver stateSaver(*graphicsContext);
    … …  
    770770}
    771771
    772 void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const RoundedIntRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
     772void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const RoundedRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
    773773{
    774774    const IntSize twiceRadius = IntSize(bufferPadding.width() * 2, bufferPadding.height() * 2);

  • trunk/Source/WebCore/platform/graphics/ShadowBlur.h

    r90406 r90832  
    3333#include "ColorSpace.h"
    3434#include "FloatRect.h"
    35 #include "RoundedIntRect.h"
     35#include "RoundedRect.h"
    3636#include <wtf/Noncopyable.h>
    3737
    … …  
    6262    void endShadowLayer(GraphicsContext*);
    6363
    64     void drawRectShadow(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&);
    65     void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii);
     64    void drawRectShadow(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&);
     65    void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii);
    6666
    6767    void blurLayerImage(unsigned char*, const IntSize&, int stride);
    … …  
    8383   
    8484    IntRect calculateLayerBoundingRect(GraphicsContext*, const FloatRect& layerArea, const IntRect& clipRect);
    85     IntSize templateSize(const IntSize& blurredEdgeSize, const RoundedIntRect::Radii&) const;
     85    IntSize templateSize(const IntSize& blurredEdgeSize, const RoundedRect::Radii&) const;
    8686
    87     void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&, const IntRect& layerRect);
    88     void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
     87    void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntRect& layerRect);
     88    void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
    8989
    90     void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii&, const IntRect& layerRect);
    91     void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
     90    void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntRect& layerRect);
     91    void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
    9292   
    93     void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const RoundedIntRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
     93    void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const RoundedRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
    9494   
    9595    void blurShadowBuffer(const IntSize& templateSize);

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r89397 r90832  
    704704
    705705        ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
    706         contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii());
     706        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii());
    707707    }
    708708
    … …  
    733733
    734734        ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
    735         contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii());
     735        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii());
    736736    }
    737737
    … …  
    766766
    767767        ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
    768         contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
     768        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
    769769    }
    770770
    … …  
    787787}
    788788
    789 void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedIntRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
     789void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
    790790{
    791791    if (paintingDisabled())

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

    r90773 r90832  
    851851        // into a transparency layer, and then clip that in one go (which requires setting up the clip before
    852852        // beginning the layer).
    853         RoundedIntRect border = style()->getRoundedBorderFor(paintRect);
     853        RoundedRect border = style()->getRoundedBorderFor(paintRect);
    854854        stateSaver.save();
    855855        paintInfo.context->addRoundedRectClip(border);

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

    r90675 r90832  
    564564}
    565565
    566 RoundedIntRect RenderBoxModelObject::getBackgroundRoundedRect(const IntRect& borderRect, InlineFlowBox* box, int inlineBoxWidth, int inlineBoxHeight,
     566RoundedRect RenderBoxModelObject::getBackgroundRoundedRect(const LayoutRect& borderRect, InlineFlowBox* box, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
    567567    bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
    568568{
    569     RoundedIntRect border = style()->getRoundedBorderFor(borderRect, includeLogicalLeftEdge, includeLogicalRightEdge);
     569    RoundedRect border = style()->getRoundedBorderFor(borderRect, includeLogicalLeftEdge, includeLogicalRightEdge);
    570570    if (box && (box->nextLineBox() || box->prevLineBox())) {
    571         RoundedIntRect segmentBorder = style()->getRoundedBorderFor(IntRect(0, 0, inlineBoxWidth, inlineBoxHeight), includeLogicalLeftEdge, includeLogicalRightEdge);
     571        RoundedRect segmentBorder = style()->getRoundedBorderFor(LayoutRect(0, 0, inlineBoxWidth, inlineBoxHeight), includeLogicalLeftEdge, includeLogicalRightEdge);
    572572        border.setRadii(segmentBorder.radii());
    573573    }
    … …  
    632632
    633633        if (hasRoundedBorder && bleedAvoidance != BackgroundBleedUseTransparencyLayer) {
    634             RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
     634            RoundedRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
    635635            context->fillRoundedRect(border, bgColor, style()->colorSpace());
    636636        } else
    … …  
    643643    GraphicsContextStateSaver clipToBorderStateSaver(*context, clipToBorderRadius);
    644644    if (clipToBorderRadius) {
    645         RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
     645        RoundedRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
    646646        context->addRoundedRectClip(border);
    647647    }
    … …  
    12301230}
    12311231
    1232 void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     1232void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    12331233    const IntRect& sideRect, BoxSide side, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge edges[], const Path* path,
    12341234    BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
    … …  
    12681268}
    12691269
    1270 void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     1270void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    12711271                                            const BorderEdge edges[], BorderEdgeFlags edgeSet, BackgroundBleedAvoidance bleedAvoidance,
    12721272                                            bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
    … …  
    12791279   
    12801280    if (edges[BSTop].shouldRender() && includesEdge(edgeSet, BSTop)) {
    1281         IntRect sideRect = outerBorder.rect();
     1281        LayoutRect sideRect = outerBorder.rect();
    12821282        sideRect.setHeight(edges[BSTop].width);
    12831283
    … …  
    12871287
    12881288    if (edges[BSBottom].shouldRender() && includesEdge(edgeSet, BSBottom)) {
    1289         IntRect sideRect = outerBorder.rect();
     1289        LayoutRect sideRect = outerBorder.rect();
    12901290        sideRect.shiftYEdgeTo(sideRect.maxY() - edges[BSBottom].width);
    12911291
    … …  
    12951295
    12961296    if (edges[BSLeft].shouldRender() && includesEdge(edgeSet, BSLeft)) {
    1297         IntRect sideRect = outerBorder.rect();
     1297        LayoutRect sideRect = outerBorder.rect();
    12981298        sideRect.setWidth(edges[BSLeft].width);
    12991299
    … …  
    13031303
    13041304    if (edges[BSRight].shouldRender() && includesEdge(edgeSet, BSRight)) {
    1305         IntRect sideRect = outerBorder.rect();
     1305        LayoutRect sideRect = outerBorder.rect();
    13061306        sideRect.shiftXEdgeTo(sideRect.maxX() - edges[BSRight].width);
    13071307
    … …  
    13111311}
    13121312
    1313 void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     1313void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    13141314                                                       const BorderEdge edges[], BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias)
    13151315{
    … …  
    13641364    getBorderEdgeInfo(edges, includeLogicalLeftEdge, includeLogicalRightEdge);
    13651365
    1366     RoundedIntRect outerBorder = style->getRoundedBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
    1367     RoundedIntRect innerBorder = style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
     1366    RoundedRect outerBorder = style->getRoundedBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
     1367    RoundedRect innerBorder = style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
    13681368
    13691369    const AffineTransform& currentCTM = graphicsContext->getCTM();
    … …  
    15171517        {
    15181518            GraphicsContextStateSaver stateSaver(*graphicsContext);
    1519             RoundedIntRect innerClip = style->getRoundedInnerBorderFor(borderRect,
     1519            RoundedRect innerClip = style->getRoundedInnerBorderFor(borderRect,
    15201520                innerBorderTopWidth, innerBorderBottomWidth, innerBorderLeftWidth, innerBorderRightWidth,
    15211521                includeLogicalLeftEdge, includeLogicalRightEdge);
    … …  
    15371537            }
    15381538               
    1539             RoundedIntRect outerClip = style->getRoundedInnerBorderFor(outerRect,
     1539            RoundedRect outerClip = style->getRoundedInnerBorderFor(outerRect,
    15401540                outerBorderTopWidth, outerBorderBottomWidth, outerBorderLeftWidth, outerBorderRightWidth,
    15411541                includeLogicalLeftEdge, includeLogicalRightEdge);
    … …  
    15631563        // Paint inner only
    15641564        GraphicsContextStateSaver stateSaver(*graphicsContext);
    1565         int topWidth = edges[BSTop].usedWidth() / 2;
    1566         int bottomWidth = edges[BSBottom].usedWidth() / 2;
    1567         int leftWidth = edges[BSLeft].usedWidth() / 2;
    1568         int rightWidth = edges[BSRight].usedWidth() / 2;
    1569 
    1570         RoundedIntRect clipRect = style->getRoundedInnerBorderFor(borderRect,
     1565        LayoutUnit topWidth = edges[BSTop].usedWidth() / 2;
     1566        LayoutUnit bottomWidth = edges[BSBottom].usedWidth() / 2;
     1567        LayoutUnit leftWidth = edges[BSLeft].usedWidth() / 2;
     1568        LayoutUnit rightWidth = edges[BSRight].usedWidth() / 2;
     1569
     1570        RoundedRect clipRect = style->getRoundedInnerBorderFor(borderRect,
    15711571            topWidth, bottomWidth, leftWidth, rightWidth,
    15721572            includeLogicalLeftEdge, includeLogicalRightEdge);
    … …  
    16231623
    16241624
    1625     RoundedIntRect border(rect);
     1625    RoundedRect border(rect);
    16261626   
    16271627    GraphicsContextStateSaver stateSaver(*graphicsContext, false);
    … …  
    19271927}
    19281928
    1929 void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContext, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     1929void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContext, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    19301930                                                 BoxSide side, bool firstEdgeMatches, bool secondEdgeMatches)
    19311931{
    … …  
    20982098        return;
    20992099
    2100     RoundedIntRect border = (shadowStyle == Inset) ? s->getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
     2100    RoundedRect border = (shadowStyle == Inset) ? s->getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
    21012101                                                   : s->getRoundedBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge);
    21022102
    … …  
    21192119
    21202120        if (shadow->style() == Normal) {
    2121             RoundedIntRect fillRect = border;
     2121            RoundedRect fillRect = border;
    21222122            fillRect.inflate(shadowSpread);
    21232123            if (fillRect.isEmpty())
    … …  
    21432143
    21442144            if (hasBorderRadius) {
    2145                 RoundedIntRect rectToClipOut = border;
     2145                RoundedRect rectToClipOut = border;
    21462146
    21472147                // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
    … …  
    22072207
    22082208            LayoutRect outerRect = areaCastingShadowInHole(border.rect(), shadowBlur, shadowSpread, shadowOffset);
    2209             RoundedIntRect roundedHole(holeRect, border.radii());
     2209            RoundedRect roundedHole(holeRect, border.radii());
    22102210
    22112211            GraphicsContextStateSaver stateSaver(*context);

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

    r90675 r90832  
    150150    IntSize calculateFillTileSize(const FillLayer*, IntSize scaledSize) const;
    151151
    152     RoundedIntRect getBackgroundRoundedRect(const IntRect&, InlineFlowBox*, int inlineBoxWidth, int inlineBoxHeight,
     152    RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
    153153        bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
    154154
    155     void clipBorderSidePolygon(GraphicsContext*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     155    void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    156156                               BoxSide, bool firstEdgeMatches, bool secondEdgeMatches);
    157     void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     157    void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    158158                                const IntRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const class BorderEdge[],
    159159                                const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
    160     void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     160    void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    161161                          const class BorderEdge[], BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false);
    162     void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
     162    void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
    163163                          const class BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance,
    164164                          bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = 0);

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r90525 r90832  
    10251025    GraphicsContextStateSaver stateSaver(*paintInfo.context);
    10261026
    1027     RoundedIntRect border = o->style()->getRoundedBorderFor(r);
     1027    RoundedRect border = o->style()->getRoundedBorderFor(r);
    10281028    int radius = border.radii().topLeft().width();
    10291029
    … …  
    10591059        GraphicsContextStateSaver stateSaver(*paintInfo.context);
    10601060        CGContextClipToRect(context, topGradient);
    1061         paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
     1061        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingLayoutRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
    10621062        context = cgContextContainer.context();
    10631063        CGContextDrawShading(context, topShading.get());
    … …  
    10671067        GraphicsContextStateSaver stateSaver(*paintInfo.context);
    10681068        CGContextClipToRect(context, bottomGradient);
    1069         paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
     1069        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingLayoutRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
    10701070        context = cgContextContainer.context();
    10711071        CGContextDrawShading(context, bottomShading.get());
    … …  
    12931293
    12941294    IntSize radius(trackRadius, trackRadius);
    1295     paintInfo.context->addRoundedRectClip(RoundedIntRect(bounds, radius, radius, radius, radius));
     1295    paintInfo.context->addRoundedRectClip(RoundedRect(bounds, radius, radius, radius, radius));
    12961296    context = localContext.cgContext();
    12971297    CGContextDrawShading(context, mainShading.get());

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

    r88415 r90832  
    754754    paintInfo.context->save();
    755755
    756     RoundedIntRect bound = o->style()->getRoundedBorderFor(r);
     756    RoundedRect bound = o->style()->getRoundedBorderFor(r);
    757757    int radius = bound.radii().topLeft().width();
    758758
    … …  
    784784    paintInfo.context->save();
    785785    CGContextClipToRect(context, topGradient);
    786     paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(topGradient), bound.radii().topLeft(), bound.radii().topRight(), IntSize(), IntSize()));
     786    paintInfo.context->addRoundedRectClip(RoundedRect(enclosingIntRect(topGradient), bound.radii().topLeft(), bound.radii().topRight(), IntSize(), IntSize()));
    787787    CGContextDrawShading(context, topShading.get());
    788788    paintInfo.context->restore();
    … …  
    791791        paintInfo.context->save();
    792792        CGContextClipToRect(context, bottomGradient);
    793         paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), bound.radii().bottomLeft(), bound.radii().bottomRight()));
     793        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), bound.radii().bottomLeft(), bound.radii().bottomRight()));
    794794        CGContextDrawShading(context, bottomShading.get());
    795795        paintInfo.context->restore();
    … …  
    955955{
    956956    IntSize radius(trackRadius, trackRadius);
    957     RoundedIntRect bounds(r, radius, radius, radius, radius);
     957    RoundedRect bounds(r, radius, radius, radius, radius);
    958958
    959959    if (o->style()->appearance() ==  SliderHorizontalPart)

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

    r88405 r90832  
    379379    IntRect cancelBounds(IntPoint(x, y), cancelSize);
    380380    paintInfo.context->save();
    381     paintInfo.context->addRoundedRectClip(RoundedIntRect(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius));
     381    paintInfo.context->addRoundedRectClip(RoundedRect(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius));
    382382    paintInfo.context->fillRect(cancelBounds, buttonColor, ColorSpaceDeviceRGB);
    383383

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

    r90642 r90832  
    775775}
    776776
    777 static RoundedIntRect::Radii calcRadiiFor(const BorderData& border, int width, int height)
    778 {
    779     return RoundedIntRect::Radii(IntSize(border.topLeft().width().calcValue(width),
    780                                          border.topLeft().height().calcValue(height)),
    781                                  IntSize(border.topRight().width().calcValue(width),
    782                                          border.topRight().height().calcValue(height)),
    783                                  IntSize(border.bottomLeft().width().calcValue(width),
    784                                          border.bottomLeft().height().calcValue(height)),
    785                                  IntSize(border.bottomRight().width().calcValue(width),
    786                                          border.bottomRight().height().calcValue(height)));
    787 }
    788 
    789 static float calcConstraintScaleFor(const IntRect& rect, const RoundedIntRect::Radii& radii)
     777static RoundedRect::Radii calcRadiiFor(const BorderData& border, int width, int height)
     778{
     779    return RoundedRect::Radii(
     780        LayoutSize(border.topLeft().width().calcValue(width),
     781                   border.topLeft().height().calcValue(height)),
     782        LayoutSize(border.topRight().width().calcValue(width),
     783                   border.topRight().height().calcValue(height)),
     784        LayoutSize(border.bottomLeft().width().calcValue(width),
     785                   border.bottomLeft().height().calcValue(height)),
     786        LayoutSize(border.bottomRight().width().calcValue(width),
     787                   border.bottomRight().height().calcValue(height)));
     788}
     789
     790static float calcConstraintScaleFor(const IntRect& rect, const RoundedRect::Radii& radii)
    790791{
    791792    // Constrain corner radii using CSS3 rules:
    … …  
    819820}
    820821
    821 RoundedIntRect RenderStyle::getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
    822 {
    823     RoundedIntRect roundedRect(borderRect);
     822RoundedRect RenderStyle::getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
     823{
     824    RoundedRect roundedRect(borderRect);
    824825    if (hasBorderRadius()) {
    825         RoundedIntRect::Radii radii = calcRadiiFor(surround->border, borderRect.width(), borderRect.height());
     826        RoundedRect::Radii radii = calcRadiiFor(surround->border, borderRect.width(), borderRect.height());
    826827        radii.scale(calcConstraintScaleFor(borderRect, radii));
    827828        roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);
    … …  
    830831}
    831832
    832 RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
     833RoundedRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
    833834{
    834835    bool horizontal = isHorizontalWritingMode();
    … …  
    842843}
    843844
    844 RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
     845RoundedRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
    845846    int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
    846847{
    … …  
    850851            borderRect.height() - topWidth - bottomWidth);
    851852
    852     RoundedIntRect roundedRect(innerRect);
     853    RoundedRect roundedRect(innerRect);
    853854
    854855    if (hasBorderRadius()) {
    855         RoundedIntRect::Radii radii = getRoundedBorderFor(borderRect).radii();
     856        RoundedRect::Radii radii = getRoundedBorderFor(borderRect).radii();
    856857        radii.shrink(topWidth, bottomWidth, leftWidth, rightWidth);
    857858        roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);

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

    r90642 r90832  
    4545#include "OutlineValue.h"
    4646#include "RenderStyleConstants.h"
    47 #include "RoundedIntRect.h"
     47#include "RoundedRect.h"
    4848#include "ShadowData.h"
    4949#include "StyleBackgroundData.h"
    … …  
    872872    }
    873873   
    874     RoundedIntRect getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
    875     RoundedIntRect getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
    876 
    877     RoundedIntRect getRoundedInnerBorderFor(const IntRect& borderRect,
     874    RoundedRect getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
     875    RoundedRect getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
     876
     877    RoundedRect getRoundedInnerBorderFor(const IntRect& borderRect,
    878878        int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
    879879
Note: See TracChangeset for help on using the changeset viewer.