Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: third_party/WebKit/Source/core/layout/FloatingObjects.cpp

Issue 1899193007: Remove special-code for paginating floats followed by lines of text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/FloatingObjects.cpp
diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
index 258aab4a293032531c24ba9e5739e91e9d90d8fb..85a93e7520b7c9bf1f0d58e7cb8944ba7aff8ec5 100644
--- a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
@@ -37,7 +37,6 @@ namespace blink {
struct SameSizeAsFloatingObject {
void* pointers[2];
LayoutRect rect;
- int paginationStrut;
uint32_t bitfields : 8;
};
@@ -46,7 +45,6 @@ static_assert(sizeof(FloatingObject) == sizeof(SameSizeAsFloatingObject), "Float
FloatingObject::FloatingObject(LayoutBox* layoutObject)
: m_layoutObject(layoutObject)
, m_originatingLine(nullptr)
- , m_paginationStrut(0)
, m_shouldPaint(true)
, m_isDescendant(false)
, m_isPlaced(false)
@@ -67,7 +65,6 @@ FloatingObject::FloatingObject(LayoutBox* layoutObject, Type type, const LayoutR
: m_layoutObject(layoutObject)
, m_originatingLine(nullptr)
, m_frameRect(frameRect)
- , m_paginationStrut(0)
, m_type(type)
, m_shouldPaint(shouldPaint)
, m_isDescendant(isDescendant)
@@ -96,7 +93,6 @@ PassOwnPtr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset,
PassOwnPtr<FloatingObject> FloatingObject::unsafeClone() const
{
OwnPtr<FloatingObject> cloneObject = adoptPtr(new FloatingObject(layoutObject(), getType(), m_frameRect, m_shouldPaint, m_isDescendant, false));
- cloneObject->m_paginationStrut = m_paginationStrut;
cloneObject->m_isPlaced = m_isPlaced;
return cloneObject.release();
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.h ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698