Merge 132528

Source/WebCore/rendering/FilterEffectRenderer.cpp

 /*
  * Copyright (C) 2011 Apple Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 36 matching lines @@
 #include "CustomFilterProgram.h"
 #include "CustomFilterOperation.h"
 #include "CustomFilterValidatedProgram.h"
 #include "FECustomFilter.h"
 #include "RenderView.h"
 #include "Settings.h"
 #endif
 
 #if ENABLE(SVG)
 #include "CachedSVGDocument.h"
+#include "CachedSVGDocumentReference.h"
 #include "SVGElement.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
 #include "SourceAlpha.h"
 #endif
 
 namespace WebCore {
 
 static inline void endMatrixRow(Vector<float>& parameters)
 {
     parameters.append(0);
@@ skipping 66 matching lines @@
 }
 
 GraphicsContext* FilterEffectRenderer::inputContext()
 {
     return sourceImage() ? sourceImage()->context() : 0;
 }
 
 PassRefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(Document* document, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* op)
 {
 #if ENABLE(SVG)
-    CachedSVGDocument* cachedSVGDocument = static_cast<CachedSVGDocument*>(op->data());
+    CachedSVGDocumentReference* cachedSVGDocumentReference = static_cast<CachedSVGDocumentReference*>(op->data());
+    CachedSVGDocument* cachedSVGDocument = cachedSVGDocumentReference ? cachedSVGDocumentReference->document() : 0;
 
     // If we have an SVG document, this is an external reference. Otherwise
     // we look up the referenced node in the current document.
     if (cachedSVGDocument)
         document = cachedSVGDocument->document();
 
     if (!document)
         return 0;
 
     Element* filter = document->getElementById(op->fragment());
@@ skipping 359 matching lines @@
     m_savedGraphicsContext->drawImageBuffer(filter->output(), m_renderLayer->renderer()->style()->colorSpace(), pixelSnappedIntRect(destRect), CompositeSourceOver);
     
     filter->clearIntermediateResults();
     
     return m_savedGraphicsContext;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(CSS_FILTERS)