Merge 132528

Source/WebCore/rendering/RenderLayerFilterInfo.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 19 matching lines @@
 #include "config.h"
 
 #if ENABLE(CSS_FILTERS)
 #include "RenderLayerFilterInfo.h"
 
 #include "FilterEffectRenderer.h"
 #include "RenderLayer.h"
 
 #if ENABLE(SVG)
 #include "CachedSVGDocument.h"
+#include "CachedSVGDocumentReference.h"
 #include "SVGElement.h"
 #include "SVGFilter.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
 #endif
 
 #if ENABLE(CSS_SHADERS)
 #include "CustomFilterOperation.h"
 #include "CustomFilterProgram.h"
 #endif
 
@@ skipping 72 matching lines @@
 }
 
 void RenderLayerFilterInfo::updateReferenceFilterClients(const FilterOperations& operations)
 {
     removeReferenceFilterClients();
     for (size_t i = 0; i < operations.size(); ++i) {
         RefPtr<FilterOperation> filterOperation = operations.operations().at(i);
         if (filterOperation->getOperationType() != FilterOperation::REFERENCE)
             continue;
         ReferenceFilterOperation* referenceFilterOperation = static_cast<ReferenceFilterOperation*>(filterOperation.get());
-        CachedSVGDocument* cachedSVGDocument = static_cast<CachedSVGDocument*>(referenceFilterOperation->data());
+        CachedSVGDocumentReference* documentReference = static_cast<CachedSVGDocumentReference*>(referenceFilterOperation->data());
+        CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference->document() : 0;
 
         if (cachedSVGDocument) {
             // Reference is external; wait for notifyFinished().
             cachedSVGDocument->addClient(this);
             m_externalSVGReferences.append(cachedSVGDocument);
         } else {
             // Reference is internal; add layer as a client so we can trigger
             // filter repaint on SVG attribute change.
             Element* filter = m_layer->renderer()->node()->document()->getElementById(referenceFilterOperation->fragment());
             if (!filter || !filter->renderer())
@@ skipping 53 matching lines @@
 {
     for (size_t i = 0; i < m_cachedCustomFilterPrograms.size(); ++i)
         m_cachedCustomFilterPrograms.at(i)->removeClient(this);
     m_cachedCustomFilterPrograms.clear();
 }
 #endif
 
 } // namespace WebCore
 
 #endif // ENABLE(CSS_FILTERS)