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

Unified Diff: Source/core/layout/line/TrailingFloatsRootInlineBox.h

Issue 1175953003: Revert "Remove obsolete float-management code from line layout" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/layout/line/LineLayoutState.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/TrailingFloatsRootInlineBox.h
diff --git a/Source/platform/fonts/TypesettingFeatures.h b/Source/core/layout/line/TrailingFloatsRootInlineBox.h
similarity index 75%
copy from Source/platform/fonts/TypesettingFeatures.h
copy to Source/core/layout/line/TrailingFloatsRootInlineBox.h
index 531391e10725c07e06d3809340b86198d0609a27..3722603d13aa48897dcd80f2724843012ea7d245 100644
--- a/Source/platform/fonts/TypesettingFeatures.h
+++ b/Source/core/layout/line/TrailingFloatsRootInlineBox.h
@@ -23,18 +23,25 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TypesettingFeatures_h
-#define TypesettingFeatures_h
+#ifndef TrailingFloatsRootInlineBox_h
+#define TrailingFloatsRootInlineBox_h
+
+#include "core/layout/line/RootInlineBox.h"
namespace blink {
-enum TypesettingFeature {
- Kerning = 1 << 0,
- Ligatures = 1 << 1,
-};
+class TrailingFloatsRootInlineBox final : public RootInlineBox {
+public:
+ TrailingFloatsRootInlineBox(LayoutBlockFlow& block)
+ : RootInlineBox(block)
+ {
+ setHasVirtualLogicalHeight();
+ }
-typedef unsigned TypesettingFeatures;
+private:
+ virtual LayoutUnit virtualLogicalHeight() const override { return 0; }
+};
} // namespace blink
-#endif // TypesettingFeatures_h
+#endif // TrailingFloatsRootInlineBox_h
« no previous file with comments | « Source/core/layout/line/LineLayoutState.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698