[SPInvalidation] Micro-optimize PaintLayerClipper::calculateRects

third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 248 matching lines @@
   } while (false);
 #endif
 
 void PaintLayerClipper::CalculateRectsWithGeometryMapper(
     const ClipRectsContext& context,
     const LayoutRect& paint_dirty_rect,
     LayoutRect& layer_bounds,
     ClipRect& background_rect,
     ClipRect& foreground_rect,
     const LayoutPoint* offset_from_root) const {
+  LayoutPoint offset(context.sub_pixel_accumulation);
+  if (offset_from_root)
+    offset = *offset_from_root;
+  else
+    layer_.ConvertToLayerCoords(context.root_layer, offset);
+  layer_bounds = LayoutRect(offset, LayoutSize(layer_.size()));
+
   // TODO(chrishtr): fix the underlying bug that causes this situation.
   if (!layer_.GetLayoutObject().PaintProperties() &&
       !layer_.GetLayoutObject().LocalBorderBoxProperties()) {
     background_rect = ClipRect(LayoutRect(LayoutRect::InfiniteIntRect()));
     foreground_rect = ClipRect(LayoutRect(LayoutRect::InfiniteIntRect()));
   } else {
     CalculateBackgroundClipRectWithGeometryMapper(context, background_rect);
     background_rect.Move(context.sub_pixel_accumulation);
     background_rect.Intersect(paint_dirty_rect);
 
-    CalculateForegroundClipRectWithGeometryMapper(context, foreground_rect);
-    foreground_rect.Move(context.sub_pixel_accumulation);
-    foreground_rect.Intersect(paint_dirty_rect);
+    foreground_rect = background_rect;
+
+    LayoutBoxModelObject& layout_object = layer_.GetLayoutObject();
+    if (layout_object.HasClip()) {
+      LayoutRect new_pos_clip = ToLayoutBox(layout_object).ClipRect(offset);
+      foreground_rect.Intersect(new_pos_clip);
+    }
+    if (ShouldClipOverflow(context)) {
+      LayoutRect overflow_and_clip_rect =
+          ToLayoutBox(layout_object)
+              .OverflowClipRect(offset,
+                                context.overlay_scrollbar_clip_behavior);
+      foreground_rect.Intersect(overflow_and_clip_rect);
+      if (layout_object.StyleRef().HasBorderRadius())
+        foreground_rect.SetHasRadius(true);
+    }
   }
 
-  LayoutPoint offset;
-  if (offset_from_root)
-    offset = *offset_from_root;
-  else
-    layer_.ConvertToLayerCoords(context.root_layer, offset);
-  layer_bounds = LayoutRect(offset, LayoutSize(layer_.size()));
-
 #ifdef CHECK_CLIP_RECTS
   ClipRect testBackgroundRect, testForegroundRect;
   LayoutRect testLayerBounds;
   PaintLayerClipper(m_layer, nullptr)
       .calculateRects(context, paintDirtyRect, testLayerBounds,
                       testBackgroundRect, testForegroundRect, offsetFromRoot);
   CHECK_RECTS_EQ(testBackgroundRect, backgroundRect);
   CHECK_RECTS_EQ(testForegroundRect, foregroundRect);
   CHECK_RECTS_EQ(testLayerBounds, layerBounds);
 #endif
@@ skipping 19 matching lines @@
   if (!is_clipping_root && layer_.Parent()) {
     CalculateBackgroundClipRect(context, background_rect);
     background_rect.Move(context.sub_pixel_accumulation);
     background_rect.Intersect(paint_dirty_rect);
   } else {
     background_rect = paint_dirty_rect;
   }
 
   foreground_rect = background_rect;
 
-  LayoutPoint offset;
+  LayoutPoint offset(context.sub_pixel_accumulation);
   if (offset_from_root)
     offset = *offset_from_root;
   else
     layer_.ConvertToLayerCoords(context.root_layer, offset);
   layer_bounds = LayoutRect(offset, LayoutSize(layer_.size()));
 
   // Update the clip rects that will be passed to child layers.
   if (ShouldClipOverflow(context)) {
     LayoutRect overflow_and_clip_rect =
         ToLayoutBox(layout_object)
@@ skipping 137 matching lines @@
   const auto* ancestor_css_clip =
       ancestor_properties ? ancestor_properties->CssClip() : nullptr;
   // CSS clip of the root is always applied.
   if (ancestor_css_clip) {
     DCHECK(destination_property_tree_state.Clip() ==
            ancestor_properties->CssClip());
     destination_property_tree_state.SetClip(ancestor_css_clip->Parent());
   }
 }
 
-void PaintLayerClipper::CalculateForegroundClipRectWithGeometryMapper(
-    const ClipRectsContext& context,
-    ClipRect& output) const {
-  DCHECK(use_geometry_mapper_);
-  PropertyTreeState source_property_tree_state(nullptr, nullptr, nullptr);
-  PropertyTreeState destination_property_tree_state(nullptr, nullptr, nullptr);
-  InitializeCommonClipRectState(context, source_property_tree_state,
-                                destination_property_tree_state);
-  const auto* properties = layer_.GetLayoutObject().PaintProperties();
-
-  if (&layer_ == context.root_layer) {
-    // Set the overflow clip for |sourcePropertyTreeState| so that it differs
-    // from |destinationPropertyTreeState| in its clip.
-    if (context.respect_overflow_clip == kRespectOverflowClip && properties &&
-        properties->OverflowClip())
-      source_property_tree_state.SetClip(properties->OverflowClip());
-  } else {
-    const auto* ancestor_properties =
-        context.root_layer->GetLayoutObject().PaintProperties();
-
-    // Set the clip of |destinationPropertyTreeState| to be inside the
-    // ancestor's overflow clip, so that that clip is not applied.
-    if (context.respect_overflow_clip == kIgnoreOverflowClip &&
-        ancestor_properties && ancestor_properties->OverflowClip())
-      destination_property_tree_state.SetClip(
-          ancestor_properties->OverflowClip());
-
-    // Set the overflow clip for |sourcePropertyTreeState| so that it differs
-    // from destinationPropertyTreeState| in its clip.
-    if (properties && properties->OverflowClip())
-      source_property_tree_state.SetClip(properties->OverflowClip());
-  }
-
-  const FloatClipRect& clipped_rect_in_root_layer_space =
-      GeometryMapper::SourceToDestinationClipRect(
-          source_property_tree_state, destination_property_tree_state);
-  output.SetRect(clipped_rect_in_root_layer_space);
-
-  output.MoveBy(-context.root_layer->GetLayoutObject().PaintOffset());
-}
-
 LayoutRect PaintLayerClipper::LocalVisualRect() const {
   const LayoutObject& layout_object = layer_.GetLayoutObject();
   // The LayoutView is special since its overflow clipping rect may be larger
   // than its box rect (crbug.com/492871).
   LayoutRect layer_bounds_with_visual_overflow =
       layout_object.IsLayoutView()
           ? ToLayoutView(layout_object).ViewRect()
           : ToLayoutBox(layout_object).VisualOverflowRect();
   ToLayoutBox(layout_object)
       .FlipForWritingMode(
@@ skipping 93 matching lines @@
   DCHECK(!use_geometry_mapper_);
   ClipRectsContext context(root_layer, kPaintingClipRects,
                            kIgnorePlatformOverlayScrollbarSize,
                            subpixel_accumulation);
   if (respect_overflow_clip == kIgnoreOverflowClip)
     context.SetIgnoreOverflowClip();
   return GetClipRects(context);
 }
 
 }  // namespace blink