Snapshot of all changes to get jumbo in blink and content.

third_party/WebKit/Source/core/editing/LayoutSelectionTest.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/LayoutSelection.h"
 
 #include "bindings/core/v8/V8BindingForCore.h"
 #include "core/dom/ShadowRootInit.h"
 #include "core/editing/EditingTestBase.h"
 #include "core/editing/FrameSelection.h"
@@ skipping 44 matching lines @@
     return false;
   if (object->GetSelectionState() != state)
     return false;
   if (object->ShouldInvalidateSelection() !=
       (invalidate == InvalidateOption::ShouldInvalidate))
     return false;
   return true;
 }
 
 using IsTypeOf = Function<bool(const LayoutObject& layout_object)>;
+#if 0
 #define USING_LAYOUTOBJECT_FUNC(member_func)                               \
   IsTypeOf member_func = WTF::Bind([](const LayoutObject& layout_object) { \
     return layout_object.member_func();                                    \
   })
+#else
+using IsTypeOfSimple = bool(const LayoutObject& layout_object);
+#define USING_LAYOUTOBJECT_FUNC(member_func)                               \
+  bool member_func(const LayoutObject& layout_object) { \
+    return layout_object.member_func();                                    \
+  }
+#endif // 0
 
 USING_LAYOUTOBJECT_FUNC(IsLayoutBlock);
 USING_LAYOUTOBJECT_FUNC(IsLayoutBlockFlow);
 USING_LAYOUTOBJECT_FUNC(IsLayoutInline);
 USING_LAYOUTOBJECT_FUNC(IsBR);
 USING_LAYOUTOBJECT_FUNC(IsListItem);
 USING_LAYOUTOBJECT_FUNC(IsListMarker);
 
 static IsTypeOf IsLayoutTextFragmentOf(const String& text) {
   return WTF::Bind(
       [](const String& text, const LayoutObject& object) {
         if (!object.IsText())
           return false;
         if (text != ToLayoutText(object).GetText())
           return false;
         return ToLayoutText(object).IsTextFragment();
       },
       text);
 }
 
 static bool TestLayoutObject(LayoutObject* object,
+                             IsTypeOfSimple& predicate,
+                             SelectionState state,
+                             InvalidateOption invalidate) {
+  if (!TestLayoutObjectState(object, state, invalidate))
+    return false;
+
+  if (!predicate(*object))
+    return false;
+  return true;
+}
+static bool TestLayoutObject(LayoutObject* object,
                              const IsTypeOf& predicate,
                              SelectionState state,
                              InvalidateOption invalidate) {
   if (!TestLayoutObjectState(object, state, invalidate))
     return false;
 
   if (!predicate(*object))
     return false;
   return true;
 }
@@ skipping 287 matching lines @@
       ToElement(GetDocument().QuerySelector("#host")->firstChild());
   DCHECK(span);
   Node* const baz = GetDocument().body()->firstChild()->nextSibling();
   DCHECK(baz);
   Selection().SetSelection(SelectionInDOMTree::Builder()
                                .SetBaseAndExtent({baz, 1}, {span, 0})
                                .Build());
   Selection().CommitAppearanceIfNeeded();
 }
 }  // namespace blink