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

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

Issue 2226033002: Use LayoutNGBlockFlow for the block layout if layoutNG is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 41dba4ef9b60ad6c8700410bd6eb1b2720df4d7f..6ec3f1e4a59b023d0903f122f51debf1de6a73b0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -66,6 +66,7 @@
#include "core/layout/LayoutTableRow.h"
#include "core/layout/LayoutTheme.h"
#include "core/layout/LayoutView.h"
+#include "core/layout/ng/LayoutNGBlockFlow.h"
#include "core/page/AutoscrollController.h"
#include "core/page/Page.h"
#include "core/paint/ObjectPaintProperties.h"
@@ -187,6 +188,8 @@ LayoutObject* LayoutObject::createObject(Element* element, const ComputedStyle&
return new LayoutInline(element);
case BLOCK:
case INLINE_BLOCK:
+ if (RuntimeEnabledFeatures::layoutNGEnabled())
+ return new LayoutNGBlockFlow(element);
return new LayoutBlockFlow(element);
case LIST_ITEM:
return new LayoutListItem(element);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698