Change roundedIntRect to roundedRect
authorleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jul 2011 18:37:09 +0000 (18:37 +0000)
committerleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Jul 2011 18:37:09 +0000 (18:37 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.order
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/graphics/GraphicsContext.cpp
Source/WebCore/platform/graphics/GraphicsContext.h
Source/WebCore/platform/graphics/Path.cpp
Source/WebCore/platform/graphics/Path.h
Source/WebCore/platform/graphics/RoundedRect.cpp [moved from Source/WebCore/platform/graphics/RoundedIntRect.cpp with 73% similarity]
Source/WebCore/platform/graphics/RoundedRect.h [moved from Source/WebCore/platform/graphics/RoundedIntRect.h with 55% similarity]
Source/WebCore/platform/graphics/ShadowBlur.cpp
Source/WebCore/platform/graphics/ShadowBlur.h
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderBoxModelObject.h
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebCore/rendering/RenderThemeSafari.cpp
Source/WebCore/rendering/RenderThemeWinCE.cpp
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h

index 629982a..5636e95 100644 (file)
@@ -1079,7 +1079,7 @@ SET(WebCore_SOURCES
     platform/graphics/Path.cpp
     platform/graphics/PathTraversalState.cpp
     platform/graphics/Pattern.cpp
-    platform/graphics/RoundedIntRect.cpp
+    platform/graphics/RoundedRect.cpp
     platform/graphics/SegmentedFontData.cpp
     platform/graphics/ShadowBlur.cpp
     platform/graphics/SimpleFontData.cpp
index 8a14fa2..79e372d 100644 (file)
@@ -1,3 +1,102 @@
+2011-07-12  Levi Weintraub  <leviw@chromium.org>
+
+        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:
+
 2011-07-12  Mike Reed  <reed@google.com>
 
         [skia] optimize getImageData to avoid a copy when not needed. lockPixels() now does the right thing.
index 64dea88..d61cb84 100644 (file)
@@ -2543,8 +2543,8 @@ webcore_sources += \
        Source/WebCore/platform/graphics/PathTraversalState.h \
        Source/WebCore/platform/graphics/Pattern.cpp \
        Source/WebCore/platform/graphics/Pattern.h \
-       Source/WebCore/platform/graphics/RoundedIntRect.cpp \
-       Source/WebCore/platform/graphics/RoundedIntRect.h \
+       Source/WebCore/platform/graphics/RoundedRect.cpp \
+       Source/WebCore/platform/graphics/RoundedRect.h \
        Source/WebCore/platform/graphics/SegmentedFontData.cpp \
        Source/WebCore/platform/graphics/SegmentedFontData.h \
        Source/WebCore/platform/graphics/ShadowBlur.cpp \
index 869d278..e365037 100644 (file)
             'platform/graphics/MediaPlayer.h',
             'platform/graphics/Path.h',
             'platform/graphics/Pattern.h',
-            'platform/graphics/RoundedIntRect.h',
+            'platform/graphics/RoundedRect.h',
             'platform/graphics/SimpleFontData.h',
             'platform/graphics/StringTruncator.h',
             'platform/graphics/SVGGlyph.h',
             'platform/graphics/PathTraversalState.cpp',
             'platform/graphics/PathTraversalState.h',
             'platform/graphics/Pattern.cpp',
-            'platform/graphics/RoundedIntRect.cpp',
+            'platform/graphics/RoundedRect.cpp',
             'platform/graphics/SegmentedFontData.cpp',
             'platform/graphics/SegmentedFontData.h',
             'platform/graphics/ShadowBlur.cpp',
index 289252a..02d7bd0 100644 (file)
@@ -5210,14 +5210,14 @@ __ZN7WebCore20RenderBoxModelObject11paintBorderEPNS_15GraphicsContextERKNS_7IntR
 __ZN7WebCore20RenderBoxModelObject19paintNinePieceImageEPNS_15GraphicsContextERKNS_7IntRectEPKNS_11RenderStyleERKNS_14NinePieceImageENS_17CompositeOperatorE
 __ZNK7WebCore20RenderBoxModelObject17getBorderEdgeInfoEPNS_10BorderEdgeEbb
 __ZNK7WebCore11RenderStyle19getRoundedBorderForERKNS_7IntRectEbb
-__ZN7WebCore14RoundedIntRectC1ERKNS_7IntRectERKNS0_5RadiiE
+__ZN7WebCore14RoundedRectC1ERKNS_7IntRectERKNS0_5RadiiE
 __ZNK7WebCore11RenderStyle24getRoundedInnerBorderForERKNS_7IntRectEbb
 __ZNK7WebCore11RenderStyle24getRoundedInnerBorderForERKNS_7IntRectEiiiibb
 __ZNK7WebCore15GraphicsContext6getCTMEv
 __ZN7WebCore15AffineTransformC1Edddddd
-__ZNK7WebCore14RoundedIntRect5Radii6isZeroEv
-__ZN7WebCore20RenderBoxModelObject16paintBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_PKNS_10BorderEdgeEjNS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
-__ZN7WebCore20RenderBoxModelObject18paintOneBorderSideEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_RKNS_7IntRectENS_7BoxSideESC_SC_PKNS_10BorderEdgeEPKNS_4PathENS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
+__ZNK7WebCore14RoundedRect5Radii6isZeroEv
+__ZN7WebCore20RenderBoxModelObject16paintBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_PKNS_10BorderEdgeEjNS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
+__ZN7WebCore20RenderBoxModelObject18paintOneBorderSideEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_RKNS_7IntRectENS_7BoxSideESC_SC_PKNS_10BorderEdgeEPKNS_4PathENS_24BackgroundBleedAvoidanceEbbbPKNS_5ColorE
 __ZN7WebCoreL17joinRequiresMitreENS_7BoxSideES0_PKNS_10BorderEdgeEb
 __ZN7WebCore12RenderObject18drawLineForBoxSideEPNS_15GraphicsContextEiiiiNS_7BoxSideENS_5ColorENS_12EBorderStyleEiib
 __ZNK7WebCore15GraphicsContext15shouldAntialiasEv
@@ -5755,7 +5755,7 @@ __ZNK7WebCore9RenderBox28computeReplacedLogicalHeightEv
 __ZNK7WebCore5Image17hasRelativeHeightEv
 __ZNK7WebCore9RenderBox27computeReplacedLogicalWidthEb
 __ZN7WebCore9RenderBox26repaintDuringLayoutIfMovedERKNS_7IntRectE
-__ZNK7WebCore14RoundedIntRect12isRenderableEv
+__ZNK7WebCore14RoundedRect12isRenderableEv
 __ZN7WebCore11RenderImage13paintIntoRectEPNS_15GraphicsContextERKNS_7IntRectE
 __ZN7WebCore20RenderBoxModelObject23shouldPaintAtLowQualityEPNS_15GraphicsContextEPNS_5ImageEPKvRKNS_7IntSizeE
 __ZN7WebCore22ImageQualityController23shouldPaintAtLowQualityEPNS_15GraphicsContextEPNS_20RenderBoxModelObjectEPNS_5ImageEPKvRKNS_7IntSizeE
@@ -9792,16 +9792,16 @@ __ZN7WebCore11LayoutStateC2EPNS_12RenderObjectE
 __ZN7WebCore11RenderStyle8setRightENS_6LengthE
 __ZNK7WebCore10ShadowData19adjustRectForShadowERNS_7IntRectEi
 __ZN7WebCore10ShadowBlurC1ERKNS_9FloatSizeES3_RKNS_5ColorENS_10ColorSpaceE
-__ZN7WebCore10ShadowBlur14drawRectShadowEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiE
+__ZN7WebCore10ShadowBlur14drawRectShadowEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiE
 __ZNK7WebCore15GraphicsContext10clipBoundsEv
 __ZN7WebCore10ShadowBlur26calculateLayerBoundingRectEPNS_15GraphicsContextERKNS_9FloatRectERKNS_7IntRectE
 __ZN7WebCore10ShadowBlur16adjustBlurRadiusEPNS_15GraphicsContextE
-__ZN7WebCore10ShadowBlur24drawRectShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_
+__ZN7WebCore10ShadowBlur24drawRectShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_
 __ZN7WebCore13ScratchBuffer16getScratchBufferERKNS_7IntSizeE
-__ZNK7WebCore13ScratchBuffer17matchesLastShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiE
+__ZNK7WebCore13ScratchBuffer17matchesLastShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectERKNS_14RoundedRect5RadiiE
 __ZN7WebCore10ShadowBlur16blurShadowBufferERKNS_7IntSizeE
 __ZN7WebCore10ShadowBlur14blurLayerImageEPhRKNS_7IntSizeEi
-__ZN7WebCore10ShadowBlur15drawLayerPiecesEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_NS0_15ShadowDirectionE
+__ZN7WebCore10ShadowBlur15drawLayerPiecesEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_NS0_15ShadowDirectionE
 __ZN7WebCore5TimerINS_13ScratchBufferEE5firedEv
 __ZN7WebCore13ScratchBuffer10timerFiredEPNS_5TimerIS0_EE
 __ZNK7WebCore12RenderObject27offsetFromAncestorContainerEPS0_
@@ -11237,7 +11237,7 @@ __ZNK7WebCore17HTMLObjectElement24imageSourceAttributeNameEv
 __ZN7WebCore17HTMLPlugInElement19defaultEventHandlerEPNS_5EventE
 __ZNK7WebCore16HTMLElementStack13inButtonScopeERKNS_13QualifiedNameE
 __ZN7WebCoreL22decodeNonASCIISequenceEPKhj
-__ZN7WebCore20RenderBoxModelObject21clipBorderSidePolygonEPNS_15GraphicsContextERKNS_14RoundedIntRectES5_NS_7BoxSideEbb
+__ZN7WebCore20RenderBoxModelObject21clipBorderSidePolygonEPNS_15GraphicsContextERKNS_14RoundedRectES5_NS_7BoxSideEbb
 __ZN7WebCore15GraphicsContext17clipConvexPolygonEmPKNS_10FloatPointEb
 __ZN7WebCore15GraphicsContext8clipPathERKNS_4PathENS_8WindRuleE
 __ZN3WTF9HashTableIPKN7WebCore14SimpleFontDataES4_NS_17IdentityExtractorIS4_EENS_7PtrHashIS4_EENS_10HashTraitsIS4_EESA_E3addIS4_S4_NS_22IdentityHashTranslatorIS4_S4_S8_EEEESt4pairINS_17HashTableIteratorIS4_S4_S6_S8_SA_SA_EEbERKT_RKT0_
@@ -14263,10 +14263,10 @@ __ZN7WebCore16HTMLImageElement26willMoveToNewOwnerDocumentEv
 __ZN7WebCore11ImageLoader33elementWillMoveToNewOwnerDocumentEv
 __ZNK7WebCore15RenderTableCell20cellBaselinePositionEv
 __ZNK7WebCore11RenderBlock20firstLineBoxBaselineEv
-__ZN7WebCore14RoundedIntRect5Radii5scaleEf
-__ZN7WebCore14RoundedIntRect19includeLogicalEdgesERKNS0_5RadiiEbbb
-__ZN7WebCore14RoundedIntRect5Radii6expandEiiii
-__ZN7WebCore4Path14addRoundedRectERKNS_14RoundedIntRectE
+__ZN7WebCore14RoundedRect5Radii5scaleEf
+__ZN7WebCore14RoundedRect19includeLogicalEdgesERKNS0_5RadiiEbbb
+__ZN7WebCore14RoundedRect5Radii6expandEiiii
+__ZN7WebCore4Path14addRoundedRectERKNS_14RoundedRectE
 __ZN7WebCore4Path14addRoundedRectERKNS_9FloatRectERKNS_9FloatSizeES6_S6_S6_
 __ZN7WebCore21createListItemElementEPNS_8DocumentE
 __ZN7WebCore13HTMLLIElement6createEPNS_8DocumentE
@@ -14366,13 +14366,13 @@ __ZN3WTF9HashTableIPKN7WebCore13InlineTextBoxESt4pairIS4_NS1_7IntRectEENS_18Pair
 __ZN3WTF9HashTableIPKN7WebCore13InlineTextBoxESt4pairIS4_NS1_7IntRectEENS_18PairFirstExtractorIS7_EENS_7PtrHashIS4_EENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS6_EEEESE_E6lookupERKS4_
 __ZN3WTF9HashTableIPKN7WebCore13InlineTextBoxESt4pairIS4_NS1_7IntRectEENS_18PairFirstExtractorIS7_EENS_7PtrHashIS4_EENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS6_EEEESE_E6rehashEi
 __ZNK7WebCore15GraphicsContext23shadowsIgnoreTransformsEv
-__ZN7WebCore15GraphicsContext18clipOutRoundedRectERKNS_14RoundedIntRectE
+__ZN7WebCore15GraphicsContext18clipOutRoundedRectERKNS_14RoundedRectE
 __ZN7WebCore15GraphicsContext7clipOutERKNS_4PathE
-__ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_14RoundedIntRectERKNS_5ColorENS_10ColorSpaceE
+__ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_14RoundedRectERKNS_5ColorENS_10ColorSpaceE
 __ZN7WebCore15GraphicsContext15fillRoundedRectERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_RKNS_5ColorENS_10ColorSpaceE
 __ZN7WebCoreL39backgroundRectAdjustedForBleedAvoidanceEPNS_15GraphicsContextERKNS_7IntRectENS_24BackgroundBleedAvoidanceE
 __ZN7WebCore20RenderBoxModelObject24getBackgroundRoundedRectERKNS_7IntRectEPNS_13InlineFlowBoxEiibb
-__ZN7WebCore15GraphicsContext18addRoundedRectClipERKNS_14RoundedIntRectE
+__ZN7WebCore15GraphicsContext18addRoundedRectClipERKNS_14RoundedRectE
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E16lookupForWritingIS2_NS_22IdentityHashTranslatorIS2_S7_SB_EEEES3_IPS7_bERKT_
 __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_
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E4findIS2_NS_22IdentityHashTranslatorIS2_S7_SB_EEEENS_17HashTableIteratorIS2_S7_S9_SB_SG_SE_EERKT_
@@ -14380,10 +14380,10 @@ __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18Pa
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E6rehashEi
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_E6removeEPS7_
 __ZN3WTF9HashTableIN7WebCore7IntSizeESt4pairIS2_NS_6RefPtrINS1_5ImageEEEENS_18PairFirstExtractorIS7_EENS_7IntHashIS2_EENS_14PairHashTraitsINS_10HashTraitsIS2_EENSD_IS6_EEEESE_ED1Ev
-__ZN7WebCore15GraphicsContext23fillRectWithRoundedHoleERKNS_7IntRectERKNS_14RoundedIntRectERKNS_5ColorENS_10ColorSpaceE
-__ZN7WebCore10ShadowBlur15drawInsetShadowEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiE
-__ZN7WebCore10ShadowBlur25drawInsetShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiERKNS_7IntSizeESC_
-__ZNK7WebCore13ScratchBuffer22matchesLastInsetShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectESA_RKNS_14RoundedIntRect5RadiiE
+__ZN7WebCore15GraphicsContext23fillRectWithRoundedHoleERKNS_7IntRectERKNS_14RoundedRectERKNS_5ColorENS_10ColorSpaceE
+__ZN7WebCore10ShadowBlur15drawInsetShadowEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiE
+__ZN7WebCore10ShadowBlur25drawInsetShadowWithTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiERKNS_7IntSizeESC_
+__ZNK7WebCore13ScratchBuffer22matchesLastInsetShadowERKNS_9FloatSizeERKNS_5ColorENS_10ColorSpaceERKNS_9FloatRectESA_RKNS_14RoundedRect5RadiiE
 __ZN7WebCore14GeneratedImage11drawPatternEPNS_15GraphicsContextERKNS_9FloatRectERKNS_15AffineTransformERKNS_10FloatPointENS_10ColorSpaceENS_17CompositeOperatorES5_
 __ZN7WebCore8Gradient31adjustParametersForTiledDrawingERNS_7IntSizeERNS_9FloatRectE
 __ZN7WebCore11ImageBuffer11drawPatternEPNS_15GraphicsContextERKNS_9FloatRectERKNS_15AffineTransformERKNS_10FloatPointENS_10ColorSpaceENS_17CompositeOperatorES5_
@@ -16692,7 +16692,7 @@ __ZNK3WTF9HashTableIPKN7WebCore13InlineTextBoxESt4pairIS4_S5_INS_6VectorIPKNS1_1
 __ZN7WebCore13InlineFlowBox25flipLinesInBlockDirectionEii
 __ZN7WebCore16findIntersectionERKNS_10FloatPointES2_S2_S2_RS0_
 __ZN7WebCore20RenderBoxModelObject19drawBoxSideFromPathEPNS_15GraphicsContextERKNS_7IntRectERKNS_4PathEPKNS_10BorderEdgeEffNS_7BoxSideEPKNS_11RenderStyleENS_5ColorENS_12EBorderStyleENS_24BackgroundBleedAvoidanceEbb
-__ZN7WebCore20RenderBoxModelObject27paintTranslucentBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedIntRectES8_PKNS_10BorderEdgeENS_24BackgroundBleedAvoidanceEbbb
+__ZN7WebCore20RenderBoxModelObject27paintTranslucentBorderSidesEPNS_15GraphicsContextEPKNS_11RenderStyleERKNS_14RoundedRectES8_PKNS_10BorderEdgeENS_24BackgroundBleedAvoidanceEbbb
 __ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore11RenderBlock14FloatingObjectELm4EEES7_NS_17IdentityExtractorIS7_EENS_28ListHashSetNodeHashFunctionsIS5_Lm4ENS3_27FloatingObjectHashFunctionsEEENS_10HashTraitsIS7_EESE_E16lookupForWritingERKS7_
 __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_
 __ZN3WTF9HashTableIPNS_15ListHashSetNodeIPN7WebCore11RenderBlock14FloatingObjectELm4EEES7_NS_17IdentityExtractorIS7_EENS_28ListHashSetNodeHashFunctionsIS5_Lm4ENS3_27FloatingObjectHashFunctionsEEENS_10HashTraitsIS7_EESE_E4findIPNS2_9RenderBoxENS_28ListHashSetTranslatorAdapterIS5_Lm4ESI_NS3_28FloatingObjectHashTranslatorEEEEENS_17HashTableIteratorIS7_S7_S9_SC_SE_SE_EERKT_
@@ -17115,7 +17115,7 @@ __ZNK7WebCore11RenderStyle15borderLeftWidthEv
 __ZNK7WebCore11RenderStyle17borderBottomWidthEv
 __ZN7WebCore11RenderStyle12setBorderFitENS_10EBorderFitE
 __ZNK7WebCore11RenderBlock18adjustForBorderFitEiRiS1_
-__ZN7WebCore10ShadowBlur27drawRectShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedIntRect5RadiiERKNS_7IntRectE
+__ZN7WebCore10ShadowBlur27drawRectShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectERKNS_14RoundedRect5RadiiERKNS_7IntRectE
 __ZN7WebCore10ShadowBlur16drawShadowBufferEPNS_15GraphicsContextE
 __ZNK7WebCore4Path6lengthEv
 __ZN7WebCore18PathTraversalStateC1ENS0_19PathTraversalActionE
@@ -17131,7 +17131,7 @@ __ZN3WTF6VectorIdLm0EE14expandCapacityEm
 __ZN7WebCore15GraphicsContext11setLineDashERKN3WTF6VectorIdLm0EEEf
 __ZN7WebCore13InlineFlowBox9paintMaskERNS_9PaintInfoEii
 __ZN7WebCore8SVGImage26nativeImageForCurrentFrameEv
-__ZN7WebCore10ShadowBlur28drawInsetShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedIntRect5RadiiERKNS_7IntRectE
+__ZN7WebCore10ShadowBlur28drawInsetShadowWithoutTilingEPNS_15GraphicsContextERKNS_9FloatRectES5_RKNS_14RoundedRect5RadiiERKNS_7IntRectE
 __ZN7WebCore11RenderStyle12setMaxHeightENS_6LengthE
 __ZN7WebCore13CSSStyleSheet18determineNamespaceERKN3WTF12AtomicStringE
 __ZNK7WebCore10StyleImage13errorOccurredEv
@@ -19416,7 +19416,7 @@ __ZNK7WebCore17SpinButtonElement19isSpinButtonElementEv
 __ZNK7WebCore17SpinButtonElement20isEnabledFormControlEv
 __ZNK7WebCore17SpinButtonElement21isReadOnlyFormControlEv
 __ZN7WebCore14RenderThemeMac16paintSliderTrackEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
-__ZN7WebCore14RoundedIntRectC1ERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_
+__ZN7WebCore14RoundedRectC1ERKNS_7IntRectERKNS_7IntSizeES6_S6_S6_
 __ZN7WebCoreL24TrackGradientInterpolateEPvPKdPd
 __ZN7WebCore14RenderThemeMac16paintSliderThumbEPNS_12RenderObjectERKNS_9PaintInfoERKNS_7IntRectE
 __ZNK7WebCore14RenderThemeMac21sliderThumbHorizontalEv
index 50b7d5b..6c01ee3 100644 (file)
@@ -999,7 +999,7 @@ SOURCES += \
     platform/graphics/Path.cpp \
     platform/graphics/PathTraversalState.cpp \
     platform/graphics/Pattern.cpp \
-    platform/graphics/RoundedIntRect.cpp \
+    platform/graphics/RoundedRect.cpp \
     platform/graphics/SegmentedFontData.cpp \
     platform/graphics/ShadowBlur.cpp \
     platform/graphics/SVGGlyph.cpp \
@@ -1990,7 +1990,7 @@ HEADERS += \
     platform/graphics/Path.h \
     platform/graphics/PathTraversalState.h \
     platform/graphics/Pattern.h \
-    platform/graphics/RoundedIntRect.h \
+    platform/graphics/RoundedRect.h \
     platform/graphics/qt/FontCustomPlatformData.h \
     platform/graphics/qt/ImageDecoderQt.h \
     platform/graphics/qt/StillImageQt.h \
index d26a363..f9ea155 100755 (executable)
                                        >
                                </File>
                                <File
-                                       RelativePath="..\platform\graphics\RoundedIntRect.cpp"
+                                       RelativePath="..\platform\graphics\RoundedRect.cpp"
                                        >
                                </File>
                                <File
-                                       RelativePath="..\platform\graphics\RoundedIntRect.h"
+                                       RelativePath="..\platform\graphics\RoundedRect.h"
                                        >
                                </File>
                                <File
index 586580d..63099a4 100644 (file)
                A71878900B2D04AC00A16ECE /* DragControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */; };
                A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */; };
                A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowContentSelector.h */; };
