summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderPath.h
diff options
context:
space:
mode:
authorFeng Qian <>2009-04-10 18:11:29 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 18:11:29 -0700
commit8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch)
tree181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/rendering/RenderPath.h
parent7ed56f225e0ade046e1c2178977f72b2d896f196 (diff)
downloadexternal_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip
external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz
external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/rendering/RenderPath.h')
-rw-r--r--WebCore/rendering/RenderPath.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/RenderPath.h b/WebCore/rendering/RenderPath.h
index 81b5c52..6157171 100644
--- a/WebCore/rendering/RenderPath.h
+++ b/WebCore/rendering/RenderPath.h
@@ -59,7 +59,7 @@ public:
virtual TransformationMatrix localTransform() const;
virtual void layout();
- virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer);
+ virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
virtual bool requiresLayer() const { return false; }
virtual int lineHeight(bool b, bool isRootLineBox = false) const;
virtual int baselinePosition(bool b, bool isRootLineBox = false) const;
@@ -75,7 +75,7 @@ public:
private:
FloatPoint mapAbsolutePointToLocal(const FloatPoint&) const;
- virtual IntRect outlineBoundsForRepaint(RenderBox* repaintContainer) const;
+ virtual IntRect outlineBoundsForRepaint(RenderBoxModelObject* repaintContainer) const;
mutable Path m_path;
mutable FloatRect m_fillBBox;