Move self-painting trigger code for accelerated embedded content into LayerTypeRequired.

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I2c8e14fae22b1fe5d8aec77cf7e203f839972100
Reviewed-on: https://chromium-review.googlesource.com/1135705Reviewed-by: vmpstr <vmpstr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574993}

third_party/blink/renderer/core/layout/layout_embedded_content.cc

@@ -112,6 +112,9 @@ EmbeddedContentView* LayoutEmbeddedContent::GetEmbeddedContentView() const {
 }
 
 PaintLayerType LayoutEmbeddedContent::LayerTypeRequired() const {
+  if (RequiresAcceleratedCompositing())
+    return kNormalPaintLayer;
+
   PaintLayerType type = LayoutReplaced::LayerTypeRequired();
   if (type != kNoPaintLayer)
     return type;

third_party/blink/renderer/core/layout/layout_embedded_object.cc

@@ -49,17 +49,6 @@ LayoutEmbeddedObject::LayoutEmbeddedObject(Element* element)
 
 LayoutEmbeddedObject::~LayoutEmbeddedObject() = default;
 
-PaintLayerType LayoutEmbeddedObject::LayerTypeRequired() const {
-  // This can't just use LayoutEmbeddedContent::layerTypeRequired, because
-  // PaintLayerCompositor doesn't loop through LayoutEmbeddedObjects the way it
-  // does frames in order to update the self painting bit on their Layer.
-  // Also, unlike iframes, embeds don't used the usesCompositing bit on
-  // LayoutView in requiresAcceleratedCompositing.
-  if (RequiresAcceleratedCompositing())
-    return kNormalPaintLayer;
-  return LayoutEmbeddedContent::LayerTypeRequired();
-}
-
 static String LocalizedUnavailablePluginReplacementText(
     Node* node,
     LayoutEmbeddedObject::PluginAvailability availability) {

third_party/blink/renderer/core/layout/layout_embedded_object.h

@@ -67,8 +67,6 @@ class LayoutEmbeddedObject final : public LayoutEmbeddedContent {
   void ComputeIntrinsicSizingInfo(IntrinsicSizingInfo&) const override;
   bool NeedsPreferredWidthsRecalculation() const override;
 
-  PaintLayerType LayerTypeRequired() const final;
-
   CompositingReasons AdditionalCompositingReasons() const override;
 
   PluginAvailability plugin_availability_ = kPluginAvailable;

third_party/blink/renderer/core/paint/paint_layer.cc

@@ -2917,11 +2917,6 @@ bool PaintLayer::ChildBackgroundIsKnownToBeOpaqueInRect(
 }
 
 bool PaintLayer::ShouldBeSelfPaintingLayer() const {
-  if (GetLayoutObject().IsLayoutEmbeddedContent() &&
-      ToLayoutEmbeddedContent(GetLayoutObject())
-          .RequiresAcceleratedCompositing())
-    return true;
-
   // TODO(crbug.com/839341): Remove ScrollTimeline check once we support
   // main-thread AnimationWorklet and don't need to promote the scroll-source.
   return GetLayoutObject().LayerTypeRequired() == kNormalPaintLayer ||