-               A73F95FE12C97BFE0031AAF9 /* RoundedIntRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */; };
-               A73F95FF12C97BFE0031AAF9 /* RoundedIntRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
+               A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A74C2D3C13811E0D00F83572 /* ShadowContentElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A74C2D3B13811E0D00F83572 /* ShadowContentElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A75E497410752ACB00C9B896 /* SerializedScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */; };
                A71A70C911AFB02000989D6D /* HTMLMeterElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMeterElement.idl; sourceTree = "<group>"; };
                A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowContentSelector.cpp; sourceTree = "<group>"; };
                A71C30B71381265E00DBC351 /* ShadowContentSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentSelector.h; sourceTree = "<group>"; };
-               A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedIntRect.cpp; sourceTree = "<group>"; };
-               A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedIntRect.h; sourceTree = "<group>"; };
+               A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
+               A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
                A74C2D3B13811E0D00F83572 /* ShadowContentElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentElement.h; sourceTree = "<group>"; };
                A75E497410752ACB00C9B896 /* SerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedScriptValue.h; sourceTree = "<group>"; };
                A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SerializedScriptValue.cpp; sourceTree = "<group>"; };
                                A88DD4860B4629A300C02990 /* PathTraversalState.h */,
                                A8FA6E5C0E4CFDED00D5CF49 /* Pattern.cpp */,
                                A8FA6E5B0E4CFDED00D5CF49 /* Pattern.h */,
