Title: [107009] trunk/Source/WebCore
- Revision
- 107009
- Author
- [email protected]
- Date
- 2012-02-07 16:52:39 -0800 (Tue, 07 Feb 2012)
Log Message
Update LayoutUnit usage in ColumnInfo and RenderFrameSet
https://bugs.webkit.org/show_bug.cgi?id=77914
Reviewed by Eric Seidel.
Updating ColumnInfo and RenderFrameSet to use LayoutUnits
instead of directly referencing integers for locations and
distances.
No new tests. No changed behavior.
* rendering/ColumnInfo.h:
(WebCore::ColumnInfo::forcedBreakOffset):
(WebCore::ColumnInfo::maximumDistanceBetweenForcedBreaks):
(ColumnInfo):
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):
* rendering/RenderFrameSet.h:
(RenderFrameSet):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107008 => 107009)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 00:40:31 UTC (rev 107008)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 00:52:39 UTC (rev 107009)
@@ -1,3 +1,26 @@
+2012-02-07 Levi Weintraub <[email protected]>
+
+ Update LayoutUnit usage in ColumnInfo and RenderFrameSet
+ https://bugs.webkit.org/show_bug.cgi?id=77914
+
+ Reviewed by Eric Seidel.
+
+ Updating ColumnInfo and RenderFrameSet to use LayoutUnits
+ instead of directly referencing integers for locations and
+ distances.
+
+ No new tests. No changed behavior.
+
+ * rendering/ColumnInfo.h:
+ (WebCore::ColumnInfo::forcedBreakOffset):
+ (WebCore::ColumnInfo::maximumDistanceBetweenForcedBreaks):
+ (ColumnInfo):
+ * rendering/RenderFrameSet.cpp:
+ (WebCore::RenderFrameSet::paintColumnBorder):
+ (WebCore::RenderFrameSet::paintRowBorder):
+ * rendering/RenderFrameSet.h:
+ (RenderFrameSet):
+
2012-02-07 Adam Klein <[email protected]>
Add JSC support for delivering mutations when the outermost script context exits
Modified: trunk/Source/WebCore/rendering/ColumnInfo.h (107008 => 107009)
--- trunk/Source/WebCore/rendering/ColumnInfo.h 2012-02-08 00:40:31 UTC (rev 107008)
+++ trunk/Source/WebCore/rendering/ColumnInfo.h 2012-02-08 00:52:39 UTC (rev 107009)
@@ -75,8 +75,8 @@
LayoutUnit minimumColumnHeight() const { return m_minimumColumnHeight; }
int forcedBreaks() const { return m_forcedBreaks; }
- int forcedBreakOffset() const { return m_forcedBreakOffset; }
- int maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
+ LayoutUnit forcedBreakOffset() const { return m_forcedBreakOffset; }
+ LayoutUnit maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
void clearForcedBreaks()
{
m_forcedBreaks = 0;
@@ -107,8 +107,8 @@
LayoutUnit m_columnHeight;
LayoutUnit m_minimumColumnHeight;
int m_forcedBreaks; // FIXME: We will ultimately need to cache more information to balance around forced breaks properly.
- int m_maximumDistanceBetweenForcedBreaks;
- int m_forcedBreakOffset;
+ LayoutUnit m_maximumDistanceBetweenForcedBreaks;
+ LayoutUnit m_forcedBreakOffset;
PaginationUnit m_paginationUnit;
};
Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (107008 => 107009)
--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2012-02-08 00:40:31 UTC (rev 107008)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2012-02-08 00:52:39 UTC (rev 107009)
@@ -80,7 +80,7 @@
return Color(208, 208, 208);
}
-void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
{
if (!paintInfo.rect.intersects(borderRect))
return;
@@ -100,7 +100,7 @@
}
}
-void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
{
if (!paintInfo.rect.intersects(borderRect))
return;
Modified: trunk/Source/WebCore/rendering/RenderFrameSet.h (107008 => 107009)
--- trunk/Source/WebCore/rendering/RenderFrameSet.h 2012-02-08 00:40:31 UTC (rev 107008)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.h 2012-02-08 00:52:39 UTC (rev 107009)
@@ -119,8 +119,8 @@
void startResizing(GridAxis&, int position);
void continueResizing(GridAxis&, int position);
- void paintRowBorder(const PaintInfo&, const IntRect&);
- void paintColumnBorder(const PaintInfo&, const IntRect&);
+ void paintRowBorder(const PaintInfo&, const LayoutRect&);
+ void paintColumnBorder(const PaintInfo&, const LayoutRect&);
RenderObjectChildList m_children;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
