diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index b9f8b47..0290a3e6 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json
@@ -138,7 +138,8 @@ "2B6C6A4A5940017146F3E58B7F90116206E84685", // http://crbug.com/642141 "B6C2EFAB3EC3BF6EF03701408B6B09A67B2D0069", // http://crbug.com/642141 "96FF2FFA5C9173C76D47184B3E86D267B37781DE", // http://crbug.com/642141 - "0136FCB13DB29FD5CD442F56E59E53B61F1DF96F" // http://crbug.com/642141 + "0136FCB13DB29FD5CD442F56E59E53B61F1DF96F", // http://crbug.com/642141 + "930F7D9989A5FBCDCCD7D85BB5C3B7006C24D91D" // http://crbug.com/782139 ] }, "clipboardRead": {
diff --git a/third_party/WebKit/Source/core/layout/LayoutInline.cpp b/third_party/WebKit/Source/core/layout/LayoutInline.cpp index 8f7154e..0ee3a6c0 100644 --- a/third_party/WebKit/Source/core/layout/LayoutInline.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutInline.cpp
@@ -1350,8 +1350,7 @@ MarkingBehavior marking_behavior) { // During layout tree construction, we can't detect whether this node is // in LayoutNG or not. - if (RuntimeEnabledFeatures::LayoutNGEnabled() && Parent() && - EnclosingNGBlockFlow()) { + if (Parent() && EnclosingNGBlockFlow()) { SetAncestorLineBoxDirty(); return; }
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp index f81f65d..22e2b166 100644 --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -699,6 +699,8 @@ } LayoutBlockFlow* LayoutObject::EnclosingNGBlockFlow() const { + if (!RuntimeEnabledFeatures::LayoutNGEnabled()) + return nullptr; LayoutBox* box = EnclosingBox(); DCHECK(box); return box->IsLayoutNGMixin() ? ToLayoutBlockFlow(box) : nullptr;