-                               A73F95FC12C97BFE0031AAF9 /* RoundedIntRect.cpp */,
-                               A73F95FD12C97BFE0031AAF9 /* RoundedIntRect.h */,
+                               A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */,
+                               A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */,
                                371F4FFB0D25E7F300ECE0D5 /* SegmentedFontData.cpp */,
                                371F4FFA0D25E7F300ECE0D5 /* SegmentedFontData.h */,
                                0F3DD44D12F5EA1B000D9190 /* ShadowBlur.cpp */,
                                BC74DA371013F3F7007987AD /* RGBColor.h in Headers */,
                                A8CFF5E10A155A05000A4234 /* RootInlineBox.h in Headers */,
                                49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
-                               A73F95FF12C97BFE0031AAF9 /* RoundedIntRect.h in Headers */,
+                               A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
                                1C63A2480F71646600C09D5A /* RunLoopTimer.h in Headers */,
                                1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */,
                                1A569D210D7E2B82007C3983 /* runtime_method.h in Headers */,
                                BC74DA381013F3F7007987AD /* RGBColor.cpp in Sources */,
                                A8CFF5E70A155A05000A4234 /* RootInlineBox.cpp in Sources */,
                                49E911C80EF86D47009D0CAF /* RotateTransformOperation.cpp in Sources */,
-                               A73F95FE12C97BFE0031AAF9 /* RoundedIntRect.cpp in Sources */,
+                               A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */,
                                1C63A2490F71646600C09D5A /* RunLoopTimerCF.cpp in Sources */,
                                1A569D1E0D7E2B82007C3983 /* runtime_array.cpp in Sources */,
                                1A569D200D7E2B82007C3983 /* runtime_method.cpp in Sources */,
index c937ee7..6a7a291 100644 (file)
@@ -31,7 +31,7 @@
 #include "Generator.h"
 #include "ImageBuffer.h"
 #include "IntRect.h"
-#include "RoundedIntRect.h"
+#include "RoundedRect.h"
 #include "TextRun.h"
 
 using namespace std;
@@ -554,7 +554,7 @@ void GraphicsContext::clip(const IntRect& rect)
 }
 #endif
 
-void GraphicsContext::addRoundedRectClip(const RoundedIntRect& rect)
+void GraphicsContext::addRoundedRectClip(const RoundedRect& rect)
 {
     if (paintingDisabled())
         return;
@@ -564,7 +564,7 @@ void GraphicsContext::addRoundedRectClip(const RoundedIntRect& rect)
     clip(path);
 }
 
-void GraphicsContext::clipOutRoundedRect(const RoundedIntRect& rect)
+void GraphicsContext::clipOutRoundedRect(const RoundedRect& rect)
 {
     if (paintingDisabled())
         return;
@@ -620,13 +620,13 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorS
     setCompositeOperation(previousOperator);
 }
 
-void GraphicsContext::fillRoundedRect(const RoundedIntRect& rect, const Color& color, ColorSpace colorSpace)
+void GraphicsContext::fillRoundedRect(const RoundedRect& rect, const Color& color, ColorSpace colorSpace)
 {
     fillRoundedRect(rect.rect(), rect.radii().topLeft(), rect.radii().topRight(), rect.radii().bottomLeft(), rect.radii().bottomRight(), color, colorSpace);
 }
 
 #if !USE(CG)
