Change Layout::adjustCompositedContainerForSpecialAncestors into an overloaded version of container…

Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1030 matching lines @@
     return result;
 }
 
 void LayoutObject::paint(const PaintInfo&, const LayoutPoint&)
 {
 }
 
 const LayoutBoxModelObject* LayoutObject::containerForPaintInvalidation() const
 {
     RELEASE_ASSERT(isRooted());
-    return adjustCompositedContainerForSpecialAncestors(enclosingCompositedContainer());
+    return containerForPaintInvalidation(enclosingCompositedContainer());
 }
 
 const LayoutBoxModelObject* LayoutObject::enclosingCompositedContainer() const
 {
     LayoutBoxModelObject* container = 0;
     // FIXME: CompositingState is not necessarily up to date for many callers of this function.
     DisableCompositingQueryAsserts disabler;
 
     if (DeprecatedPaintLayer* compositingLayer = enclosingLayer()->enclosingLayerForPaintInvalidationCrossingFrameBoundaries())
         container = compositingLayer->layoutObject();
     return container;
 }
 
-const LayoutBoxModelObject* LayoutObject::adjustCompositedContainerForSpecialAncestors(const LayoutBoxModelObject* paintInvalidationContainer) const
+const LayoutBoxModelObject* LayoutObject::containerForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const

[leviw_travelin_and_unemployed, 2015/06/02 17:49:51]

I like the simplification ideal behind this patch, but I'm not convinced it's
actually clearer.

Calling LayoutObject::containerForPaintInvalidation with a LayoutBoxModelObject*
parameter named "paintInvalidationContainer" doesn't explain to me what's
actually going on in the function. Also passing in a null pointer to that method
doesn't do the same thing as calling LayoutObject::containerForPaintInvalidation
without an argument, even though it's clear on inspection that it's prepared to
deal with null pointers.

The previous name gave some vague idea of what the method actually did, though
I'll certainly agree it's not very clear.

 {
     if (paintInvalidationContainer)
         return paintInvalidationContainer;
 
     LayoutView* layoutView = view();
     while (layoutView->frame()->ownerLayoutObject())
         layoutView = layoutView->frame()->ownerLayoutObject()->view();
     return layoutView;
 }
 
@@ skipping 2229 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif