Bug 889736, part 5 - Remove nsISVGGlyphFragmentNode and nsISVGGlyphFragmentLeaf. r=heycam
authorJonathan Watt <jwatt@jwatt.org>
Mon, 18 Nov 2013 14:29:53 +0000
changeset 170702 c179a6e6ed92a908860c6325c899447e8cea95e9
parent 170701 14de5edb207806571d8b161b9015faadb35d42ac
child 170703 ef5d7b35634bbce9107698b1bd377101bcbeea51
push idunknown
push userunknown
push dateunknown
reviewersheycam
bugs889736
milestone28.0a1
Bug 889736, part 5 - Remove nsISVGGlyphFragmentNode and nsISVGGlyphFragmentLeaf. r=heycam
layout/generic/nsFrameIdList.h
layout/svg/nsISVGGlyphFragmentNode.h
layout/svg/nsSVGTextFrame2.cpp
--- a/layout/generic/nsFrameIdList.h
+++ b/layout/generic/nsFrameIdList.h
@@ -46,18 +46,16 @@ FRAME_ID(nsIFrameFrame)
 FRAME_ID(nsIListControlFrame)
 FRAME_ID(nsIMathMLFrame)
 FRAME_ID(nsIMenuFrame)
 FRAME_ID(nsIObjectFrame)
 FRAME_ID(nsIPageSequenceFrame)
 FRAME_ID(nsIPercentHeightObserver)
 FRAME_ID(nsIRootBox)
 FRAME_ID(nsISVGChildFrame)
-FRAME_ID(nsISVGGlyphFragmentLeaf)
-FRAME_ID(nsISVGGlyphFragmentNode)
 FRAME_ID(nsISVGSVGFrame)
 FRAME_ID(nsIScrollableFrame)
 FRAME_ID(nsIScrollbarMediator)
 FRAME_ID(nsIScrollbarOwner)
 FRAME_ID(nsISelectControlFrame)
 FRAME_ID(nsIStatefulFrame)
 FRAME_ID(nsITableCellLayout)
 FRAME_ID(nsITableLayout)
deleted file mode 100644
--- a/layout/svg/nsISVGGlyphFragmentNode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#ifndef __NS_ISVGGLYPHFRAGMENTNODE_H__
-#define __NS_ISVGGLYPHFRAGMENTNODE_H__
-
-#include "nsQueryFrame.h"
-
-namespace mozilla {
-class nsISVGPoint;
-}
-
-class nsISVGGlyphFragmentNode : public nsQueryFrame
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsISVGGlyphFragmentNode)
-
-  virtual uint32_t GetNumberOfChars()=0;
-  virtual float GetComputedTextLength()=0;
-  virtual float GetSubStringLength(uint32_t charnum, uint32_t fragmentChars)=0;
-  virtual int32_t GetCharNumAtPosition(mozilla::nsISVGPoint *point)=0;
-  NS_IMETHOD_(void) SetWhitespaceCompression(bool aCompressWhitespace)=0;
-};
-
-#endif // __NS_ISVGGLYPHFRAGMENTNODE_H__
--- a/layout/svg/nsSVGTextFrame2.cpp
+++ b/layout/svg/nsSVGTextFrame2.cpp
@@ -15,17 +15,16 @@
 #include "LookAndFeel.h"
 #include "mozilla/gfx/2D.h"
 #include "nsAlgorithm.h"
 #include "nsBlockFrame.h"
 #include "nsCaret.h"
 #include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMSVGLength.h"
-#include "nsISVGGlyphFragmentNode.h"
 #include "nsISelection.h"
 #include "nsQuickSort.h"
 #include "nsRenderingContext.h"
 #include "nsSVGEffects.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGPaintServerFrame.h"
 #include "mozilla/dom/SVGRect.h"
 #include "nsSVGIntegrationUtils.h"