-void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedIntRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
+void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
 {
     if (paintingDisabled())
         return;
index 4a4cbb0..8cdb4f2 100644 (file)
@@ -126,7 +126,7 @@ namespace WebCore {
 #endif
     class ImageBuffer;
     class IntRect;
-    class RoundedIntRect;
+    class RoundedRect;
     class KURL;
     class SharedGraphicsContext3D;
     class TextRun;
@@ -299,8 +299,8 @@ namespace WebCore {
         void fillRect(const FloatRect&, Generator&);
         void fillRect(const FloatRect&, const Color&, ColorSpace, CompositeOperator);
         void fillRoundedRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color&, ColorSpace);
-        void fillRoundedRect(const RoundedIntRect&, const Color&, ColorSpace);
-        void fillRectWithRoundedHole(const IntRect&, const RoundedIntRect& roundedHoleRect, const Color&, ColorSpace);
+        void fillRoundedRect(const RoundedRect&, const Color&, ColorSpace);
+        void fillRectWithRoundedHole(const IntRect&, const RoundedRect& roundedHoleRect, const Color&, ColorSpace);
 
         void clearRect(const FloatRect&);
 
@@ -330,10 +330,10 @@ namespace WebCore {
 
         void clip(const IntRect&);
         void clip(const FloatRect&);
-        void addRoundedRectClip(const RoundedIntRect&);
+        void addRoundedRectClip(const RoundedRect&);
         void addInnerRoundedRectClip(const IntRect&, int thickness);
         void clipOut(const IntRect&);
-        void clipOutRoundedRect(const RoundedIntRect&);
+        void clipOutRoundedRect(const RoundedRect&);
         void clipPath(const Path&, WindRule);
         void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias = true);
         void clipToImageBuffer(ImageBuffer*, const FloatRect&);
index 3b28b64..ff0fd22 100644 (file)
@@ -92,7 +92,7 @@ float Path::normalAngleAtLength(float length, bool& ok) const
 }
 #endif
 
-void Path::addRoundedRect(const RoundedIntRect& r)
+void Path::addRoundedRect(const RoundedRect& r)
 {
     addRoundedRect(r.rect(), r.radii().topLeft(), r.radii().topRight(), r.radii().bottomLeft(), r.radii().bottomRight());
 }
index c585c59..06ca9dd 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef Path_h
 #define Path_h
 
-#include "RoundedIntRect.h"
+#include "RoundedRect.h"
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
 
@@ -138,7 +138,7 @@ namespace WebCore {
         void addEllipse(const FloatRect&);
         void addRoundedRect(const FloatRect&, const FloatSize& roundingRadii);
         void addRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
-        void addRoundedRect(const RoundedIntRect&);
+        void addRoundedRect(const RoundedRect&);
 
         void translate(const FloatSize&);
 
  */
 
 #include "config.h"
-#include "RoundedIntRect.h"
+#include "RoundedRect.h"
 
-#include "IntRect.h"
 #include <algorithm>
 
 using namespace std;
 
 namespace WebCore {
 
-bool RoundedIntRect::Radii::isZero() const
+bool RoundedRect::Radii::isZero() const
 {
     return m_topLeft.isZero() && m_topRight.isZero() && m_bottomLeft.isZero() && m_bottomRight.isZero();
 }
 
-void RoundedIntRect::Radii::scale(float factor)
+void RoundedRect::Radii::scale(float factor)
 {
     if (factor == 1)
         return;
@@ -47,20 +46,20 @@ void RoundedIntRect::Radii::scale(float factor)
     // If either radius on a corner becomes zero, reset both radii on that corner.
     m_topLeft.scale(factor);
     if (!m_topLeft.width() || !m_topLeft.height())
-        m_topLeft = IntSize();
+        m_topLeft = LayoutSize();
     m_topRight.scale(factor);
     if (!m_topRight.width() || !m_topRight.height())
-        m_topRight = IntSize();
+        m_topRight = LayoutSize();
     m_bottomLeft.scale(factor);
     if (!m_bottomLeft.width() || !m_bottomLeft.height())
-        m_bottomLeft = IntSize();
+        m_bottomLeft = LayoutSize();
     m_bottomRight.scale(factor);
     if (!m_bottomRight.width() || !m_bottomRight.height())
-        m_bottomRight = IntSize();
+        m_bottomRight = LayoutSize();
 
 }
 
-void RoundedIntRect::Radii::expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth)
+void RoundedRect::Radii::expand(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth)
 {
     m_topLeft.setWidth(max(0, m_topLeft.width() + leftWidth));
     m_topLeft.setHeight(max(0, m_topLeft.height() + topWidth));
@@ -75,9 +74,9 @@ void RoundedIntRect::Radii::expand(int topWidth, int bottomWidth, int leftWidth,
     m_bottomRight.setHeight(max(0, m_bottomRight.height() + bottomWidth));
 }
 
-void RoundedIntRect::inflateWithRadii(int size)
+void RoundedRect::inflateWithRadii(LayoutUnit size)
 {
-    IntRect old = m_rect;
+    LayoutRect old = m_rect;
 
     m_rect.inflate(size);
     // Considering the inflation factor of shorter size to scale the radii seems appropriate here
@@ -90,7 +89,7 @@ void RoundedIntRect::inflateWithRadii(int size)
     m_radii.scale(factor);
 }
 
-void RoundedIntRect::Radii::includeLogicalEdges(const RoundedIntRect::Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
+void RoundedRect::Radii::includeLogicalEdges(const RoundedRect::Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
     if (includeLogicalLeftEdge) {
         if (isHorizontal)
@@ -109,53 +108,53 @@ void RoundedIntRect::Radii::includeLogicalEdges(const RoundedIntRect::Radii& edg
     }
 }
 
-void RoundedIntRect::Radii::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
+void RoundedRect::Radii::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
 {
     if (excludeLogicalLeftEdge) {
         if (isHorizontal)
-            m_bottomLeft = IntSize();
+            m_bottomLeft = LayoutSize();
         else
-            m_topRight = IntSize();
-        m_topLeft = IntSize();
+            m_topRight = LayoutSize();
+        m_topLeft = LayoutSize();
     }
         
     if (excludeLogicalRightEdge) {
         if (isHorizontal)
-            m_topRight = IntSize();
+            m_topRight = LayoutSize();
         else
-            m_bottomLeft = IntSize();
-        m_bottomRight = IntSize();
+            m_bottomLeft = LayoutSize();
+        m_bottomRight = LayoutSize();
     }
 }
 
-RoundedIntRect::RoundedIntRect(int x, int y, int width, int height)
+RoundedRect::RoundedRect(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height)
     : m_rect(x, y, width, height)
 {
 }
 
-RoundedIntRect::RoundedIntRect(const IntRect& rect, const Radii& radii)
+RoundedRect::RoundedRect(const LayoutRect& rect, const Radii& radii)
     : m_rect(rect)
     , m_radii(radii)
 {
 }
 
-RoundedIntRect::RoundedIntRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
+RoundedRect::RoundedRect(const LayoutRect& rect, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
     : m_rect(rect)
     , m_radii(topLeft, topRight, bottomLeft, bottomRight)
 {
 }
 
-void RoundedIntRect::includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
+void RoundedRect::includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
     m_radii.includeLogicalEdges(edges, isHorizontal, includeLogicalLeftEdge, includeLogicalRightEdge);
 }
 
-void RoundedIntRect::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
+void RoundedRect::excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge)
 {
     m_radii.excludeLogicalEdges(isHorizontal, excludeLogicalLeftEdge, excludeLogicalRightEdge);
 }
 
-bool RoundedIntRect::isRenderable() const
+bool RoundedRect::isRenderable() const
 {
     return m_radii.topLeft().width() + m_radii.topRight().width() <= m_rect.width()
         && m_radii.bottomLeft().width() + m_radii.bottomRight().width() <= m_rect.width()
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RoundedIntRect_h
-#define RoundedIntRect_h
+#ifndef RoundedRect_h
+#define RoundedRect_h
 
-#include "IntRect.h"
+#include "LayoutTypes.h"
 
 namespace WebCore {
 
 
-class RoundedIntRect {
+class RoundedRect {
 public:
     class Radii {
     public:
         Radii() {}
-        Radii(const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight)
+        Radii(const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight)
             : m_topLeft(topLeft)
             , m_topRight(topRight)
             , m_bottomLeft(bottomLeft)
@@ -45,14 +45,14 @@ public:
         {
         }
 
-        void setTopLeft(const IntSize& size) { m_topLeft = size; }
-        void setTopRight(const IntSize& size) { m_topRight = size; }
-        void setBottomLeft(const IntSize& size) { m_bottomLeft = size; }
-        void setBottomRight(const IntSize& size) { m_bottomRight = size; }
-        const IntSize& topLeft() const { return m_topLeft; }
-        const IntSize& topRight() const { return m_topRight; }
-        const IntSize& bottomLeft() const { return m_bottomLeft; }
-        const IntSize& bottomRight() const { return m_bottomRight; }
+        void setTopLeft(const LayoutSize& size) { m_topLeft = size; }
+        void setTopRight(const LayoutSize& size) { m_topRight = size; }
+        void setBottomLeft(const LayoutSize& size) { m_bottomLeft = size; }
+        void setBottomRight(const LayoutSize& size) { m_bottomRight = size; }
+        const LayoutSize& topLeft() const { return m_topLeft; }
+        const LayoutSize& topRight() const { return m_topRight; }
+        const LayoutSize& bottomLeft() const { return m_bottomLeft; }
+        const LayoutSize& bottomRight() const { return m_bottomRight; }
 
         bool isZero() const;
 
@@ -60,35 +60,35 @@ public:
         void excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge);
 
         void scale(float factor);
-        void expand(int topWidth, int bottomWidth, int leftWidth, int rightWidth);
-        void expand(int size) { expand(size, size, size, size); }
-        void shrink(int topWidth, int bottomWidth, int leftWidth, int rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
-        void shrink(int size) { shrink(size, size, size, size); }
+        void expand(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth);
+        void expand(LayoutUnit size) { expand(size, size, size, size); }
+        void shrink(LayoutUnit topWidth, LayoutUnit bottomWidth, LayoutUnit leftWidth, LayoutUnit rightWidth) { expand(-topWidth, -bottomWidth, -leftWidth, -rightWidth); }
+        void shrink(LayoutUnit size) { shrink(size, size, size, size); }
 
     private:
-        IntSize m_topLeft;
-        IntSize m_topRight;
-        IntSize m_bottomLeft;
-        IntSize m_bottomRight;
+        LayoutSize m_topLeft;
+        LayoutSize m_topRight;
+        LayoutSize m_bottomLeft;
+        LayoutSize m_bottomRight;
     };
 
-    explicit RoundedIntRect(const IntRect&, const Radii& = Radii());
-    RoundedIntRect(int x, int y, int width, int height);
-    RoundedIntRect(const IntRect&, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight);
+    explicit RoundedRect(const LayoutRect&, const Radii& = Radii());
+    RoundedRect(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height);
+    RoundedRect(const LayoutRect&, const LayoutSize& topLeft, const LayoutSize& topRight, const LayoutSize& bottomLeft, const LayoutSize& bottomRight);
 
-    const IntRect& rect() const { return m_rect; }
+    const LayoutRect& rect() const { return m_rect; }
     const Radii& radii() const { return m_radii; }
     bool isRounded() const { return !m_radii.isZero(); }
     bool isEmpty() const { return m_rect.isEmpty(); }
 
-    void setRect(const IntRect& rect) { m_rect = rect; }
+    void setRect(const LayoutRect& rect) { m_rect = rect; }
     void setRadii(const Radii& radii) { m_radii = radii; }
 
-    void move(const IntSize& size) { m_rect.move(size); }
-    void inflate(int size) { m_rect.inflate(size);  }
-    void inflateWithRadii(int size);
-    void expandRadii(int size) { m_radii.expand(size); }
-    void shrinkRadii(int size) { m_radii.shrink(size); }
+    void move(const LayoutSize& size) { m_rect.move(size); }
+    void inflate(LayoutUnit size) { m_rect.inflate(size);  }
+    void inflateWithRadii(LayoutUnit size);
+    void expandRadii(LayoutUnit size) { m_radii.expand(size); }
+    void shrinkRadii(LayoutUnit size) { m_radii.shrink(size); }
 
     void includeLogicalEdges(const Radii& edges, bool isHorizontal, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
     void excludeLogicalEdges(bool isHorizontal, bool excludeLogicalLeftEdge, bool excludeLogicalRightEdge);
@@ -96,16 +96,16 @@ public:
     bool isRenderable() const;
 
 private:
-    IntRect m_rect;
+    LayoutRect m_rect;
     Radii m_radii;
 };
 
-inline bool operator==(const RoundedIntRect::Radii& a, const RoundedIntRect::Radii& b)
+inline bool operator==(const RoundedRect::Radii& a, const RoundedRect::Radii& b)
 {
     return a.topLeft() == b.topLeft() && a.topRight() == b.topRight() && a.bottomLeft() == b.bottomLeft() && a.bottomRight() == b.bottomRight();
 }
 
-inline bool operator==(const RoundedIntRect& a, const RoundedIntRect& b)
+inline bool operator==(const RoundedRect& a, const RoundedRect& b)
 {
     return a.rect() == b.rect() && a.radii() == b.radii();
 }
@@ -113,4 +113,4 @@ inline bool operator==(const RoundedIntRect& a, const RoundedIntRect& b)
 
 } // namespace WebCore
 
-#endif // RoundedIntRect_h
+#endif // RoundedRect_h
index fa735aa..a502638 100644 (file)
@@ -83,7 +83,7 @@ public:
         return m_imageBuffer.get();
     }
 
-    void setLastShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii)
+    void setLastShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedRect::Radii& radii)
     {
         m_lastWasInset = false;
         m_lastRadius = radius;
@@ -93,7 +93,7 @@ public:
         m_lastRadii = radii;
     }
 
-    void setLastInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii)
+    void setLastInsetShadowValues(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedRect::Radii& radii)
     {
         m_lastWasInset = true;
         m_lastInsetBounds = bounds;
@@ -104,14 +104,14 @@ public:
         m_lastRadii = radii;
     }
     
-    bool matchesLastShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii) const
+    bool matchesLastShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& shadowRect, const RoundedRect::Radii& radii) const
     {
         if (m_lastWasInset)
             return false;
         return m_lastRadius == radius && m_lastColor == color && m_lastColorSpace == colorSpace && shadowRect == m_lastShadowRect && radii == m_lastRadii;
     }
 
-    bool matchesLastInsetShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedIntRect::Radii& radii) const
+    bool matchesLastInsetShadow(const FloatSize& radius, const Color& color, ColorSpace colorSpace, const FloatRect& bounds, const FloatRect& shadowRect, const RoundedRect::Radii& radii) const
     {
         if (!m_lastWasInset)
             return false;
@@ -149,7 +149,7 @@ private:
     
     FloatRect m_lastInsetBounds;
     FloatRect m_lastShadowRect;
-    RoundedIntRect::Radii m_lastRadii;
+    RoundedRect::Radii m_lastRadii;
     Color m_lastColor;
     ColorSpace m_lastColorSpace;
     FloatSize m_lastRadius;
@@ -476,7 +476,7 @@ void ShadowBlur::drawShadowBuffer(GraphicsContext* graphicsContext)
     graphicsContext->fillRect(FloatRect(m_layerOrigin, m_sourceRect.size()));
 }
 
