Title: [163631] trunk/Source/WebCore
- Revision
- 163631
- Author
- [email protected]
- Date
- 2014-02-07 10:37:55 -0800 (Fri, 07 Feb 2014)
Log Message
FloatingObject m_paginationStrut should be LayoutUnit
https://bugs.webkit.org/show_bug.cgi?id=119808
Reviewed by Andreas Kling.
Make the paginationStrut in FloatingObject have the same type as all
of the other paginationStruts in the code.
* rendering/FloatingObjects.h:
(WebCore::FloatingObject::paginationStrut):
(WebCore::FloatingObject::setPaginationStrut):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::positionNewFloatOnLine):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163630 => 163631)
--- trunk/Source/WebCore/ChangeLog 2014-02-07 18:32:38 UTC (rev 163630)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 18:37:55 UTC (rev 163631)
@@ -1,3 +1,19 @@
+2014-02-07 Bem Jones-Bey <[email protected]>
+
+ FloatingObject m_paginationStrut should be LayoutUnit
+ https://bugs.webkit.org/show_bug.cgi?id=119808
+
+ Reviewed by Andreas Kling.
+
+ Make the paginationStrut in FloatingObject have the same type as all
+ of the other paginationStruts in the code.
+
+ * rendering/FloatingObjects.h:
+ (WebCore::FloatingObject::paginationStrut):
+ (WebCore::FloatingObject::setPaginationStrut):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::positionNewFloatOnLine):
+
2014-02-06 Brady Eidson <[email protected]>
IDB: storage/indexeddb/create-index-with-integer-keys.html fails
Modified: trunk/Source/WebCore/rendering/FloatingObjects.h (163630 => 163631)
--- trunk/Source/WebCore/rendering/FloatingObjects.h 2014-02-07 18:32:38 UTC (rev 163630)
+++ trunk/Source/WebCore/rendering/FloatingObjects.h 2014-02-07 18:37:55 UTC (rev 163631)
@@ -67,8 +67,8 @@
const LayoutRect& frameRect() const { ASSERT(isPlaced()); return m_frameRect; }
void setFrameRect(const LayoutRect& frameRect) { ASSERT(!isInPlacedTree()); m_frameRect = frameRect; }
- int paginationStrut() const { return m_paginationStrut; }
- void setPaginationStrut(int strut) { m_paginationStrut = strut; }
+ LayoutUnit paginationStrut() const { return m_paginationStrut; }
+ void setPaginationStrut(LayoutUnit strut) { m_paginationStrut = strut; }
#ifndef NDEBUG
bool isInPlacedTree() const { return m_isInPlacedTree; }
@@ -88,7 +88,7 @@
RenderBox& m_renderer;
RootInlineBox* m_originatingLine;
LayoutRect m_frameRect;
- int m_paginationStrut; // FIXME: This should be a LayoutUnit, since it's a vertical offset.
+ LayoutUnit m_paginationStrut;
unsigned m_type : 2; // Type (left or right aligned)
unsigned m_shouldPaint : 1;
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (163630 => 163631)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-07 18:32:38 UTC (rev 163630)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-07 18:37:55 UTC (rev 163631)
@@ -2116,7 +2116,7 @@
ASSERT(floatingObjectSet.last().get() == newFloat);
LayoutUnit floatLogicalTop = logicalTopForFloat(newFloat);
- int paginationStrut = newFloat->paginationStrut();
+ LayoutUnit paginationStrut = newFloat->paginationStrut();
if (floatLogicalTop - paginationStrut != logicalHeight() + lineInfo.floatPaginationStrut())
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
