Revert of Tracking filter mutation via SVGElementProxy

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceContainer.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/layout/svg/LayoutSVGResourceContainer.h"
 
 #include "core/SVGElementTypeHelpers.h"
 #include "core/layout/svg/LayoutSVGResourceClipper.h"
 #include "core/layout/svg/LayoutSVGResourceFilter.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
-#include "core/svg/SVGElementProxy.h"
+#include "core/paint/PaintLayer.h"
+#include "core/svg/SVGFilterElement.h"
+
 #include "wtf/AutoReset.h"
 
 namespace blink {
 
 static inline SVGDocumentExtensions& svgExtensionsFromElement(
     Element* element) {
   ASSERT(element);
   return element->document().accessSVGExtensions();
 }
 
@@ skipping 15 matching lines @@
   if (m_isInLayout)
     return;
 
   AutoReset<bool> inLayoutChange(&m_isInLayout, true);
 
   LayoutSVGHiddenContainer::layout();
 
   clearInvalidationMask();
 }
 
-void LayoutSVGResourceContainer::notifyContentChanged() {
-  if (SVGElementProxySet* proxySet = elementProxySet())
-    proxySet->notifyContentChanged(element()->treeScope());
-}
-
 void LayoutSVGResourceContainer::willBeDestroyed() {
   // Detach all clients referring to this resource. If the resource itself is
   // a client, it will be detached from any such resources by the call to
   // LayoutSVGHiddenContainer::willBeDestroyed() below.
   detachAllClients();
 
+  for (SVGResourceClient* client : m_resourceClients)
+    client->filterWillBeDestroyed(toSVGFilterElement(element()));
+  m_resourceClients.clear();
+
   LayoutSVGHiddenContainer::willBeDestroyed();
   if (m_registered)
     svgExtensionsFromElement(element()).removeResource(m_id);
 }
 
 void LayoutSVGResourceContainer::styleDidChange(StyleDifference diff,
                                                 const ComputedStyle* oldStyle) {
   LayoutSVGHiddenContainer::styleDidChange(diff, oldStyle);
 
   if (!m_registered) {
@@ skipping 28 matching lines @@
   // Remove old id, that is guaranteed to be present in cache.
   SVGDocumentExtensions& extensions = svgExtensionsFromElement(element());
   extensions.removeResource(m_id);
   m_id = element()->getIdAttribute();
 
   registerResource();
 }
 
 void LayoutSVGResourceContainer::markAllClientsForInvalidation(
     InvalidationMode mode) {
-  if (m_isInvalidating)
+  if ((m_clients.isEmpty() && m_resourceClients.isEmpty()) || m_isInvalidating)
     return;
-  SVGElementProxySet* proxySet = elementProxySet();
-  if (m_clients.isEmpty() && (!proxySet || proxySet->isEmpty()))
-    return;
+
   if (m_invalidationMask & mode)
     return;
 
   m_invalidationMask |= mode;
   m_isInvalidating = true;
   bool needsLayout = mode == LayoutAndBoundariesInvalidation;
   bool markForInvalidation = mode != ParentOnlyInvalidation;
 
-  // Invalidate clients registered on the this object (via SVGResources).
   for (auto* client : m_clients) {
-    DCHECK(client->isSVG());
     if (client->isSVGResourceContainer()) {
       toLayoutSVGResourceContainer(client)->removeAllClientsFromCache(
           markForInvalidation);
       continue;
     }
 
     if (markForInvalidation)
       markClientForInvalidation(client, mode);
 
     LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalidation(
         client, needsLayout);
   }
 
-  // Invalidate clients registered via an SVGElementProxy.
-  notifyContentChanged();
+  markAllResourceClientsForInvalidation();
 
   m_isInvalidating = false;
 }
 
+void LayoutSVGResourceContainer::markAllResourceClientsForInvalidation() {
+  for (SVGResourceClient* client : m_resourceClients)
+    client->filterNeedsInvalidation();
+}
+
 void LayoutSVGResourceContainer::markClientForInvalidation(
     LayoutObject* client,
     InvalidationMode mode) {
   ASSERT(client);
   ASSERT(!m_clients.isEmpty());
 
   switch (mode) {
     case LayoutAndBoundariesInvalidation:
     case BoundariesInvalidation:
       client->setNeedsBoundariesUpdate();
@@ skipping 17 matching lines @@
   m_clients.add(client);
   clearInvalidationMask();
 }
 
 void LayoutSVGResourceContainer::removeClient(LayoutObject* client) {
   ASSERT(client);
   removeClientFromCache(client, false);
   m_clients.remove(client);
 }
 
+void LayoutSVGResourceContainer::addResourceClient(SVGResourceClient* client) {
+  ASSERT(client);
+  m_resourceClients.add(client);
+  clearInvalidationMask();
+}
+
+void LayoutSVGResourceContainer::removeResourceClient(
+    SVGResourceClient* client) {
+  ASSERT(client);
+  m_resourceClients.remove(client);
+}
+
 void LayoutSVGResourceContainer::invalidateCacheAndMarkForLayout(
     SubtreeLayoutScope* layoutScope) {
   if (selfNeedsLayout())
     return;
 
   setNeedsLayoutAndFullPaintInvalidation(
       LayoutInvalidationReason::SvgResourceInvalidated, MarkContainerChain,
       layoutScope);
 
   if (everHadLayout())
     removeAllClientsFromCache();
 }
 
 void LayoutSVGResourceContainer::registerResource() {
   SVGDocumentExtensions& extensions = svgExtensionsFromElement(element());
   if (!extensions.hasPendingResource(m_id)) {
     extensions.addResource(m_id, this);
     return;
   }
 
   SVGDocumentExtensions::SVGPendingElements* clients(
       extensions.removePendingResource(m_id));
 
   // Cache us with the new id.
   extensions.addResource(m_id, this);
 
   // Update cached resources of pending clients.
   for (const auto& pendingClient : *clients) {
-    DCHECK(pendingClient->hasPendingResources());
+    ASSERT(pendingClient->hasPendingResources());
     extensions.clearHasPendingResourcesIfPossible(pendingClient);
     LayoutObject* layoutObject = pendingClient->layoutObject();
     if (!layoutObject)
       continue;
-    DCHECK(layoutObject->isSVG() && (resourceType() != FilterResourceType ||
-                                     !layoutObject->isSVGRoot()));
+
+    const ComputedStyle& style = layoutObject->styleRef();
+
+    // If the client has a layer (is a non-SVGElement) we need to signal
+    // invalidation in the same way as is done in
+    // markAllResourceClientsForInvalidation above.
+    if (layoutObject->hasLayer() && resourceType() == FilterResourceType) {
+      if (!style.hasFilter())
+        continue;
+      toLayoutBoxModelObject(layoutObject)
+          ->layer()
+          ->filterNeedsPaintInvalidation();
+      if (!layoutObject->isSVGRoot())
+        continue;
+      // A root SVG element with a filter, however, still needs to run
+      // the full invalidation step below.
+    }
 
     StyleDifference diff;
     diff.setNeedsFullLayout();
-    SVGResourcesCache::clientStyleChanged(layoutObject, diff,
-                                          layoutObject->styleRef());
+    SVGResourcesCache::clientStyleChanged(layoutObject, diff, style);
     layoutObject->setNeedsLayoutAndFullPaintInvalidation(
         LayoutInvalidationReason::SvgResourceInvalidated);
   }
 }
 
 static inline void removeFromCacheAndInvalidateDependencies(
     LayoutObject* object,
     bool needsLayout) {
   ASSERT(object);
   if (SVGResources* resources =
@@ skipping 59 matching lines @@
       // This will process the rest of the ancestors.
       toLayoutSVGResourceContainer(current)->removeAllClientsFromCache();
       break;
     }
 
     current = current->parent();
   }
 }
 
 }  // namespace blink