-static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const RoundedIntRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
+static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const RoundedRect::Radii& radii, int& leftSlice, int& rightSlice, int& topSlice, int& bottomSlice)
 {
     leftSlice = twiceRadius.width() + max(radii.topLeft().width(), radii.bottomLeft().width()); 
     rightSlice = twiceRadius.width() + max(radii.topRight().width(), radii.bottomRight().width()); 
@@ -485,7 +485,7 @@ static void computeSliceSizesFromRadii(const IntSize& twiceRadius, const Rounded
     bottomSlice = twiceRadius.height() + max(radii.bottomLeft().height(), radii.bottomRight().height());
 }
 
-IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedIntRect::Radii& radii) const
+IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedRect::Radii& radii) const
 {
     const int templateSideLength = 1;
 
@@ -503,7 +503,7 @@ IntSize ShadowBlur::templateSize(const IntSize& radiusPadding, const RoundedIntR
                    templateSideLength + topSlice + bottomSlice);
 }
 
-void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii)
+void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii)
 {
     IntRect layerRect = calculateLayerBoundingRect(graphicsContext, shadowedRect, graphicsContext->clipBounds());
     if (layerRect.isEmpty())
@@ -530,7 +530,7 @@ void ShadowBlur::drawRectShadow(GraphicsContext* graphicsContext, const FloatRec
     drawRectShadowWithTiling(graphicsContext, shadowedRect, radii, templateSize, edgeSize);
 }
 
-void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii)
+void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii)
 {
     IntRect layerRect = calculateLayerBoundingRect(graphicsContext, rect, graphicsContext->clipBounds());
     if (layerRect.isEmpty())
@@ -557,7 +557,7 @@ void ShadowBlur::drawInsetShadow(GraphicsContext* graphicsContext, const FloatRe
     drawInsetShadowWithTiling(graphicsContext, rect, holeRect, holeRadii, templateSize, edgeSize);
 }
 
-void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii, const IntRect& layerRect)
+void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntRect& layerRect)
 {
     m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
     if (!m_layerImage)
@@ -591,7 +591,7 @@ void ShadowBlur::drawRectShadowWithoutTiling(GraphicsContext* graphicsContext, c
     ScratchBuffer::shared().scheduleScratchBufferPurge();
 }
 
-void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii, const IntRect& layerRect)
+void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii, const IntRect& layerRect)
 {
     m_layerImage = ScratchBuffer::shared().getScratchBuffer(layerRect.size());
     if (!m_layerImage)
@@ -664,7 +664,7 @@ void ShadowBlur::drawInsetShadowWithoutTiling(GraphicsContext* graphicsContext,
      the shadow.
  */
 
-void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedIntRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
+void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& rect, const FloatRect& holeRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
 {
     GraphicsContextStateSaver stateSaver(*graphicsContext);
     graphicsContext->clearShadow();
@@ -726,7 +726,7 @@ void ShadowBlur::drawInsetShadowWithTiling(GraphicsContext* graphicsContext, con
     ScratchBuffer::shared().scheduleScratchBufferPurge();
 }
 
-void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedIntRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
+void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, const FloatRect& shadowedRect, const RoundedRect::Radii& radii, const IntSize& templateSize, const IntSize& edgeSize)
 {
     GraphicsContextStateSaver stateSaver(*graphicsContext);
     graphicsContext->clearShadow();
@@ -769,7 +769,7 @@ void ShadowBlur::drawRectShadowWithTiling(GraphicsContext* graphicsContext, cons
     ScratchBuffer::shared().scheduleScratchBufferPurge();
 }
 
-void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const RoundedIntRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
+void ShadowBlur::drawLayerPieces(GraphicsContext* graphicsContext, const FloatRect& shadowBounds, const RoundedRect::Radii& radii, const IntSize& bufferPadding, const IntSize& templateSize, ShadowDirection direction)
 {
     const IntSize twiceRadius = IntSize(bufferPadding.width() * 2, bufferPadding.height() * 2);
 
index 99eea53..c88351c 100644 (file)
@@ -32,7 +32,7 @@
 #include "Color.h"
 #include "ColorSpace.h"
 #include "FloatRect.h"
-#include "RoundedIntRect.h"
+#include "RoundedRect.h"
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
@@ -61,8 +61,8 @@ public:
     GraphicsContext* beginShadowLayer(GraphicsContext*, const FloatRect& layerArea);
     void endShadowLayer(GraphicsContext*);
 
-    void drawRectShadow(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&);
-    void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii& holeRadii);
+    void drawRectShadow(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&);
+    void drawInsetShadow(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii& holeRadii);
 
     void blurLayerImage(unsigned char*, const IntSize&, int stride);
 
@@ -82,15 +82,15 @@ private:
     };
     
     IntRect calculateLayerBoundingRect(GraphicsContext*, const FloatRect& layerArea, const IntRect& clipRect);
-    IntSize templateSize(const IntSize& blurredEdgeSize, const RoundedIntRect::Radii&) const;
+    IntSize templateSize(const IntSize& blurredEdgeSize, const RoundedRect::Radii&) const;
 
-    void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&, const IntRect& layerRect);
-    void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const RoundedIntRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
+    void drawRectShadowWithoutTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntRect& layerRect);
+    void drawRectShadowWithTiling(GraphicsContext*, const FloatRect&, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
 
-    void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii&, const IntRect& layerRect);
-    void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedIntRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
+    void drawInsetShadowWithoutTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntRect& layerRect);
+    void drawInsetShadowWithTiling(GraphicsContext*, const FloatRect&, const FloatRect& holeRect, const RoundedRect::Radii&, const IntSize& shadowTemplateSize, const IntSize& blurredEdgeSize);
     
-    void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const RoundedIntRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
+    void drawLayerPieces(GraphicsContext*, const FloatRect& shadowBounds, const RoundedRect::Radii&, const IntSize& roundedRadius, const IntSize& templateSize, ShadowDirection);
     
     void blurShadowBuffer(const IntSize& templateSize);
     void blurAndColorShadowBuffer(const IntSize& templateSize);
index a7c2f1d..7c7096f 100644 (file)
@@ -703,7 +703,7 @@ void GraphicsContext::fillRect(const FloatRect& rect)
         CGContextSetShadowWithColor(platformContext(), CGSizeZero, 0, 0);
 
         ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
-        contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii());
+        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii());
     }
 
     CGContextFillRect(context, rect);
@@ -732,7 +732,7 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorS
         CGContextSetShadowWithColor(platformContext(), CGSizeZero, 0, 0);
 
         ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
-        contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii());
+        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii());
     }
 
     CGContextFillRect(context, rect);
@@ -765,7 +765,7 @@ void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLef
         CGContextSetShadowWithColor(platformContext(), CGSizeZero, 0, 0);
 
         ShadowBlur contextShadow(FloatSize(shadowBlur, shadowBlur), m_state.shadowOffset, m_state.shadowColor, m_state.shadowColorSpace);
-        contextShadow.drawRectShadow(this, rect, RoundedIntRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
+        contextShadow.drawRectShadow(this, rect, RoundedRect::Radii(topLeft, topRight, bottomLeft, bottomRight));
     }
 
     bool equalWidths = (topLeft.width() == topRight.width() && topRight.width() == bottomLeft.width() && bottomLeft.width() == bottomRight.width());
@@ -786,7 +786,7 @@ void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLef
         setCGFillColor(context, oldFillColor, oldColorSpace);
 }
 
-void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedIntRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
+void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color, ColorSpace colorSpace)
 {
     if (paintingDisabled())
         return;
index 9d7f516..ed736f4 100644 (file)
@@ -850,7 +850,7 @@ void RenderBox::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& pai
         // To avoid the background color bleeding out behind the border, we'll render background and border
         // into a transparency layer, and then clip that in one go (which requires setting up the clip before
         // beginning the layer).
-        RoundedIntRect border = style()->getRoundedBorderFor(paintRect);
+        RoundedRect border = style()->getRoundedBorderFor(paintRect);
         stateSaver.save();
         paintInfo.context->addRoundedRectClip(border);
         paintInfo.context->beginTransparencyLayer(1);
index 2db4629..068086d 100644 (file)
@@ -563,12 +563,12 @@ int RenderBoxModelObject::paddingEnd(bool) const
     return padding.calcMinValue(w);
 }
 
-RoundedIntRect RenderBoxModelObject::getBackgroundRoundedRect(const IntRect& borderRect, InlineFlowBox* box, int inlineBoxWidth, int inlineBoxHeight,
+RoundedRect RenderBoxModelObject::getBackgroundRoundedRect(const LayoutRect& borderRect, InlineFlowBox* box, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
     bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
-    RoundedIntRect border = style()->getRoundedBorderFor(borderRect, includeLogicalLeftEdge, includeLogicalRightEdge);
+    RoundedRect border = style()->getRoundedBorderFor(borderRect, includeLogicalLeftEdge, includeLogicalRightEdge);
     if (box && (box->nextLineBox() || box->prevLineBox())) {
-        RoundedIntRect segmentBorder = style()->getRoundedBorderFor(IntRect(0, 0, inlineBoxWidth, inlineBoxHeight), includeLogicalLeftEdge, includeLogicalRightEdge);
+        RoundedRect segmentBorder = style()->getRoundedBorderFor(LayoutRect(0, 0, inlineBoxWidth, inlineBoxHeight), includeLogicalLeftEdge, includeLogicalRightEdge);
         border.setRadii(segmentBorder.radii());
     }
 
@@ -631,7 +631,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
             return;
 
         if (hasRoundedBorder && bleedAvoidance != BackgroundBleedUseTransparencyLayer) {
-            RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
+            RoundedRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
             context->fillRoundedRect(border, bgColor, style()->colorSpace());
         } else
             context->fillRect(rect, bgColor, style()->colorSpace());
@@ -642,7 +642,7 @@ void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, co
     bool clipToBorderRadius = hasRoundedBorder && bleedAvoidance != BackgroundBleedUseTransparencyLayer;
     GraphicsContextStateSaver clipToBorderStateSaver(*context, clipToBorderRadius);
     if (clipToBorderRadius) {
-        RoundedIntRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
+        RoundedRect border = getBackgroundRoundedRect(backgroundRectAdjustedForBleedAvoidance(context, rect, bleedAvoidance), box, boxSize.width(), boxSize.height(), includeLeftEdge, includeRightEdge);
         context->addRoundedRectClip(border);
     }
     
@@ -1229,7 +1229,7 @@ static bool joinRequiresMitre(BoxSide side, BoxSide adjacentSide, const BorderEd
     return false;
 }
 
-void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
     const IntRect& sideRect, BoxSide side, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge edges[], const Path* path, 
     BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
 {
@@ -1267,7 +1267,7 @@ void RenderBoxModelObject::paintOneBorderSide(GraphicsContext* graphicsContext,
     }
 }
 
-void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                                             const BorderEdge edges[], BorderEdgeFlags edgeSet, BackgroundBleedAvoidance bleedAvoidance,
                                             bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor)
 {
@@ -1278,7 +1278,7 @@ void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, co
         roundedPath.addRoundedRect(outerBorder);
     
     if (edges[BSTop].shouldRender() && includesEdge(edgeSet, BSTop)) {
-        IntRect sideRect = outerBorder.rect();
+        LayoutRect sideRect = outerBorder.rect();
         sideRect.setHeight(edges[BSTop].width);
 
         bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSTop].style) || borderWillArcInnerEdge(innerBorder.radii().topLeft(), innerBorder.radii().topRight()));
