| Index: Source/core/svg/SVGDocumentExtensions.h
|
| diff --git a/Source/core/svg/SVGDocumentExtensions.h b/Source/core/svg/SVGDocumentExtensions.h
|
| index 442c0c2df836c008eff7430b0e49b660d9aa5f27..db741fcfa1cf896f7d43c2edb9d96e07bcd99d3b 100644
|
| --- a/Source/core/svg/SVGDocumentExtensions.h
|
| +++ b/Source/core/svg/SVGDocumentExtensions.h
|
| @@ -33,9 +33,6 @@ namespace blink {
|
| class Document;
|
| class RenderSVGResourceContainer;
|
| class SubtreeLayoutScope;
|
| -#if ENABLE(SVG_FONTS)
|
| -class SVGFontFaceElement;
|
| -#endif
|
| class SVGResourcesCache;
|
| class SVGSVGElement;
|
| class Element;
|
| @@ -70,15 +67,6 @@ public:
|
| bool isSVGRootWithRelativeLengthDescendents(SVGSVGElement*) const;
|
| void invalidateSVGRootsWithRelativeLengthDescendents(SubtreeLayoutScope*);
|
|
|
| -#if ENABLE(SVG_FONTS)
|
| - const WillBeHeapHashSet<RawPtrWillBeMember<SVGFontFaceElement> >& svgFontFaceElements() const { return m_svgFontFaceElements; }
|
| - void registerSVGFontFaceElement(SVGFontFaceElement*);
|
| - void unregisterSVGFontFaceElement(SVGFontFaceElement*);
|
| -
|
| - void registerPendingSVGFontFaceElementsForRemoval(PassRefPtrWillBeRawPtr<SVGFontFaceElement>);
|
| - void removePendingSVGFontFaceElementsForRemoval();
|
| -#endif
|
| -
|
| bool zoomAndPanEnabled() const;
|
|
|
| void startPan(const FloatPoint& start);
|
| @@ -92,20 +80,12 @@ public:
|
| private:
|
| RawPtrWillBeMember<Document> m_document;
|
| WillBeHeapHashSet<RawPtrWillBeMember<SVGSVGElement> > m_timeContainers; // For SVG 1.2 support this will need to be made more general.
|
| -#if ENABLE(SVG_FONTS)
|
| - WillBeHeapHashSet<RawPtrWillBeMember<SVGFontFaceElement> > m_svgFontFaceElements;
|
| - // SVGFontFaceElements that are pending and scheduled for removal.
|
| - WillBeHeapHashSet<RefPtrWillBeMember<SVGFontFaceElement> > m_pendingSVGFontFaceElementsForRemoval;
|
| -#endif
|
| HashMap<AtomicString, RenderSVGResourceContainer*> m_resources;
|
| WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<SVGPendingElements> > m_pendingResources; // Resources that are pending.
|
| WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<SVGPendingElements> > m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
|
| OwnPtr<SVGResourcesCache> m_resourcesCache;
|
| WillBeHeapHashSet<RawPtrWillBeMember<SVGSVGElement> > m_relativeLengthSVGRoots; // Root SVG elements with relative length descendants.
|
| FloatPoint m_translate;
|
| -#if ENABLE(ASSERT)
|
| - bool m_inRelativeLengthSVGRootsInvalidation;
|
| -#endif
|
|
|
| public:
|
| // This HashMap contains a list of pending resources. Pending resources, are such
|
|
|