@@ -1286,7 +1286,7 @@ void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, co
     }
 
     if (edges[BSBottom].shouldRender() && includesEdge(edgeSet, BSBottom)) {
-        IntRect sideRect = outerBorder.rect();
+        LayoutRect sideRect = outerBorder.rect();
         sideRect.shiftYEdgeTo(sideRect.maxY() - edges[BSBottom].width);
 
         bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSBottom].style) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().bottomRight()));
@@ -1294,7 +1294,7 @@ void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, co
     }
 
     if (edges[BSLeft].shouldRender() && includesEdge(edgeSet, BSLeft)) {
-        IntRect sideRect = outerBorder.rect();
+        LayoutRect sideRect = outerBorder.rect();
         sideRect.setWidth(edges[BSLeft].width);
 
         bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSLeft].style) || borderWillArcInnerEdge(innerBorder.radii().bottomLeft(), innerBorder.radii().topLeft()));
@@ -1302,7 +1302,7 @@ void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, co
     }
 
     if (edges[BSRight].shouldRender() && includesEdge(edgeSet, BSRight)) {
-        IntRect sideRect = outerBorder.rect();
+        LayoutRect sideRect = outerBorder.rect();
         sideRect.shiftXEdgeTo(sideRect.maxX() - edges[BSRight].width);
 
         bool usePath = renderRadii && (borderStyleHasInnerDetail(edges[BSRight].style) || borderWillArcInnerEdge(innerBorder.radii().bottomRight(), innerBorder.radii().topRight()));
@@ -1310,7 +1310,7 @@ void RenderBoxModelObject::paintBorderSides(GraphicsContext* graphicsContext, co
     }
 }
 
-void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+void RenderBoxModelObject::paintTranslucentBorderSides(GraphicsContext* graphicsContext, const RenderStyle* style, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                                                        const BorderEdge edges[], BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias)
 {
     BorderEdgeFlags edgesToDraw = AllBorderEdges;
@@ -1363,8 +1363,8 @@ void RenderBoxModelObject::paintBorder(GraphicsContext* graphicsContext, const I
     BorderEdge edges[4];
     getBorderEdgeInfo(edges, includeLogicalLeftEdge, includeLogicalRightEdge);
 
-    RoundedIntRect outerBorder = style->getRoundedBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
-    RoundedIntRect innerBorder = style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
+    RoundedRect outerBorder = style->getRoundedBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
+    RoundedRect innerBorder = style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
 
     const AffineTransform& currentCTM = graphicsContext->getCTM();
     // FIXME: this isn't quite correct. We may want to antialias when scaled by a non-integral value, or when the translation is non-integral.
@@ -1516,7 +1516,7 @@ void RenderBoxModelObject::drawBoxSideFromPath(GraphicsContext* graphicsContext,
         // Draw inner border line
         {
             GraphicsContextStateSaver stateSaver(*graphicsContext);
-            RoundedIntRect innerClip = style->getRoundedInnerBorderFor(borderRect,
+            RoundedRect innerClip = style->getRoundedInnerBorderFor(borderRect,
                 innerBorderTopWidth, innerBorderBottomWidth, innerBorderLeftWidth, innerBorderRightWidth,
                 includeLogicalLeftEdge, includeLogicalRightEdge);
             
@@ -1536,7 +1536,7 @@ void RenderBoxModelObject::drawBoxSideFromPath(GraphicsContext* graphicsContext,
                 ++outerBorderRightWidth;
             }
                 
-            RoundedIntRect outerClip = style->getRoundedInnerBorderFor(outerRect,
+            RoundedRect outerClip = style->getRoundedInnerBorderFor(outerRect,
                 outerBorderTopWidth, outerBorderBottomWidth, outerBorderLeftWidth, outerBorderRightWidth,
                 includeLogicalLeftEdge, includeLogicalRightEdge);
             graphicsContext->clipOutRoundedRect(outerClip);
@@ -1562,12 +1562,12 @@ void RenderBoxModelObject::drawBoxSideFromPath(GraphicsContext* graphicsContext,
 
         // Paint inner only
         GraphicsContextStateSaver stateSaver(*graphicsContext);
-        int topWidth = edges[BSTop].usedWidth() / 2;
-        int bottomWidth = edges[BSBottom].usedWidth() / 2;
-        int leftWidth = edges[BSLeft].usedWidth() / 2;
-        int rightWidth = edges[BSRight].usedWidth() / 2;
+        LayoutUnit topWidth = edges[BSTop].usedWidth() / 2;
+        LayoutUnit bottomWidth = edges[BSBottom].usedWidth() / 2;
+        LayoutUnit leftWidth = edges[BSLeft].usedWidth() / 2;
+        LayoutUnit rightWidth = edges[BSRight].usedWidth() / 2;
 
-        RoundedIntRect clipRect = style->getRoundedInnerBorderFor(borderRect,
+        RoundedRect clipRect = style->getRoundedInnerBorderFor(borderRect,
             topWidth, bottomWidth, leftWidth, rightWidth,
             includeLogicalLeftEdge, includeLogicalRightEdge);
 
@@ -1622,7 +1622,7 @@ void RenderBoxModelObject::paintBorder(GraphicsContext* graphicsContext, const I
     bool renderBottom = bottomStyle > BHIDDEN && !bottomTransparent && (horizontal || includeLogicalRightEdge);
 
 
-    RoundedIntRect border(rect);
+    RoundedRect border(rect);
     
     GraphicsContextStateSaver stateSaver(*graphicsContext, false);
     if (style->hasBorderRadius()) {
@@ -1926,7 +1926,7 @@ static void findInnerVertex(const FloatPoint& outerCorner, const FloatPoint& inn
         findIntersection(outerCorner, innerCorner, FloatPoint(0, centerPoint.y()), FloatPoint(100, centerPoint.y()), result);
 }
 
-void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContext, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+void RenderBoxModelObject::clipBorderSidePolygon(GraphicsContext* graphicsContext, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                                                  BoxSide side, bool firstEdgeMatches, bool secondEdgeMatches)
 {
     FloatPoint quad[4];
@@ -2097,7 +2097,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, const Layout
     if (context->paintingDisabled() || !s->boxShadow())
         return;
 
-    RoundedIntRect border = (shadowStyle == Inset) ? s->getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
+    RoundedRect border = (shadowStyle == Inset) ? s->getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
                                                    : s->getRoundedBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge);
 
     bool hasBorderRadius = s->hasBorderRadius();
@@ -2118,7 +2118,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, const Layout
         const Color& shadowColor = shadow->color();
 
         if (shadow->style() == Normal) {
-            RoundedIntRect fillRect = border;
+            RoundedRect fillRect = border;
             fillRect.inflate(shadowSpread);
             if (fillRect.isEmpty())
                 continue;
@@ -2142,7 +2142,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, const Layout
                 context->setShadow(shadowOffset, shadowBlur, shadowColor, s->colorSpace());
 
             if (hasBorderRadius) {
-                RoundedIntRect rectToClipOut = border;
+                RoundedRect rectToClipOut = border;
 
                 // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
                 // when painting the shadow. On the other hand, it introduces subpixel gaps along the
@@ -2206,7 +2206,7 @@ void RenderBoxModelObject::paintBoxShadow(GraphicsContext* context, const Layout
             Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255);
 
             LayoutRect outerRect = areaCastingShadowInHole(border.rect(), shadowBlur, shadowSpread, shadowOffset);
-            RoundedIntRect roundedHole(holeRect, border.radii());
+            RoundedRect roundedHole(holeRect, border.radii());
 
             GraphicsContextStateSaver stateSaver(*context);
             if (hasBorderRadius) {
index 2bb6135..c4a05b8 100644 (file)
@@ -149,17 +149,17 @@ private:
 
     IntSize calculateFillTileSize(const FillLayer*, IntSize scaledSize) const;
 
-    RoundedIntRect getBackgroundRoundedRect(const IntRect&, InlineFlowBox*, int inlineBoxWidth, int inlineBoxHeight,
+    RoundedRect getBackgroundRoundedRect(const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
         bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
 
-    void clipBorderSidePolygon(GraphicsContext*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+    void clipBorderSidePolygon(GraphicsContext*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                                BoxSide, bool firstEdgeMatches, bool secondEdgeMatches);
-    void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+    void paintOneBorderSide(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                                 const IntRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const class BorderEdge[],
                                 const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0);
-    void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+    void paintTranslucentBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                           const class BorderEdge[], BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false);
-    void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedIntRect& outerBorder, const RoundedIntRect& innerBorder,
+    void paintBorderSides(GraphicsContext*, const RenderStyle*, const RoundedRect& outerBorder, const RoundedRect& innerBorder,
                           const class BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance,
                           bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = 0);
     void drawBoxSideFromPath(GraphicsContext*, const IntRect&, const Path&, const class BorderEdge[],
index 61bab41..2a01ece 100644 (file)
@@ -1024,7 +1024,7 @@ void RenderThemeMac::paintMenuListButtonGradients(RenderObject* o, const PaintIn
 
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
-    RoundedIntRect border = o->style()->getRoundedBorderFor(r);
+    RoundedRect border = o->style()->getRoundedBorderFor(r);
     int radius = border.radii().topLeft().width();
 
     CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
@@ -1058,7 +1058,7 @@ void RenderThemeMac::paintMenuListButtonGradients(RenderObject* o, const PaintIn
     {
         GraphicsContextStateSaver stateSaver(*paintInfo.context);
         CGContextClipToRect(context, topGradient);
-        paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
+        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingLayoutRect(topGradient), border.radii().topLeft(), border.radii().topRight(), IntSize(), IntSize()));
         context = cgContextContainer.context();
         CGContextDrawShading(context, topShading.get());
     }
@@ -1066,7 +1066,7 @@ void RenderThemeMac::paintMenuListButtonGradients(RenderObject* o, const PaintIn
     if (!bottomGradient.isEmpty()) {
         GraphicsContextStateSaver stateSaver(*paintInfo.context);
         CGContextClipToRect(context, bottomGradient);
-        paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
+        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingLayoutRect(bottomGradient), IntSize(), IntSize(), border.radii().bottomLeft(), border.radii().bottomRight()));
         context = cgContextContainer.context();
         CGContextDrawShading(context, bottomShading.get());
     }
@@ -1292,7 +1292,7 @@ bool RenderThemeMac::paintSliderTrack(RenderObject* o, const PaintInfo& paintInf
         mainShading.adoptCF(CGShadingCreateAxial(cspace, CGPointMake(bounds.x(),  bounds.y()), CGPointMake(bounds.x(), bounds.maxY()), mainFunction.get(), false, false));
 
     IntSize radius(trackRadius, trackRadius);
-    paintInfo.context->addRoundedRectClip(RoundedIntRect(bounds, radius, radius, radius, radius));
+    paintInfo.context->addRoundedRectClip(RoundedRect(bounds, radius, radius, radius, radius));
     context = localContext.cgContext();
     CGContextDrawShading(context, mainShading.get());
     
index 0037208..dba874d 100644 (file)
@@ -753,7 +753,7 @@ void RenderThemeSafari::paintMenuListButtonGradients(RenderObject* o, const Pain
 
     paintInfo.context->save();
 
-    RoundedIntRect bound = o->style()->getRoundedBorderFor(r);
+    RoundedRect bound = o->style()->getRoundedBorderFor(r);
     int radius = bound.radii().topLeft().width();
 
     CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
@@ -783,14 +783,14 @@ void RenderThemeSafari::paintMenuListButtonGradients(RenderObject* o, const Pain
 
     paintInfo.context->save();
     CGContextClipToRect(context, topGradient);
-    paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(topGradient), bound.radii().topLeft(), bound.radii().topRight(), IntSize(), IntSize()));
+    paintInfo.context->addRoundedRectClip(RoundedRect(enclosingIntRect(topGradient), bound.radii().topLeft(), bound.radii().topRight(), IntSize(), IntSize()));
     CGContextDrawShading(context, topShading.get());
     paintInfo.context->restore();
 
     if (!bottomGradient.isEmpty()) {
         paintInfo.context->save();
         CGContextClipToRect(context, bottomGradient);
-        paintInfo.context->addRoundedRectClip(RoundedIntRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), bound.radii().bottomLeft(), bound.radii().bottomRight()));
+        paintInfo.context->addRoundedRectClip(RoundedRect(enclosingIntRect(bottomGradient), IntSize(), IntSize(), bound.radii().bottomLeft(), bound.radii().bottomRight()));
         CGContextDrawShading(context, bottomShading.get());
         paintInfo.context->restore();
     }
@@ -954,7 +954,7 @@ const int trackRadius = 2;
 bool RenderThemeSafari::paintSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     IntSize radius(trackRadius, trackRadius);
-    RoundedIntRect bounds(r, radius, radius, radius, radius);
+    RoundedRect bounds(r, radius, radius, radius, radius);
 
     if (o->style()->appearance() ==  SliderHorizontalPart)
         bounds.setRect(IntRect(r.x(),
index abc7216..3787bec 100644 (file)
@@ -378,7 +378,7 @@ bool RenderThemeWinCE::paintSearchFieldCancelButton(RenderObject* o, const Paint
     int y = r.y() + (r.height() - cancelSize.height()) / 2 + 1;
     IntRect cancelBounds(IntPoint(x, y), cancelSize);
     paintInfo.context->save();
-    paintInfo.context->addRoundedRectClip(RoundedIntRect(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius));
+    paintInfo.context->addRoundedRectClip(RoundedRect(cancelBounds, cancelRadius, cancelRadius, cancelRadius, cancelRadius));
     paintInfo.context->fillRect(cancelBounds, buttonColor, ColorSpaceDeviceRGB);
 
     // Draw the 'x'
index 3c0325c..843e28e 100644 (file)
@@ -774,19 +774,20 @@ void RenderStyle::setBoxShadow(PassOwnPtr<ShadowData> shadowData, bool add)
     rareData->m_boxShadow = shadowData;
 }
 
-static RoundedIntRect::Radii calcRadiiFor(const BorderData& border, int width, int height)
+static RoundedRect::Radii calcRadiiFor(const BorderData& border, int width, int height)
 {
-    return RoundedIntRect::Radii(IntSize(border.topLeft().width().calcValue(width), 
-                                         border.topLeft().height().calcValue(height)),
-                                 IntSize(border.topRight().width().calcValue(width),
-                                         border.topRight().height().calcValue(height)),
-                                 IntSize(border.bottomLeft().width().calcValue(width), 
-                                         border.bottomLeft().height().calcValue(height)),
-                                 IntSize(border.bottomRight().width().calcValue(width), 
-                                         border.bottomRight().height().calcValue(height)));
+    return RoundedRect::Radii(
+        LayoutSize(border.topLeft().width().calcValue(width), 
+                   border.topLeft().height().calcValue(height)),
+        LayoutSize(border.topRight().width().calcValue(width),
+                   border.topRight().height().calcValue(height)),
+        LayoutSize(border.bottomLeft().width().calcValue(width), 
+                   border.bottomLeft().height().calcValue(height)),
+        LayoutSize(border.bottomRight().width().calcValue(width), 
+                   border.bottomRight().height().calcValue(height)));
 }
 
-static float calcConstraintScaleFor(const IntRect& rect, const RoundedIntRect::Radii& radii)
+static float calcConstraintScaleFor(const IntRect& rect, const RoundedRect::Radii& radii)
 {
     // Constrain corner radii using CSS3 rules:
     // http://www.w3.org/TR/css3-background/#the-border-radius
@@ -818,18 +819,18 @@ static float calcConstraintScaleFor(const IntRect& rect, const RoundedIntRect::R
     return factor;
 }
 
-RoundedIntRect RenderStyle::getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
+RoundedRect RenderStyle::getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
 {
-    RoundedIntRect roundedRect(borderRect);
+    RoundedRect roundedRect(borderRect);
     if (hasBorderRadius()) {
-        RoundedIntRect::Radii radii = calcRadiiFor(surround->border, borderRect.width(), borderRect.height());
+        RoundedRect::Radii radii = calcRadiiFor(surround->border, borderRect.width(), borderRect.height());
         radii.scale(calcConstraintScaleFor(borderRect, radii));
         roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);
     }
     return roundedRect;
 }
 
-RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
+RoundedRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
 {
     bool horizontal = isHorizontalWritingMode();
 
@@ -841,7 +842,7 @@ RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
     return getRoundedInnerBorderFor(borderRect, topWidth, bottomWidth, leftWidth, rightWidth, includeLogicalLeftEdge, includeLogicalRightEdge);
 }
 
-RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
+RoundedRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
     int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
 {
     IntRect innerRect(borderRect.x() + leftWidth, 
@@ -849,10 +850,10 @@ RoundedIntRect RenderStyle::getRoundedInnerBorderFor(const IntRect& borderRect,
             borderRect.width() - leftWidth - rightWidth, 
             borderRect.height() - topWidth - bottomWidth);
 
-    RoundedIntRect roundedRect(innerRect);
+    RoundedRect roundedRect(innerRect);
 
     if (hasBorderRadius()) {
-        RoundedIntRect::Radii radii = getRoundedBorderFor(borderRect).radii();
+        RoundedRect::Radii radii = getRoundedBorderFor(borderRect).radii();
         radii.shrink(topWidth, bottomWidth, leftWidth, rightWidth);
         roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);
     }
index 3bed305..8cc0b77 100644 (file)
@@ -44,7 +44,7 @@
 #include "NinePieceImage.h"
 #include "OutlineValue.h"
 #include "RenderStyleConstants.h"
-#include "RoundedIntRect.h"
+#include "RoundedRect.h"
 #include "ShadowData.h"
 #include "StyleBackgroundData.h"
 #include "StyleBoxData.h"
@@ -871,10 +871,10 @@ public:
         setBorderRadius(LengthSize(Length(s.width(), Fixed), Length(s.height(), Fixed)));
     }
     
-    RoundedIntRect getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
-    RoundedIntRect getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
+    RoundedRect getRoundedBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
+    RoundedRect getRoundedInnerBorderFor(const IntRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
 
-    RoundedIntRect getRoundedInnerBorderFor(const IntRect& borderRect,
+    RoundedRect getRoundedInnerBorderFor(const IntRect& borderRect,
         int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
 
     void setBorderLeftWidth(unsigned short v) { SET_VAR(surround, border.m_left.m_width, v) }